From 1f4f8ce7338f9622c87226adb594dd85d5ae0482 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Wed, 14 Feb 2018 12:28:52 -0700
Subject: [PATCH 01/59] Make link HTTPS

---
 gravityview-info.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gravityview-info.php b/gravityview-info.php
index e456b75..d1f3fe8 100644
--- a/gravityview-info.php
+++ b/gravityview-info.php
@@ -66,7 +66,7 @@ class="aligncenter"><img src="<?php echo plugins_url( '/images/GravityView.png',
 		     alt="GravityView money-back Guarantee" class="alignright" style="margin: 10px 0 0 10px;"/>
 		<?php
 
-		echo wpautop( sprintf( esc_html__( '%sGravityView%s is the best way to display Gravity Forms entries on your website.', 'gravity-forms-addons' ), '<a href="http://katz.si/gravityview">', '</a>' ) );
+		echo wpautop( sprintf( esc_html__( '%sGravityView%s is the best way to display Gravity Forms entries on your website.', 'gravity-forms-addons' ), '<a href="https://katz.si/gravityview">', '</a>' ) );
 
 		?>
 

From 094effd79b5320c5b2baffb1b0087482faadca54 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Thu, 22 Feb 2018 13:09:51 -0700
Subject: [PATCH 02/59] Remove calls to deprecated get_currentuserinfo()
 function

---
 gravity-forms-addons.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 8f088a7..1610128 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -701,7 +701,7 @@ static public function lead_detail( $Form, $lead, $allow_display_empty_fields =
 		}
 
 		global $current_user, $_gform_directory_approvedcolumn;
-		get_currentuserinfo();
+		wp_get_current_user();
 
 		$display_empty_fields       = '';
 		$allow_display_empty_fields = true;
@@ -2291,7 +2291,7 @@ public static function get_leads( $form_id, $sort_field_number = 0, $sort_direct
 
 	static function is_current_user( $lead = array() ) {
 		global $current_user;
-		get_currentuserinfo();
+		wp_get_current_user();
 
 		return ( (int) $current_user->ID === (int) $lead["created_by"] );
 	}
@@ -2371,7 +2371,7 @@ private static function sort_by_custom_field_query( $form_id, $sort_field_number
 
 
 		if ( $limituser ) {
-			get_currentuserinfo();
+			wp_get_current_user();
 			if ( (int) $current_user->ID !== 0 || ( $current_user->ID === 0 && apply_filters( 'kws_gf_show_entries_if_not_logged_in', apply_filters( 'kws_gf_treat_not_logged_in_as_user', true ) ) ) ) {
 				$where = empty( $search_filter ) ? "WHERE" : "AND";
 				if ( (int) $current_user->ID === 0 ) {
@@ -2506,7 +2506,7 @@ private static function sort_by_default_field_query( $form_id, $sort_field, $sor
 
 		$user_filter = '';
 		if ( $limituser ) {
-			get_currentuserinfo();
+			wp_get_current_user();
 			if ( (int) $current_user->ID !== 0 || ( $current_user->ID === 0 && apply_filters( 'kws_gf_show_entries_if_not_logged_in', apply_filters( 'kws_gf_treat_not_logged_in_as_user', true ) ) ) ) {
 				if ( (int) $current_user->ID === 0 ) {
 					$user_filter = $wpdb->prepare( " AND (created_by IS NULL OR created_by=%d)", $current_user->ID );
@@ -2816,7 +2816,7 @@ static function get_lead_count( $form_id, $search, $star = NULL, $read = NULL, $
 
 		$user_filter = '';
 		if ( $limituser ) {
-			get_currentuserinfo();
+			wp_get_current_user();
 			if ( (int) $current_user->ID !== 0 || ( $current_user->ID === 0 && apply_filters( 'kws_gf_show_entries_if_not_logged_in', apply_filters( 'kws_gf_treat_not_logged_in_as_user', true ) ) ) ) {
 				if ( ! empty( $current_user->ID ) ) {
 					$user_filter = $wpdb->prepare( " AND l.created_by=%d ", $current_user->ID );

From cbb1aea9977577d8edf8306bcbfd121930f8ef3e Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Thu, 22 Feb 2018 13:10:43 -0700
Subject: [PATCH 03/59] Remove code to loading wp-load

This may pose possible risks. Better to not include.
---
 select_directory_columns.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/select_directory_columns.php b/select_directory_columns.php
index 0257947..4437bfb 100644
--- a/select_directory_columns.php
+++ b/select_directory_columns.php
@@ -1,21 +1,5 @@
 <?php
 
-//For backwards compatibility, load wordpress if it hasn't been loaded yet
-//Will be used if this file is being called directly
-if ( ! class_exists( "RGForms" ) ) {
-	for ( $i = 0; $i < $depth = 10; $i ++ ) {
-		$wp_root_path = str_repeat( '../', $i );
-
-		if ( file_exists( "{$wp_root_path}wp-load.php" ) ) {
-			require_once( "{$wp_root_path}wp-load.php" );
-			require_once( "{$wp_root_path}wp-admin/includes/admin.php" );
-			break;
-		}
-	}
-
-	auth_redirect();
-}
-
 class GFDirectorySelectColumns {
 
 	public function __construct() {

From a1555d6ff630661ebe721da08bbdbd2e81e8845a Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Thu, 22 Feb 2018 13:11:10 -0700
Subject: [PATCH 04/59] Remove unused function

---
 select_directory_columns.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/select_directory_columns.php b/select_directory_columns.php
index 4437bfb..f363fd5 100644
--- a/select_directory_columns.php
+++ b/select_directory_columns.php
@@ -340,17 +340,3 @@ public static function get_selectable_entry_meta( $form ) {
 }
 
 $SelectColumns = new GFDirectorySelectColumns();
-
-function rg_has_field_id( $id, $field_ids ) {
-	foreach ( $field_ids as $field_id ) {
-		if ( is_numeric( $id ) && is_numeric( $field_id ) && intval( $id ) == intval( $field_id ) ) {
-			return true;
-		}
-		if ( $id == $field_id ) {
-			return true;
-		}
-
-	}
-
-	return false;
-}
\ No newline at end of file

From 42561985643a52f05c73c42064765af30de98800 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Thu, 22 Feb 2018 13:11:35 -0700
Subject: [PATCH 05/59] Remove incorrect whitespace

---
 select_directory_columns.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/select_directory_columns.php b/select_directory_columns.php
index f363fd5..a3b59bd 100644
--- a/select_directory_columns.php
+++ b/select_directory_columns.php
@@ -314,9 +314,9 @@ class="gform_select_column_heading"> <?php esc_html_e( "Hidden Columns", "gravit
 			</div>
 
 			<div class="panel-buttons">
-				<input type="button" value="<?php esc_attr_e( "Save", "gravity-forms-addons" ); ?>  "
 				       class="button-primary" onclick="SelectColumns();"/>&nbsp;
 				<input type="button" value="<?php esc_html_e( "Cancel", "gravity-forms-addons" ); ?>" class="button"
+				<input type="button" value="<?php esc_attr_e( "Save", "gravity-forms-addons" ); ?>"
 				       onclick="self.parent.tb_remove();"/>
 			</div>
 		</div>

From 0480802f75004c280fa8fccab3f9ffeec474d01d Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Thu, 22 Feb 2018 13:48:33 -0700
Subject: [PATCH 06/59] Convert JS entry action links to using GF actions

---
 admin.php | 55 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/admin.php b/admin.php
index dfdf01d..8a2bc97 100644
--- a/admin.php
+++ b/admin.php
@@ -39,6 +39,8 @@ function __construct() {
 			add_action( 'admin_head', array( &$this, 'admin_head' ), 1 );
 		}
 
+		add_action( 'gform_entries_first_column_actions', array( $this, 'add_edit_entry_link' ), 10, 5 );
+
 		self::process_bulk_update();
 	}
 
@@ -179,38 +181,41 @@ static private function add_edit_js( $edit_forms = false, $settings = array() )
 
 				$( 'ul.menu' ).addClass( 'noaccordion' );
 				<?php
-				}
+				} ?>
+			} );
+		</script>
+		<?php
+	}
 
-				if(isset( $_REQUEST['page'] ) && $_REQUEST['page'] == 'gf_entries' && ! empty( $settings['modify_admin']['edit'] )) {
-				?>
-				// Changed from :contains('Delete') to :last-child to work with 1.6
-				$( ".row-actions span:last-child" ).each( function () {
-					var editLink = $( this ).parents( 'tr' ).find( '.column-title a' ).attr( 'href' );
-					editLink = editLink + '&screen_mode=edit';
-					//alert();
-					$( this ).after( '<span class="edit">| <a title="<?php echo esc_js( __( "Edit this entry", "gravity-forms-addons" ) ); ?>" href="' + editLink + '"><?php echo esc_js( __( "Edit", "gravity-forms-addons" ) ); ?></a></span>' );
-				} );
-				<?php
-				}
+	function add_edit_entry_link( $form_id, $field_id, $value, $entry, $query_string ) {
 
-				else if(isset( $_REQUEST['page'] ) && $_REQUEST['page'] == 'gf_edit_forms' && ! empty( $settings['modify_admin']['ids'] )) {
-				?>
-				// Changed from :contains('Delete') to :last-child for future-proofing
-				$( ".row-actions .trash" ).each( function () {
-					var formID = $( this ).parents( 'tr' ).find( '.column-id' ).text();
+        $settings = GFDirectory::get_settings();
 
-					var title = '<?php echo esc_js( __( "Fields for Form ID %s", "gravity-forms-addons" ) ); ?>';
-					title = title.replace( '%s', formID );
+		if( ! empty( $settings['modify_admin']['ids'] ) ) {
 
-					$( this ).after( '<span class="edit"> | <a title="' + title + '" href="<?php echo plugins_url( "field-ids.php", __FILE__ ); ?>?id=' + formID + '&amp;show_field_ids=true&amp;TB_iframe=true&amp;height=295&amp;width=370" class="thickbox form_ids"><?php echo esc_js( __( "IDs", "gravity-forms-addons" ) ); ?></a></span>' );
-				} );
-				<?php } ?>
-			} );
-		</script>
+            $field_id_url = plugins_url( "field-ids.php", __FILE__ );
+			$field_id_url = add_query_arg( array(
+			        'id' => $form_id,
+			        'show_field_ids' => 'true',
+                    'TB_iframe' => 'true',
+                    'height' => 295,
+                    'width' => 370
+            ), $field_id_url );
+			?>
+            <span class="edit"> | <a title="<?php esc_attr( printf( __( "Fields for Form ID %s", "gravity-forms-addons" ), $form_id ) ); ?>" href="<?php echo esc_url( $field_id_url ) ; ?>" class="thickbox form_ids"><?php echo esc_js( __( "IDs", "gravity-forms-addons" ) ); ?></a></span>
 		<?php
-	}
+        }
 
 	static function show_field_ids( $form = array() ) {
+		if( ! empty( $settings['modify_admin']['edit'] ) ) {
+
+			$edit_entry_link = admin_url( 'admin.php' ) . '?screen_mode=edit&' . $query_string;
+		    ?>
+            <span class="edit"> | <a title="<?php esc_attr_e( "Edit this entry", "gravity-forms-addons" ); ?>" href="<?php echo esc_url( $edit_entry_link ) ; ?>"><?php esc_attr_e( "Edit", "gravity-forms-addons" ); ?></a></span>
+        <?php
+		}
+    }
+
 		if ( isset( $_REQUEST['show_field_ids'] ) ) {
 			$form = RGFormsModel::get_form_meta( $_GET["id"] );
 			$form = RGFormsModel::add_default_properties( $form );

From b8205baa403f80ec5cf5358af408773a2551ef21 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Thu, 22 Feb 2018 13:49:15 -0700
Subject: [PATCH 07/59] Fix link to show the entry field IDs

---
 admin.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin.php b/admin.php
index 8a2bc97..a47ea95 100644
--- a/admin.php
+++ b/admin.php
@@ -206,7 +206,6 @@ function add_edit_entry_link( $form_id, $field_id, $value, $entry, $query_string
 		<?php
         }
 
-	static function show_field_ids( $form = array() ) {
 		if( ! empty( $settings['modify_admin']['edit'] ) ) {
 
 			$edit_entry_link = admin_url( 'admin.php' ) . '?screen_mode=edit&' . $query_string;
@@ -216,9 +215,14 @@ static function show_field_ids( $form = array() ) {
 		}
     }
 
-		if ( isset( $_REQUEST['show_field_ids'] ) ) {
-			$form = RGFormsModel::get_form_meta( $_GET["id"] );
-			$form = RGFormsModel::add_default_properties( $form );
+	/**
+	 * @param array $form
+	 *
+	 * @return array|mixed|null
+	 */
+	public static function show_field_ids( $form = array() ) {
+		if ( isset( $_REQUEST['show_field_ids'] ) && isset( $_GET["id"] ) && is_numeric( $_GET["id"] ) ) {
+			$form = GFAPI::get_form( $_GET["id"] );
 
 			echo <<<EOD
 		<style>

From e55f2dadac9df9a6cb128fffad4ad8c737f12239 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Thu, 22 Feb 2018 13:49:29 -0700
Subject: [PATCH 08/59] Fix the "Edit Entry" links in the Entry Actions

---
 gravity-forms-lead-creator.php | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/gravity-forms-lead-creator.php b/gravity-forms-lead-creator.php
index 7ccadbe..189bed7 100644
--- a/gravity-forms-lead-creator.php
+++ b/gravity-forms-lead-creator.php
@@ -1,10 +1,5 @@
 <?php
 
-if ( class_exists( 'KWS_GF_Change_Lead_Creator' ) ) {
-	return;
-}
-
-
 /**
  * @since 3.6.2
  */
@@ -12,15 +7,6 @@ class KWS_GF_Change_Lead_Creator {
 
 	function __construct() {
 
-		add_action( 'plugins_loaded', array( $this, 'load' ) );
-	}
-
-	/**
-	 * @since  3.6.3
-	 * @return void
-	 */
-	function load() {
-
 		// Does GF exist? Can the user edit entries?
 		if ( ! class_exists( 'GFCommon' ) ) {
 			return;
@@ -47,14 +33,12 @@ function load() {
 	/**
 	 * Allows for edit links to work with a link instead of a form (GET instead of POST)
 	 *
-	 * @return [type] [description]
+	 * @return void
 	 */
 	function set_screen_mode() {
-
-		if ( ! empty( $_REQUEST["screen_mode"] ) ) {
+		if ( ! empty( $_REQUEST["screen_mode"] ) && class_exists( 'GFCommon' ) && GFCommon::current_user_can_any( 'gravityforms_edit_entries' ) ) {
 			$_POST["screen_mode"] = esc_attr( $_REQUEST["screen_mode"] );
 		}
-
 	}
 
 	/**

From 351d725d4ad60cfbb75880cd916242e70eb9546d Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 17:40:19 -0700
Subject: [PATCH 09/59] Escape strings

---
 gravity-forms-addons.php | 10 +++++-----
 template-row.php         |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 1610128..906e776 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1475,8 +1475,8 @@ public static function make_directory( $atts ) {
 			<script>
 				<?php if(! empty( $lightboxsettings['images'] ) || ! empty( $lightboxsettings['entry'] )) { ?>
 
-				var tb_pathToImage = "<?php echo site_url( '/wp-includes/js/thickbox/loadingAnimation.gif' ); ?>";
-				var tb_closeImage = "<?php echo site_url( '/wp-includes/js/thickbox/tb-close.png' ); ?>";
+				var tb_pathToImage = "<?php echo esc_js( site_url( '/wp-includes/js/thickbox/loadingAnimation.gif' ) ); ?>";
+				var tb_closeImage = "<?php echo esc_js( site_url( '/wp-includes/js/thickbox/tb-close.png' ) ); ?>";
 				var tb_height = 600;
 				<?php } ?>
 				function not_empty( variable ) {
@@ -1523,7 +1523,7 @@ function Search( search, sort_field_id, sort_direction, search_criteria ) {
 						} else {
 							echo '&';
 						} ?>page=' +<?php echo isset( $_GET['pagenum'] ) ? intval( $_GET['pagenum'] ) : '"1"'; ?>;
-					var location = "<?php echo get_permalink( $post->ID ); ?>" + page + search + sort + dir + search_filters;
+					var location = "<?php echo esc_js( get_permalink( $post->ID ) ); ?>" + page + search + sort + dir + search_filters;
 					document.location = location;
 				}
 				<?php } ?>
@@ -1660,7 +1660,7 @@ class="displaying-num"><?php printf( __( "Displaying %d - %d of %d", "gravity-fo
 									foreach ( $search_criteria as $key => $value ) {
 										$new_query_args[ 'filter_' . $key ] = $value;
 									}
-									echo add_query_arg( $new_query_args, get_permalink( $post->ID ) );
+									echo esc_url_raw( add_query_arg( $new_query_args, get_permalink( $post->ID ) ) );
 									?>"><?php
 								}
 								if ( $field_info['type'] == 'id' && $entry ) {
@@ -2630,7 +2630,7 @@ static function format_address( $address = array(), $linknewwindow = false ) {
 			if ( $linknewwindow ) {
 				$target = ' target="_blank"';
 			}
-			$address .= "<br/>" . apply_filters( 'kws_gf_directory_map_link', "<a href='http://maps.google.com/maps?q=$address_qs'" . $target . " class='map-it-link'>" . __( 'Map It' ) . "</a>" );
+			$address .= "<br/>" . apply_filters( 'kws_gf_directory_map_link', "<a href='https://maps.google.com/maps?q=$address_qs'" . $target . " class='map-it-link'>" . esc_html__( 'Map It' ) . "</a>" );
 		}
 
 		return $address;
diff --git a/template-row.php b/template-row.php
index bb4cf5d..0e7e6be 100644
--- a/template-row.php
+++ b/template-row.php
@@ -273,11 +273,11 @@
 		<td colspan="<?php echo sizeof( $columns ); ?>" class="noresults" style="padding:20px;"><?php
 
 			if ( $search_query ) {
-				_e( "This search returned no results.", "gravity-forms-addons" );
+				esc_html_e( "This search returned no results.", "gravity-forms-addons" );
 			} elseif ( $limituser ) {
-				_e( "This form does not have any visible entries.", "gravity-forms-addons" );
+				esc_html_e( "This form does not have any visible entries.", "gravity-forms-addons" );
 			} else {
-				_e( "This form does not have any entries yet.", "gravity-forms-addons" );
+				esc_html_e( "This form does not have any entries yet.", "gravity-forms-addons" );
 			}
 
 			?></td>

From d1d100d9edab010fd48c487372199f978cdc25fb Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 17:42:21 -0700
Subject: [PATCH 10/59] Remove use of globals

---
 gravity-forms-addons.php | 70 ++++++++++++++--------------------------
 1 file changed, 25 insertions(+), 45 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 906e776..bc07f1d 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -177,9 +177,6 @@ public static function plugins_loaded() {
 		include_once( plugin_dir_path( __FILE__ ) . '/admin.php' );
 		include_once( plugin_dir_path( __FILE__ ) . '/gravity-forms-lead-creator.php' );
 
-		if ( in_array( RG_CURRENT_PAGE, array( "gf_entries", "admin.php", "admin-ajax.php" ) ) ) {
-			self::globals_get_approved_column();
-		}
 		if ( self::is_gravity_page() ) {
 			self::load_functionality();
 		}
@@ -496,17 +493,7 @@ public static function is_gravity_page( $page = array() ) {
 	}
 
 	static function directory_update_approved( $lead_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
-		global $wpdb, $_gform_directory_approvedcolumn, $current_user;
-		$current_user = wp_get_current_user();
-		$user_data    = get_userdata( $current_user->ID );
-
-		if ( ! empty( $approvedcolumn ) ) {
-			$_gform_directory_approvedcolumn = $approvedcolumn;
-		}
-
-		if ( empty( $_gform_directory_approvedcolumn ) ) {
-			return false;
-		}
+		global $wpdb;
 
 		$lead_detail_table = RGFormsModel::get_lead_details_table_name();
 
@@ -551,11 +538,10 @@ static function directory_update_approved( $lead_id = 0, $approved = 0, $form_id
 	}
 
 	static public function edit_lead_detail( $Form, $lead, $options ) {
-		global $current_user, $_gform_directory_approvedcolumn;
+		global $current_user;
 		require_once( GFCommon::get_base_path() . "/form_display.php" );
-		if ( empty( $_gform_directory_approvedcolumn ) ) {
-			$_gform_directory_approvedcolumn = self::get_approved_column( $Form );
-		}
+
+		$_gform_directory_approvedcolumn = self::get_approved_column( $Form );
 
 		// We fetch this again, since it may have had some admin-only columns taken out.
 		#$lead = RGFormsModel::get_lead($lead["id"]);
@@ -700,7 +686,7 @@ static public function lead_detail( $Form, $lead, $allow_display_empty_fields =
 			require_once( GFCommon::get_base_path() . "/entry_list.php" );
 		}
 
-		global $current_user, $_gform_directory_approvedcolumn;
+		global $current_user;
 		wp_get_current_user();
 
 		$display_empty_fields       = '';
@@ -2031,14 +2017,17 @@ static public function attr( $options, $default = '<span class="kws_gf_credit" s
 
 
 	static public function add_lead_approved_hidden_input( $value, $lead, $field = '' ) {
-		global $_gform_directory_processed_meta, $_gform_directory_approvedcolumn;
 
-		if ( ! in_array( $lead['id'], $_gform_directory_processed_meta ) ) {
-			$_gform_directory_processed_meta[] = $lead['id'];
-			if ( empty( $_gform_directory_approvedcolumn ) ) {
-				$forms                           = RGFormsModel::get_forms( NULL, "title" );
-				$_gform_directory_approvedcolumn = self::globals_get_approved_column( $forms[0]->id );
-			}
+		if ( ! isset( $processed_meta ) ) {
+            static $processed_meta = array();
+		}
+
+		if ( ! in_array( $lead['id'], $processed_meta ) ) {
+			$processed_meta[] = $lead['id'];
+
+			$forms                           = RGFormsModel::get_forms( NULL, "title" );
+            $_gform_directory_approvedcolumn = self::globals_get_approved_column( $forms[0]->id );
+
 			if ( self::check_approval( $lead, $_gform_directory_approvedcolumn ) ) {
 				echo '<span style="display:none;"><input type="hidden" class="lead_approved" id="lead_approved_' . $lead['id'] . '" value="true" /></span>';
 			}
@@ -2048,29 +2037,21 @@ static public function add_lead_approved_hidden_input( $value, $lead, $field = '
 	}
 
 
-	static public function globals_get_approved_column( $formID = 0 ) {
-		global $_gform_directory_processed_meta, $_gform_directory_approvedcolumn, $_gform_directory_activeform;
-
-		$_gform_directory_processed_meta = array();
+	static public function globals_get_approved_column( $form_id = 0 ) {
 
-		if ( empty( $formID ) ) {
-			$formID = RGForms::get( "id" );
+		$form_id = empty( $form_id ) ? rgget( "id" ) : $form_id;
 
-			if ( empty( $formID ) ) {
-				$forms  = RGFormsModel::get_forms( NULL, "title" );
-				$formID = $forms[0]->id;
+		if ( empty( $form_id ) ) {
+			// If there's no 'id' query string, grab the first form available
+			if ( self::is_gravity_page('gf_entries') ) {
+				$forms   = RGFormsModel::get_forms( NULL, "title" );
+				$form_id = $forms[0]->id;
 			}
 		}
 
-		if ( ! empty( $formID ) ) {
-			$_gform_directory_activeform = RGFormsModel::get_form_meta( $formID );
-		} else if ( isset( $_GET['id'] ) ) {
-			$_gform_directory_activeform = RGFormsModel::get_form_meta( $_GET['id'] );
-		}
-
-		$_gform_directory_approvedcolumn = self::get_approved_column( $_gform_directory_activeform );
+        $active_form = RGFormsModel::get_form_meta( $form_id );
 
-		return $_gform_directory_approvedcolumn;
+		return self::get_approved_column( $active_form );
 	}
 
 	static public function get_approved_column( $form ) {
@@ -2101,10 +2082,9 @@ static public function get_approved_column( $form ) {
 
 
 	static public function directory_update_approved_hook() {
-		global $_gform_directory_approvedcolumn;
 		check_ajax_referer( 'rg_update_approved', 'rg_update_approved' );
 		if ( ! empty( $_POST["lead_id"] ) ) {
-			$_gform_directory_approvedcolumn = empty( $_gform_directory_approvedcolumn ) ? self::globals_get_approved_column( $_POST['form_id'] ) : $_gform_directory_approvedcolumn;
+			$_gform_directory_approvedcolumn = self::globals_get_approved_column( $_POST['form_id'] );
 			self::directory_update_approved( (int) $_POST["lead_id"], $_POST["approved"], (int) $_POST['form_id'], $_gform_directory_approvedcolumn );
 		}
 	}

From 3cc3a3fca23da958cc2c2412ecdc79cd49364cfc Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 17:44:07 -0700
Subject: [PATCH 11/59] Fix updating approval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With 2.3 (and perhaps before), it stopped updating the value
properly—it would just update the meta, not the value.

Use `GFAPI::update_entry_field()` to update the value instead.
---
 gravity-forms-addons.php | 47 ++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index bc07f1d..774e17a 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -492,49 +492,34 @@ public static function is_gravity_page( $page = array() ) {
 		return in_array( $current_page, $gf_pages );
 	}
 
+	/**
+     * Update the approval status for the entry
+     *
+	 * @param int $lead_id
+	 * @param int $approved
+	 * @param int $form_id
+	 * @param int $approvedcolumn
+	 */
 	static function directory_update_approved( $lead_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
 		global $wpdb;
 
-		$lead_detail_table = RGFormsModel::get_lead_details_table_name();
+		$current_user = wp_get_current_user();
 
 		// This will be faster in the 1.6+ future.
 		if ( function_exists( 'gform_update_meta' ) ) {
 			gform_update_meta( $lead_id, 'is_approved', $approved );
 		}
 
-		if ( empty( $approved ) ) {
-			//Deleting details for this field
-			$sql = $wpdb->prepare( "DELETE FROM $lead_detail_table WHERE lead_id=%d AND field_number BETWEEN %f AND %f ", $lead_id, $_gform_directory_approvedcolumn - 0.001, $_gform_directory_approvedcolumn + 0.001 );
-			$wpdb->query( $sql );
-
-			RGFormsModel::add_note( $lead_id, $current_user->ID, $user_data->display_name, stripslashes( __( 'Disapproved the lead', 'gravity-forms-addons' ) ) );
+		if( ! is_callable( array( 'GFAPI', 'update_entry_field' ) ) ) {
+			GFCommon::log_error( "Cannot update approval; update_entry_field not available in Gravity Forms" );
+		    return;
+        }
 
-		} else {
-
-			// Get the fields for the lead
-			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $lead_id ) );
+        GFAPI::update_entry_field( $lead_id, $approvedcolumn, $approved );
 
-			$lead_detail_id = RGFormsModel::get_lead_detail_id( $current_fields, $_gform_directory_approvedcolumn );
+		$message = empty( $approved ) ? __( 'Disapproved the lead', 'gravity-forms-addons' ) : __( 'Approved the lead', 'gravity-forms-addons' );
 
-			// If there's already a field for the approved column, then we update it.
-			if ( $lead_detail_id > 0 ) {
-				$update = $wpdb->update( $lead_detail_table, array( "value" => $approved ), array(
-					"lead_id"      => $lead_id,
-					'form_id'      => $form_id,
-					'field_number' => $_gform_directory_approvedcolumn,
-				), array( "%s" ), array( "%d", "%d", "%f" ) );
-			} // Otherwise, we create it.
-			else {
-				$update = $wpdb->insert( $lead_detail_table, array(
-					"lead_id"      => $lead_id,
-					"form_id"      => $form_id,
-					"field_number" => $_gform_directory_approvedcolumn,
-					"value"        => $approved,
-				), array( "%d", "%d", "%f", "%s" ) );
-			}
-
-			RGFormsModel::add_note( $lead_id, $current_user->ID, $user_data->display_name, stripslashes( __( 'Approved the lead', 'gravity-forms-addons' ) ) );
-		}
+        RGFormsModel::add_note( $lead_id, $current_user->ID, $current_user->display_name, $message );
 	}
 
 	static public function edit_lead_detail( $Form, $lead, $options ) {

From 0012297fcfd0697207168588484fd2aa84357a6b Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 17:56:35 -0700
Subject: [PATCH 12/59] Fix getting the "Approved" column

Fixes #23
---
 gravity-forms-addons.php | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 774e17a..541456a 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -2040,24 +2040,36 @@ static public function globals_get_approved_column( $form_id = 0 ) {
 	}
 
 	static public function get_approved_column( $form ) {
-		if ( ! is_array( $form ) ) {
+
+	    if ( ! is_array( $form ) || ! is_array( $form['fields'] ) ) {
 			return false;
 		}
 
-		foreach ( @$form['fields'] as $key => $col ) {
-			if ( isset( $col['inputs'] ) && is_array( $col['inputs'] ) ) {
-				foreach ( $col['inputs'] as $key2 => $input ) {
-					if ( strtolower( $input['label'] ) == 'approved' && $col['type'] == 'checkbox' && ! empty( $col['adminOnly'] ) ) {
-						return $input['id'];
+		$approved_strings = array( __( 'Approved', 'gravity-forms-addons' ), __("Approved?", "gravity-forms-addons"), __("Approved? (Admin-only)", "gravity-forms-addons") );
+
+		/** @var GF_Field_Checkbox $field */
+		foreach ( $form['fields'] as $field ) {
+
+			if ( ! is_a( $field, 'GF_Field' ) ) {
+                continue;
+			}
+
+            if ( 'checkbox' === $field->type && $field->adminOnly ) {
+
+				if ( $field->gf_directory_approval || in_array( $field->label, $approved_strings ) || in_array( $field->adminLabel, $approved_strings ) ) {
+					foreach ( $field->inputs as $input ) {
+						if ( in_array( $input['label'], $approved_strings ) || in_array( $input['value'], $approved_strings ) ) {
+							return $input['id'];
+						}
 					}
 				}
 			}
 		}
 
-		foreach ( @$form['fields'] as $key => $col ) {
-			if ( isset( $col['label'] ) && strtolower( $col['label'] ) == 'approved' && $col['type'] == 'checkbox' ) {
-				if ( isset( $col['inputs'][0]['id'] ) ) {
-					return $key;
+				foreach ( $field->inputs as $input ) {
+					if ( in_array( $input['label'], $approved_strings ) || ( isset( $input['value'] ) && in_array( $input['value'], $approved_strings ) ) ) {
+						return $input['id'];
+					}
 				}
 			}
 		}

From 4fb90265e63582f01a805168b33d988068ba4e68 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 17:58:25 -0700
Subject: [PATCH 13/59] Basic validation: Only show single entry if user should
 be able to

Check to make sure the user can see the single entry.

We were already checking to make sure they had edit access. Now read
access has a check as well.
---
 gravity-forms-addons.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 541456a..66a0812 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1068,12 +1068,27 @@ static public function process_lead_detail( $inline = true, $entryback = '', $sh
 				$adminonlycolumns = self::get_admin_only( $form );
 			}
 
+			$approved = self::check_approval( $lead, $approvedcolumn );
+
 			//since 3.5
 			$lead = self::remove_hidden_fields( array( $lead ), $adminonlycolumns, $approvedcolumn, true, true, $showadminonly, $form );
 			$lead = $lead[0];
 
 			ob_start(); // Using ob_start() allows us to filter output
-			self::lead_detail( $form, $lead, false, $inline, $options );
+
+			if( ! $approved && ! GFCommon::current_user_can_any( array( 'gravityforms_view_entries', 'gravityforms_edit_entries' ) ) ) {
+                esc_html_e( 'You are not allowed to view this content.', 'gravity-forms-addons' );
+                return false;
+            }
+
+			if ( ! $approved && empty( $_GET['edit'] ) ) {
+			    echo '<div class="error" style="border: 1px solid #ccc; padding: 1em; margin: .5em 0 1em;">';
+				esc_html_e( 'This entry is not approved, but you are logged-in and have permission to see it.', 'gravity-forms-addons' );
+				echo '</div>';
+			}
+
+            self::lead_detail( $form, $lead, false, $inline, $options );
+
 			$content = ob_get_contents(); // Get the output
 			ob_end_clean(); // Clear the buffer
 

From cd782032fed7372fb901773560f1de6cfb1ac708 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 18:01:59 -0700
Subject: [PATCH 14/59] COMPLETELY REWRITE entry fetching

Remove our copies of the GF Monster Query, and start using the GF API
to generate search results.

This may cause problems, but it's the only way forward.
---
 gravity-forms-addons.php | 379 ++++++---------------------------------
 1 file changed, 57 insertions(+), 322 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 66a0812..8086e8e 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1388,12 +1388,12 @@ public static function make_directory( $atts ) {
 			}
 		}
 
+		$total_count = 0;
 
 		//
 		// Or start to generate the directory
 		//
-		$leads = GFDirectory::get_leads( $form_id, $sort_field, $sort_direction, $search_query, $first_item_index, $page_size, $star, $read, $is_numeric, $start_date, $end_date, 'active', $approvedcolumn, $limituser, $search_criteria );
-
+		$leads = GFDirectory::get_leads( $form_id, $sort_field, $sort_direction, $search_query, $first_item_index, $page_size, $star, $read, $is_numeric, $start_date, $end_date, 'active', $approvedcolumn, $limituser, $search_criteria, $total_count );
 
 		// Allow lightbox to determine whether showadminonly is valid without passing a query string in URL
 		if ( $entry === true && ! empty( $lightboxsettings['entry'] ) ) {
@@ -1426,8 +1426,7 @@ public static function make_directory( $atts ) {
 				$lead_count = count( $leads );
 				$leads      = array_slice( $leads, $first_item_index, $page_size );
 			} else {
-				$lead_count = self::get_lead_count( $form_id, $search_query, $star, $read, $approvedcolumn, $approved, $leads, $start_date, $end_date, $limituser, $search_criteria );
-
+				$lead_count = $total_count;
 			}
 
 
@@ -2238,93 +2237,49 @@ public static function get_search_filters( $form ) {
 	 * @param string $status (default: 'active')
 	 * @param mixed $approvedcolumn (default: null)
 	 * @param bool $limituser (default: false)
-	 * @param array $search_criterias , since 3.5
+	 * @param array $search_criteria , since 3.5
 	 *
 	 * @return array Leads results
 	 */
-	public static function get_leads( $form_id, $sort_field_number = 0, $sort_direction = 'DESC', $search = '', $offset = 0, $page_size = 30, $star = NULL, $read = NULL, $is_numeric_sort = false, $start_date = NULL, $end_date = NULL, $status = 'active', $approvedcolumn = NULL, $limituser = false, $search_criterias ) {
+	public static function get_leads( $form_id, $sort_field_number = 0, $sort_direction = 'DESC', $search = '', $offset = 0, $page_size = 30, $star = NULL, $read = NULL, $is_numeric_sort = false, $start_date = NULL, $end_date = NULL, $status = 'active', $approvedcolumn = NULL, $limituser = false, $search_criteria = array(), &$total_count = null ) {
 
-		global $wpdb;
+		$search_criteria['status'] = $status;
 
-		if ( $sort_field_number == 0 ) {
+		if ( 0 === $sort_field_number ) {
 			$sort_field_number = "date_created";
 		}
 
-		//since 3.5
-		if ( empty( $search_criterias ) ) {
-			$search_criterias = array();
-		}
-
-		// Retrieve the leads based on whether it's sorted or not.
-		if ( is_numeric( $sort_field_number ) ) {
-			$sql = self::sort_by_custom_field_query( $form_id, $sort_field_number, $sort_direction, $search, $search_criterias, $offset, $page_size, $star, $read, $is_numeric_sort, $status, $approvedcolumn, $limituser );
-		} else {
-			$sql = self::sort_by_default_field_query( $form_id, $sort_field_number, $sort_direction, $search, $search_criterias, $offset, $page_size, $star, $read, $is_numeric_sort, $start_date, $end_date, $status, $approvedcolumn, $limituser );
-		}
-
-		//initializing rownum
-		$wpdb->query( "select @rownum:=0" );
+		$sorting = array(
+            'direction' => $sort_direction,
+            'key' => $sort_field_number,
+        );
 
-		//getting results
+		$paging = array(
+            'page_size' => $page_size,
+            'offset' => $offset,
+        );
 
-		$results = $wpdb->get_results( $sql );
+		$search_criteria['field_filters'] = rgar( $search_criteria, 'field_filters', array() );
 
-
-		$return = '';
-		if ( function_exists( 'gform_get_meta' ) ) {
-			$return = RGFormsModel::build_lead_array( $results ); // This is a private function until 1.6
+		if ( '' !== $search ) {
+			$search_criteria['field_filters'][] = array(
+				'key' => 0,
+				'value' => $search,
+			);
 		}
 
-		// Used by at least the show_only_user_entries() method
-		$return = apply_filters( 'kws_gf_directory_lead_filter', $return, compact( "approved", "sort_field_number", "sort_direction", "search_query", "search_criterias", "first_item_index", "page_size", "star", "read", "is_numeric", "start_date", "end_date", "status", "approvedcolumn", "limituser" ) );
-
-		return $return;
-	}
-
-	static function is_current_user( $lead = array() ) {
-		global $current_user;
-		wp_get_current_user();
-
-		return ( (int) $current_user->ID === (int) $lead["created_by"] );
-	}
-
-	static function show_only_user_entries( $leads = array(), $settings = array() ) {
-		if ( empty( $settings['limituser'] ) ) {
-			return $leads;
+		if ( ! is_null( $star ) ) {
+			$search_criteria['field_filters'][] = array(
+	            'key' => 'is_starred',
+                'value' => (int) $star,
+            );
 		}
 
-		return array_filter( $leads, array( 'GFDirectory', 'is_current_user' ) );
-	}
-
-
-	/**
-	 * sort_by_custom_field_query function.
-	 *
-	 * A copy of the Gravity Forms method, but adding $approvedcolumns and $limituser args
-	 *
-	 * @access private
-	 * @static
-	 *
-	 * @param mixed $form_id
-	 * @param int $sort_field_number (default: 0)
-	 * @param string $sort_direction (default: 'DESC')
-	 * @param string $search (default: '')
-	 * @param array $search_criterias , since 3.5
-	 * @param int $offset (default: 0)
-	 * @param int $page_size (default: 30)
-	 * @param mixed $star (default: null)
-	 * @param mixed $read (default: null)
-	 * @param bool $is_numeric_sort (default: false)
-	 * @param string $status (default: 'active')
-	 * @param mixed $approvedcolumn (default: null)
-	 * @param bool $limituser (default: false)
-	 *
-	 * @return void
-	 */
-	private static function sort_by_custom_field_query( $form_id, $sort_field_number = 0, $sort_direction = 'DESC', $search = '', $search_criterias, $offset = 0, $page_size = 30, $star = NULL, $read = NULL, $is_numeric_sort = false, $status = 'active', $approvedcolumn = NULL, $limituser = false ) {
-		global $wpdb, $current_user;
-		if ( ! is_numeric( $form_id ) || ! is_numeric( $sort_field_number ) || ! is_numeric( $offset ) || ! is_numeric( $page_size ) ) {
-			return "";
+		if ( ! is_null( $read ) ) {
+			$search_criteria['field_filters'][] = array(
+				'key' => 'is_read',
+				'value' => (int) $read,
+			);
 		}
 
 		$lead_detail_table_name = RGFormsModel::get_lead_details_table_name();
@@ -2350,205 +2305,52 @@ private static function sort_by_custom_field_query( $form_id, $sort_field_number
 			$search_filter .= $wpdb->prepare( "$where status=%s ", $status );
 		}
 
-		// new search criterias since 3.5
-		$in_search_criteria = '';
-		if ( ! empty( $search_criterias ) ) {
-			foreach ( $search_criterias as $field_id => $value ) {
-				$value = "%$value%";
-				$in_search_criteria .= $wpdb->prepare( " l.id IN (SELECT lead_id from $lead_detail_table_name WHERE field_number = %s AND value LIKE %s) AND ", $field_id, $value );
-			}
+		if ( $end_date ) {
+			$search_criteria['end_date'] = $end_date;
 		}
-		$where              = empty( $search_filter ) ? "WHERE " : "AND ";
-		$in_search_criteria = ( ! empty( $in_search_criteria ) ) ? $where . substr( $in_search_criteria, 0, - 4 ) : ''; // to add where/and and remove the last AND
-
 
 		if ( $limituser ) {
-			wp_get_current_user();
-			if ( (int) $current_user->ID !== 0 || ( $current_user->ID === 0 && apply_filters( 'kws_gf_show_entries_if_not_logged_in', apply_filters( 'kws_gf_treat_not_logged_in_as_user', true ) ) ) ) {
-				$where = empty( $search_filter ) ? "WHERE" : "AND";
-				if ( (int) $current_user->ID === 0 ) {
-					$search_filter .= $wpdb->prepare( "$where (created_by IS NULL OR created_by=%d)", $current_user->ID );
-				} else {
-					$search_filter .= $wpdb->prepare( "$where l.created_by=%d ", $current_user->ID );
-				}
-			} else {
-				return false;
-			}
-		}
-
-		$field_number_min = $sort_field_number - 0.001;
-		$field_number_max = $sort_field_number + 0.001;
+			$current_user = wp_get_current_user();
 
-		$in_filter = "";
-		if ( ! empty( $approvedcolumn ) ) {
-			$in_filter = $wpdb->prepare( "WHERE l.id IN (SELECT lead_id from $lead_detail_table_name WHERE field_number BETWEEN %f AND %f)", $approvedcolumn - 0.001, $approvedcolumn + 0.001 );
-			// This will work once all the fields are converted to the meta_key after 1.6
-			#$search_filter .= $wpdb->prepare(" AND m.meta_key = 'is_approved' AND m.meta_value = %s", 1);
+			$search_criteria['field_filters'][] = array(
+                'key' => 'created_by',
+                'operator' => 'is',
+                'value' => $current_user->ID,
+            );
 		}
 
-		$limit_filter = ''; //paging is done later since 3.5 to allow multisort
-		if ( ! apply_filters( 'kws_gf_directory_want_multisort', false ) ) {
-			if ( $page_size > 0 ) {
-				$limit_filter = "LIMIT $offset,$page_size";
-			}
-		}
-
-		$sql = "
-			SELECT filtered.sort, l.*, d.field_number, d.value
-			FROM $lead_table_name l
-			INNER JOIN $lead_detail_table_name d ON d.lead_id = l.id
-			INNER JOIN (
-				SELECT distinct sorted.sort, l.id
-				FROM $lead_table_name l
-				INNER JOIN $lead_detail_table_name d ON d.lead_id = l.id
-				INNER JOIN (
-					SELECT @rownum:=@rownum+1 as sort, id FROM (
-						SELECT 0 as query, lead_id as id, value
-						FROM $lead_detail_table_name
-						WHERE form_id=$form_id
-						AND field_number between $field_number_min AND $field_number_max
+		if ( $approvedcolumn ) {
+			$search_criteria['field_filters'][] = array(
+				'key' => $approvedcolumn,
+				'operator' => 'is',
+				'value' => 'Approved'
+			);
 
-						UNION ALL
+			$search_criteria['field_filters']['mode'] = 'all';
+		}
 
-						SELECT 1 as query, l.id, d.value
-						FROM $lead_table_name l
-						LEFT OUTER JOIN $lead_detail_table_name d ON d.lead_id = l.id AND field_number between $field_number_min AND $field_number_max
-						WHERE l.form_id=$form_id
-						AND d.lead_id IS NULL
+		$return = GFAPI::get_entries( $form_id, $search_criteria, $sorting, $paging, $total_count );
 
-					) sorted1
-				   $orderby
-				) sorted ON d.lead_id = sorted.id
-				$search_filter
-				$in_search_criteria
-				$limit_filter
-			) filtered ON filtered.id = l.id
-			$in_filter
-			ORDER BY filtered.sort";
+		// Used by at least the show_only_user_entries() method
+		$return = apply_filters( 'kws_gf_directory_lead_filter', $return, compact( "approved", "sort_field_number", "sort_direction", "search_query", "search_criteria", "first_item_index", "page_size", "star", "read", "is_numeric", "start_date", "end_date", "status", "approvedcolumn", "limituser" ) );
 
-		return $sql;
+		return $return;
 	}
 
-
 	/**
-	 * sort_by_default_field_query function.
-	 *
-	 * A copy of the Gravity Forms method, but adding $approvedcolumns and $limituser args
-	 *
-	 * @access private
-	 * @static
-	 *
-	 * @param mixed $form_id
-	 * @param mixed $sort_field
-	 * @param string $sort_direction (default: 'DESC')
-	 * @param string $search (default: '')
-	 * @param array $search_criterias - since 3.5
-	 * @param int $offset (default: 0)
-	 * @param int $page_size (default: 30)
-	 * @param mixed $star (default: null)
-	 * @param mixed $read (default: null)
-	 * @param bool $is_numeric_sort (default: false)
-	 * @param mixed $start_date (default: null)
-	 * @param mixed $end_date (default: null)
-	 * @param string $status (default: 'active')
-	 * @param mixed $approvedcolumn (default: null)
-	 * @param bool $limituser (default: false)
+     * Is the entry `created_by` equal to the current WP User ID?
+     *
+	 * @param array $lead Entry array
 	 *
-	 * @return void
+	 * @return bool true: same user; false: nope!
 	 */
-	private static function sort_by_default_field_query( $form_id, $sort_field, $sort_direction = 'DESC', $search = '', $search_criterias, $offset = 0, $page_size = 30, $star = NULL, $read = NULL, $is_numeric_sort = false, $start_date = NULL, $end_date = NULL, $status = 'active', $approvedcolumn = NULL, $limituser = false ) {
-		global $wpdb, $current_user;
-
-		if ( ! is_numeric( $form_id ) || ! is_numeric( $offset ) || ! is_numeric( $page_size ) ) {
-			return "";
-		}
-
-		$lead_detail_table_name = RGFormsModel::get_lead_details_table_name();
-		$lead_table_name        = RGFormsModel::get_lead_table_name();
-
-		$search_term   = "%$search%";
-		$search_filter = empty( $search ) ? "" : $wpdb->prepare( " AND value LIKE %s", $search_term );
-
-		// new search criterias since 3.5
-		$in_search_criteria = '';
-		if ( ! empty( $search_criterias ) ) {
-			foreach ( $search_criterias as $field_id => $value ) {
-				$value = "%$value%";
-				$in_search_criteria .= $wpdb->prepare( " AND l.id IN (SELECT lead_id from $lead_detail_table_name WHERE field_number = %s AND value LIKE %s)", $field_id, $value );
-			}
-		}
 
-		$star_filter = $star !== NULL && $status == 'active' ? $wpdb->prepare( " AND is_starred=%d AND status='active' ", $star ) : "";
-		$read_filter = $read !== NULL && $status == 'active' ? $wpdb->prepare( " AND is_read=%d AND status='active' ", $read ) : "";
-		if ( function_exists( 'gform_get_meta' ) ) {
-			$status_filter = $wpdb->prepare( " AND status=%s ", $status );
-		} else {
-			$status_filter = '';
+		if ( empty( $lead["created_by"] ) ) {
+            return false;
 		}
 
-		$start_date_filter = empty( $start_date ) ? "" : " AND datediff(date_created, '$start_date') >=0";
-		$end_date_filter   = empty( $end_date ) ? "" : " AND datediff(date_created, '$end_date') <=0";
 
-		$in_filter = "";
-		if ( ! empty( $approvedcolumn ) ) {
-			$in_filter = $wpdb->prepare( "l.id IN (SELECT lead_id from $lead_detail_table_name WHERE field_number BETWEEN %f AND %f) AND", $approvedcolumn - 0.001, $approvedcolumn + 0.001 );
-			// This will work once all the fields are converted to the meta_key after 1.6
-			#$search_filter .= $wpdb->prepare(" AND m.meta_key = 'is_approved' AND m.meta_value = %s", 1);
-		}
 
-		$user_filter = '';
-		if ( $limituser ) {
-			wp_get_current_user();
-			if ( (int) $current_user->ID !== 0 || ( $current_user->ID === 0 && apply_filters( 'kws_gf_show_entries_if_not_logged_in', apply_filters( 'kws_gf_treat_not_logged_in_as_user', true ) ) ) ) {
-				if ( (int) $current_user->ID === 0 ) {
-					$user_filter = $wpdb->prepare( " AND (created_by IS NULL OR created_by=%d)", $current_user->ID );
-				} else {
-					$user_filter = $wpdb->prepare( " AND created_by=%d ", $current_user->ID );
-				}
-			} else {
-				return false;
-			}
-		}
-
-		$limit_filter = ''; //paging is done later since 3.5 to allow multisort
-		if ( ! apply_filters( 'kws_gf_directory_want_multisort', false ) ) {
-			if ( $page_size > 0 ) {
-				$limit_filter = "LIMIT $offset,$page_size";
-			}
-		}
-
-		$sql = "
-			SELECT filtered.sort, l.*, d.field_number, d.value
-			FROM $lead_table_name l
-			INNER JOIN $lead_detail_table_name d ON d.lead_id = l.id
-			INNER JOIN
-			(
-				SELECT @rownum:=@rownum + 1 as sort, id
-				FROM
-				(
-					SELECT distinct l.id
-					FROM $lead_table_name l
-					INNER JOIN $lead_detail_table_name d ON d.lead_id = l.id
-					WHERE $in_filter
-					l.form_id=$form_id
-					$search_filter
-					$in_search_criteria
-					$star_filter
-					$read_filter
-					$user_filter
-					$status_filter
-					$start_date_filter
-					$end_date_filter
-					ORDER BY $sort_field $sort_direction
-					$limit_filter
-				) page
-			) filtered ON filtered.id = l.id
-			ORDER BY filtered.sort";
-
-		return $sql;
-	}
-
-	static function directory_anchor_text( $value = NULL ) {
 
 		if ( apply_filters( 'kws_gf_directory_anchor_text_striphttp', true ) ) {
 			$value = str_replace( 'http://', '', $value );
@@ -2779,73 +2581,6 @@ static function get_lead_count( $form_id, $search, $star = NULL, $read = NULL, $
 		if ( ! is_numeric( $form_id ) ) {
 			return "";
 		}
-
-		$detail_table_name = RGFormsModel::get_lead_details_table_name();
-		$lead_table_name   = RGFormsModel::get_lead_table_name();
-
-		$star_filter = $star !== NULL ? $wpdb->prepare( "AND is_starred=%d ", $star ) : "";
-		$read_filter = $read !== NULL ? $wpdb->prepare( "AND is_read=%d ", $read ) : "";
-		if ( function_exists( 'gform_get_meta' ) ) {
-			$status_filter = $wpdb->prepare( " AND status=%s ", 'active' );
-		} else {
-			$status_filter = '';
-		}
-		$start_date_filter = empty( $start_date ) ? "" : " AND datediff(date_created, '$start_date') >=0";
-		$end_date_filter   = empty( $end_date ) ? "" : " AND datediff(date_created, '$end_date') <=0";
-
-		$search_term   = "%$search%";
-		$search_filter = empty( $search ) ? "" : $wpdb->prepare( "AND ld.value LIKE %s", $search_term );
-
-		// new search criterias since 3.5
-		$in_search_criteria = '';
-		if ( ! empty( $search_criterias ) ) {
-			foreach ( $search_criterias as $field_id => $value ) {
-				$value = "%$value%";
-				$in_search_criteria .= $wpdb->prepare( " AND l.id IN (SELECT lead_id from $detail_table_name WHERE field_number = %s AND value LIKE %s)", $field_id, $value );
-			}
-		}
-
-
-		$user_filter = '';
-		if ( $limituser ) {
-			wp_get_current_user();
-			if ( (int) $current_user->ID !== 0 || ( $current_user->ID === 0 && apply_filters( 'kws_gf_show_entries_if_not_logged_in', apply_filters( 'kws_gf_treat_not_logged_in_as_user', true ) ) ) ) {
-				if ( ! empty( $current_user->ID ) ) {
-					$user_filter = $wpdb->prepare( " AND l.created_by=%d ", $current_user->ID );
-				} else {
-					$user_filter = $wpdb->prepare( " AND (created_by IS NULL OR created_by=%d)", $current_user->ID );
-				}
-			} else {
-				return false;
-			}
-
-		}
-
-		$in_filter = "";
-		if ( $approved ) {
-			$in_filter = $wpdb->prepare( "l.id IN (SELECT lead_id from $detail_table_name WHERE field_number BETWEEN %f AND %f) AND", $column - 0.001, $column + 0.001 );
-			// This will work once all the fields are converted to the meta_key after 1.6
-			#$search_filter .= $wpdb->prepare(" AND m.meta_key = 'is_approved' AND m.meta_value = %s", 1);
-		}
-
-		$sql = "SELECT count(distinct l.id) FROM $lead_table_name as l,
-				$detail_table_name as ld";
-#		$sql .= function_exists('gform_get_meta') ? " INNER JOIN wp_rg_lead_meta m ON l.id = m.lead_id " : ""; // After 1.6
-		$sql .= "
-				WHERE $in_filter
-				l.form_id=$form_id
-				AND ld.form_id=$form_id
-				AND l.id = ld.lead_id
-				$star_filter
-				$read_filter
-				$status_filter
-				$user_filter
-				$start_date_filter
-				$end_date_filter
-				$search_filter
-				$in_search_criteria";
-
-		return $wpdb->get_var( $sql );
 	}
 
 	static function check_meta_approval( $lead_id ) {

From 20edbb1f4cdead143205678ac8f833b91c183226 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 18:02:45 -0700
Subject: [PATCH 15/59] =?UTF-8?q?=E2=80=A6[continued=20SQL=20removal]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cd78203
---
 gravity-forms-addons.php | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 8086e8e..c7ca135 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -2282,27 +2282,8 @@ public static function get_leads( $form_id, $sort_field_number = 0, $sort_direct
 			);
 		}
 
-		$lead_detail_table_name = RGFormsModel::get_lead_details_table_name();
-		$lead_table_name        = RGFormsModel::get_lead_table_name();
-
-		$orderby = $is_numeric_sort ? "ORDER BY query, (value+0) $sort_direction" : "ORDER BY query, value $sort_direction";
-
-		//$search = empty($search) ? "" : "WHERE d.value LIKE '%$search%' ";
-		$search_term   = "%$search%";
-		$search_filter = empty( $search ) ? "" : $wpdb->prepare( "WHERE d.value LIKE %s", $search_term );
-
-		//starred clause
-		$where = empty( $search ) ? "WHERE" : "AND";
-		$search_filter .= $star !== NULL && $status == 'active' ? $wpdb->prepare( "$where is_starred=%d AND status='active' ", $star ) : "";
-
-		//read clause
-		$where = empty( $search ) ? "WHERE" : "AND";
-		$search_filter .= $read !== NULL && $status == 'active' ? $wpdb->prepare( "$where is_read=%d AND status='active' ", $read ) : "";
-
-		//status clause
-		if ( function_exists( 'gform_get_meta' ) ) {
-			$where = empty( $search ) ? "WHERE" : "AND";
-			$search_filter .= $wpdb->prepare( "$where status=%s ", $status );
+		if ( $start_date ) {
+			$search_criteria['start_date'] = $start_date;
 		}
 
 		if ( $end_date ) {

From 7d2da18cea83d5136406229a6fbc2c4629f89b76 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 18:03:29 -0700
Subject: [PATCH 16/59] Entry approval now uses both the meta and the entry
 value array
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Might as well fall back on it, since it's there…
---
 gravity-forms-addons.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index c7ca135..02cddef 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -2569,7 +2569,7 @@ static function check_meta_approval( $lead_id ) {
 	}
 
 	static function check_approval( $lead, $column ) {
-		return self::check_meta_approval( $lead['id'] );
+		return self::check_meta_approval( $lead['id'] ) || ! empty( $lead[ $column ] );
 	}
 
 	static function hide_in_directory( $form, $field_id ) {

From d25edbeff485c5e44b64797bd42586ffbe9c909e Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 18:05:00 -0700
Subject: [PATCH 17/59] Update editing the entry for GF 2.3

- Different way to fetch the fields
- Use GFFormsModel instead of RGFormsModel
- Use GFFormsModel::begin_batch_field_operations() and GFFormsModel::
commit_batch_field_operations()
---
 gravity-forms-addons.php | 94 +++++++++++++++++++++++++---------------
 1 file changed, 60 insertions(+), 34 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 02cddef..6a90973 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -2755,32 +2755,34 @@ static function check_hide_field_conditions( $field_id, $admin_only, $approved,
 	public static function save_lead( $form, &$lead ) {
 		global $wpdb;
 
-		if ( IS_ADMIN && ! GFCommon::current_user_can_any( "gravityforms_edit_entries" ) ) {
+		if ( is_admin() && ! GFCommon::current_user_can_any( "gravityforms_edit_entries" ) ) {
 			die( __( "You don't have adequate permission to edit entries.", "gravityforms" ) );
 		}
 
-		$lead_detail_table = RGFormsModel::get_lead_details_table_name();
-
-		//Inserting lead if null
-		if ( $lead == NULL ) {
-			global $current_user;
-			$user_id = $current_user && $current_user->ID ? $current_user->ID : 'NULL';
+		// Create a new entry with just an ID, if null
+		if ( null === $lead ) {
+			$temp_entry = array(
+                'form_id' => $form['id'],
+                'user_agent' => RGFormsModel::truncate( $_SERVER["HTTP_USER_AGENT"], 250 ),
+            );
 
-			$lead_table = RGFormsModel::get_lead_table_name();
-			$user_agent = RGFormsModel::truncate( $_SERVER["HTTP_USER_AGENT"], 250 );
-			$currency   = GFCommon::get_currency();
-			$source_url = RGFormsModel::truncate( RGFormsModel::get_current_page_url(), 200 );
+			//reading newly created lead id
+			$entry_id = GFAPI::add_entry( $temp_entry );
 
-			$wpdb->query( $wpdb->prepare( "INSERT INTO $lead_table(form_id, ip, source_url, date_created, user_agent, currency, created_by) VALUES(%d, %s, %s, utc_timestamp(), %s, %s, {$user_id})", $form["id"], RGFormsModel::get_ip(), $source_url, $user_agent, $currency ) );
+			unset( $temp_entry );
 
+			$lead = GFAPI::get_entry( $entry_id );
+		}
 
-			//reading newly created lead id
-			$lead_id = $wpdb->insert_id;
-			$lead    = array( "id" => $lead_id );
 
+		if( is_callable( array( 'GFFormsModel', 'get_entry_meta_table_name' ) ) ) {
+			$entry_meta_table = RGFormsModel::get_entry_meta_table_name();
+			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, meta_key FROM $entry_meta_table WHERE entry_id=%d", $lead['id'] ) );
+        } else {
+			$lead_detail_table = RGFormsModel::get_lead_details_table_name();
+			$current_fields    = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $lead["id"] ) );
 		}
 
-		$current_fields   = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $lead["id"] ) );
 		$original_post_id = rgget( "post_id", $lead );
 
 		$total_fields       = array();
@@ -2790,71 +2792,95 @@ public static function save_lead( $form, &$lead ) {
 		foreach ( $form["fields"] as $field ) {
 
 			//Ignore fields that are marked as display only
-			if ( rgget( "displayOnly", $field ) && $field["type"] != "password" ) {
+			if ( rgget( "displayOnly", $field ) && $field->type !== "password" ) {
 				continue;
 			}
 
 			//ignore pricing fields in the entry detail
-			if ( RG_CURRENT_VIEW == "entry" && GFCommon::is_pricing_field( $field["type"] ) ) {
+			if ( GFForms::get( 'view' ) === "entry" && GFCommon::is_pricing_field( $field->type ) ) {
 				continue;
 			}
 
 
 			//process total field after all fields have been saved
-			if ( $field["type"] == "total" ) {
+			if ( $field->type == "total" ) {
 				$total_fields[] = $field;
 				continue;
 			}
 
 			//only save fields that are not hidden (except on entry screen)
-			if ( RG_CURRENT_VIEW == "entry" || ! RGFormsModel::is_field_hidden( $form, $field, array(), $lead ) ) {
-				// process calculation fields after all fields have been saved (moved after the is hidden check)
-				if ( GFCommon::has_field_calculation( $field ) ) {
+			if ( GFForms::get( 'view' ) === "entry" || ! GFFormsModel::is_field_hidden( $form, $field, array(), $lead ) ) {
+
+			    // process calculation fields after all fields have been saved (moved after the is hidden check)
+				if ( $field->has_calculation() ) {
 					$calculation_fields[] = $field;
 					continue;
 				}
 
-				if ( $field['type'] == 'post_category' ) {
+				if ( $field->type == 'post_category' ) {
 					$field = GFCommon::add_categories_as_choices( $field, '' );
 				}
 
-				if ( isset( $field["inputs"] ) && is_array( $field["inputs"] ) ) {
-
-					foreach ( $field["inputs"] as $input ) {
-						RGFormsModel::save_input( $form, $field, $lead, $current_fields, $input["id"] );
+				if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
+					foreach ( $field->inputs as $input ) {
+						GFFormsModel::save_input( $form, $field, $lead, $current_fields, $input["id"] );
 					}
 				} else {
-					RGFormsModel::save_input( $form, $field, $lead, $current_fields, $field["id"] );
+					GFFormsModel::save_input( $form, $field, $lead, $current_fields, $field->id );
 				}
 			}
 
+			if( is_callable( 'GFFormsModel', 'commit_batch_field_operations' ) ) {
+				GFFormsModel::commit_batch_field_operations();
+            }
+
 			//Refresh lead to support conditionals (not optimal but...)
-			$lead = RGFormsModel::get_lead( $lead['id'] );
+			$lead = GFFormsModel::get_lead( $lead['id'] );
 		}
 
 		if ( ! empty( $calculation_fields ) ) {
+
+			if( is_callable( 'GFFormsModel', 'begin_batch_field_operations' ) ) {
+				GFFormsModel::begin_batch_field_operations();
+			}
+
 			foreach ( $calculation_fields as $calculation_field ) {
 
-				if ( isset( $calculation_field["inputs"] ) && is_array( $calculation_field["inputs"] ) ) {
-					foreach ( $calculation_field["inputs"] as $input ) {
+				if ( isset( $calculation_field->inputs ) && is_array( $calculation_field->inputs ) ) {
+					foreach ( $calculation_field->inputs as $input ) {
 						RGFormsModel::save_input( $form, $calculation_field, $lead, $current_fields, $input["id"] );
 						RGFormsModel::refresh_lead_field_value( $lead["id"], $input["id"] );
 					}
 				} else {
-					RGFormsModel::save_input( $form, $calculation_field, $lead, $current_fields, $calculation_field["id"] );
-					RGFormsModel::refresh_lead_field_value( $lead["id"], $calculation_field["id"] );
+					RGFormsModel::save_input( $form, $calculation_field, $lead, $current_fields, $calculation_field->id );
+					RGFormsModel::refresh_lead_field_value( $lead["id"], $calculation_field->id );
 				}
+			}
 
+			if( is_callable( 'GFFormsModel', 'commit_batch_field_operations' ) ) {
+				GFFormsModel::commit_batch_field_operations();
 			}
+
 			RGFormsModel::refresh_product_cache( $form, $lead = RGFormsModel::get_lead( $lead['id'] ) );
 		}
 
 		//saving total field as the last field of the form.
 		if ( ! empty( $total_fields ) ) {
+
+			if( is_callable( 'GFFormsModel', 'begin_batch_field_operations' ) ) {
+				GFFormsModel::begin_batch_field_operations();
+			}
+
 			foreach ( $total_fields as $total_field ) {
 				GFCommon::log_debug( "Saving total field." );
-				RGFormsModel::save_input( $form, $total_field, $lead, $current_fields, $total_field["id"] );
+
+				RGFormsModel::save_input( $form, $total_field, $lead, $current_fields, $total_field->id );
+
 			}
+
+			if( is_callable( 'GFFormsModel', 'commit_batch_field_operations' ) ) {
+                GFFormsModel::commit_batch_field_operations();
+            }
 		}
 	}
 

From 25fa6574aedef9232bfcef15981068ee9bdf4f88 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:13:09 -0700
Subject: [PATCH 18/59] Fix numeric sorting

---
 gravity-forms-addons.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 6a90973..8c8d3a9 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1327,7 +1327,7 @@ public static function make_directory( $atts ) {
 		$tableclass .= ! empty( $jstable ) ? sprintf( ' tablesorter tablesorter-%s', apply_filters( 'kws_gf_tablesorter_theme', 'blue', $form ) ) : '';
 		$title           = $form["title"];
 		$sort_field_meta = RGFormsModel::get_field( $form, $sort_field );
-		$is_numeric      = $sort_field_meta["type"] == "number";
+		$is_numeric      = ( $sort_field_meta && $sort_field_meta->type === "number" );
 
 		$columns = self::get_grid_columns( $form_id, true );
 
@@ -2252,6 +2252,7 @@ public static function get_leads( $form_id, $sort_field_number = 0, $sort_direct
 		$sorting = array(
             'direction' => $sort_direction,
             'key' => $sort_field_number,
+            'is_numeric' => $is_numeric_sort,
         );
 
 		$paging = array(

From e6f25a18f4af9f803da7b1c24bb8db1f2c06151f Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:13:28 -0700
Subject: [PATCH 19/59] Allow users with `gravityforms_edit_entries`
 capabilities to edit entries

---
 gravity-forms-addons.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 8c8d3a9..fb02463 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -549,10 +549,10 @@ static public function edit_lead_detail( $Form, $lead, $options ) {
 			( ! empty( $options['useredit'] ) && is_user_logged_in() && intval( $current_user->ID ) === intval( $lead['created_by'] ) ) === true || // OR
 
 			// Administrators can edit every listing, and this person has administrator access
-			( ! empty( $options['adminedit'] ) && self::has_access( "gravityforms_directory" ) ) === true )
-		) {
+			( ! empty( $options['adminedit'] ) && ( self::has_access( "gravityforms_directory" ) === true || GFCommon::current_user_can_any('gravityforms_edit_entries') ) )
+		) ) {
 			// Kick them out.
-			printf( esc_html_e( '%sYou do not have permission to edit this form.%s', 'gravity-forms-addons' ), '<div class="error">', '</div>' );
+			printf( esc_html__( '%sYou do not have permission to edit this form.%s', 'gravity-forms-addons' ), '<div class="error">', '</div>' );
 
 			return;
 		}

From f38e472e3b88983c2a5ed23b6bd4b4faf6a7c2f1 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:14:10 -0700
Subject: [PATCH 20/59] Update get_admin_only() to use GF_Field

---
 gravity-forms-addons.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index fb02463..7b4b0d5 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -937,18 +937,18 @@ static public function get_admin_only( $form, $adminOnly = array() ) {
 			return false;
 		}
 
-		foreach ( $form['fields'] as $key => $col ) {
+		foreach ( $form['fields'] as $key => $field ) {
 			// Only the Go to Entry button adds disableMargins.
 
-			if ( $col['type'] === 'hidden' && ! empty( $col['useAsEntryLink'] ) && ! empty( $col['disableMargins'] ) ) {
+			if ( $field->type === 'hidden' && ! empty( $field->useAsEntryLink ) && ! empty( $field->disableMargins ) ) {
 				continue;
 			}
-			if ( ! empty( $col['adminOnly'] ) ) {
-				$adminOnly[] = $col['id'];
+			if ( ! empty( $field->adminOnly ) ) {
+				$adminOnly[] = $field->id;
 			}
-			if ( isset( $col['inputs'] ) && is_array( $col['inputs'] ) ) {
-				foreach ( $col['inputs'] as $key2 => $input ) {
-					if ( ! empty( $col['adminOnly'] ) ) {
+			if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
+				foreach ( $field->inputs as $key2 => $input ) {
+					if ( ! empty( $field->adminOnly ) ) {
 						$adminOnly[] = $input['id'];
 					}
 				}

From 7aa284360cc92e26212fa37fb920f9bbfef9718a Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:32:51 -0700
Subject: [PATCH 21/59] Improve "Powered By" link

---
 gravity-forms-addons.php | 52 +++++++---------------------------------
 1 file changed, 9 insertions(+), 43 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 7b4b0d5..7e72f8b 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1957,8 +1957,8 @@ static private function render_search_input( $label = '', $name = '' ) {
 
 
 	static public function get_credit_link( $columns = 1, $options = array() ) {
-		global $post;// prevents calling before <HTML>
-		if ( empty( $post ) || is_admin() ) {
+
+		if ( ! did_action('wp_head') || is_admin() ) {
 			return;
 		}
 
@@ -1967,7 +1967,13 @@ static public function get_credit_link( $columns = 1, $options = array() ) {
 		// Only show credit link if the user has saved settings;
 		// this prevents existing directories adding a link without user action.
 		if ( isset( $settings['version'] ) ) {
-			echo "<tr><th colspan='{$columns}'>" . self::attr( $options ) . "</th></tr>";
+
+			$plugin_name = esc_html__( 'Gravity Forms Directory', 'gravity-forms-addon' );
+			$link = '<a href="https://katz.co/gravity-forms-addons/">' . $plugin_name . '</a>';
+		    $attribution_text = sprintf( esc_html__('Powered by %s', 'gravity-forms-addon' ), $link );
+			$attribution_html = '<span class="kws_gf_credit" style="font-weight:normal; text-align:center; display:block; margin:0 auto;">'. $attribution_text . '</span>';
+
+			echo "<tr><th colspan='{$columns}'>" . $attribution_html . "</th></tr>";
 		}
 	}
 
@@ -1975,46 +1981,6 @@ static public function get_version() {
 		return self::$version;
 	}
 
-	static public function return_7776000() {
-		return 7776000; // extend the cache to 90 days
-	}
-
-	static public function attr( $options, $default = '<span class="kws_gf_credit" style="font-weight:normal; text-align:center; display:block; margin:0 auto;">Powered by <a href="http://katz.co/gravity-forms-addons/">Gravity Forms Directory</a></span>' ) {
-		include_once( ABSPATH . WPINC . '/feed.php' );
-		add_filter( 'wp_feed_cache_transient_lifetime', array( 'GFDirectory', 'return_7776000' ) );
-		$rss = fetch_feed( add_query_arg( array(
-			'site'    => htmlentities( substr( get_bloginfo( 'url' ), is_ssl() ? 8 : 7 ) ),
-			'from'    => 'kws_gf_addons',
-			'version' => self::$version,
-			'credit'  => ! empty( $options['credit'] ),
-		), 'http://www.katzwebservices.com/development/attribution.php' ) );
-		remove_filter( 'wp_feed_cache_transient_lifetime', array( 'GFDirectory', 'return_7776000' ) );
-		if ( $rss && ! is_wp_error( $rss ) ) {
-			// We want to strip all tags except for 'style', 'id', and 'class' so that the return value is always safe for the site.
-			$strip = array(
-				'bgsound',
-				'expr',
-				'onclick',
-				'onerror',
-				'onfinish',
-				'onmouseover',
-				'onmouseout',
-				'onfocus',
-				'onblur',
-				'lowsrc',
-				'dynsrc',
-			);
-			$rss->strip_attributes( $strip );
-			$rss_items = $rss->get_items( 0, 1 );
-			foreach ( $rss_items as $item ) {
-				return str_replace( array( "\n", "\r" ), ' ', $item->get_description() );
-			}
-		}
-
-		return $default;
-	}
-
-
 	static public function add_lead_approved_hidden_input( $value, $lead, $field = '' ) {
 
 		if ( ! isset( $processed_meta ) ) {

From 8ab1f2494103e62cb4ba3f87d33cbb3211690456 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:34:37 -0700
Subject: [PATCH 22/59] Remove unused code

---
 gravity-forms-addons.php | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 7e72f8b..556538b 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -208,7 +208,6 @@ public static function init() {
 			if ( apply_filters( 'kws_gf_directory_shortlink', true ) ) {
 				add_filter( 'get_shortlink', array( 'GFDirectory', 'shortlink' ) );
 			}
-			add_filter( 'kws_gf_directory_lead_filter', array( 'GFDirectory', 'show_only_user_entries' ), 10, 2 );
 			add_filter( 'kws_gf_directory_anchor_text', array( 'GFDirectory', 'directory_anchor_text' ) );
 		}
 
@@ -1116,7 +1115,6 @@ static public function change_directory_columns() {
 	}
 
 	public static function update_grid_column_meta( $form_id, $columns ) {
-		global $wpdb;
 
 		$meta = maybe_serialize( stripslashes_deep( $columns ) );
 
@@ -1124,9 +1122,9 @@ public static function update_grid_column_meta( $form_id, $columns ) {
 	}
 
 	public static function get_grid_column_meta( $form_id ) {
-		global $wpdb;
 
 		$grid = get_option( 'gf_directory_form_' . $form_id . '_grid' );
+
 		if ( ! $grid ) {
 			$grid = GFFormsModel::get_grid_column_meta( $form_id );
 			self::update_grid_column_meta( $form_id, $grid );
@@ -2423,7 +2421,6 @@ static public function convert_to_ul( $content = NULL, $singleUL = false ) {
 			}
 			$content = preg_replace( "/<\/tr[^>]*>/", "\t\t\t\t\t</ul>\n\t\t\t\t\t\t\t\t\t\t\t\t</li>", $content );
 		}
-		#	$content = preg_replace("/\<\/p\>\s+\<\/li/ism","\<\/p\>\<\/li", $content);
 		$content = preg_replace( "/(?:\s+)?(valign\=\"(?:.*?)\"|width\=\"(?:.*?)\"|cellspacing\=\"(?:.*?)\")(?:\s+)?/ism", ' ', $content );
 		$content = preg_replace( "/<\/?tbody[^>]*>/", "", $content );
 		$content = preg_replace( "/<thead[^>]*>.*<\/thead>|<tfoot[^>]*>.*<\/tfoot>/is", "", $content );
@@ -2488,7 +2485,7 @@ static public function make_entry_link( $options = array(), $link = false, $lead
 					$url = $url['path'];
 				}
 				$href = trailingslashit( $url ) . sanitize_title( apply_filters( 'kws_gf_directory_endpoint', 'entry' ) ) . '/' . $form_id . apply_filters( 'kws_gf_directory_endpoint_separator', '/' ) . $lead_id . '/';
-				#if(!empty($url['query'])) { $href .= '?'.$url['query']; }
+
 				$href = add_query_arg( array(
 					'gf_search'  => ! empty( $_REQUEST['gf_search'] ) ? $_REQUEST['gf_search'] : NULL,
 					'sort'       => isset( $_REQUEST['sort'] ) ? $_REQUEST['sort'] : NULL,
@@ -2549,7 +2546,6 @@ static function hide_in_single( $form, $field_id ) {
 
 	static function check_hide_in( $type, $form, $field_id ) {
 		foreach ( $form['fields'] as $field ) {
-#			echo $field['label'] . ' / ' . floor($field['id']).' / '.floor($field_id).' / <strong>'.$field["{$type}"].'</strong><br />';
 			if ( floor( $field_id ) === floor( $field['id'] ) && ! empty( $field["{$type}"] ) ) {
 				return true;
 			}
@@ -2907,17 +2903,11 @@ function get_gf_field_label( $form_id, $field_id ) {
 			$form = RGFormsModel::get_form_meta( $form_id );
 			foreach ( $form["fields"] as $field ) {
 				if ( $field['id'] == $field_id ) {
-					# $output = RGForms::escape_text($field['label']); // No longer used
 					$output = esc_html( $field['label'] ); // Using esc_html(), a WP function
 				} elseif ( is_array( $field['inputs'] ) ) {
 					foreach ( $field["inputs"] as $input ) {
 						if ( $input['id'] == $field_id ) {
-							if ( class_exists( 'GFCommon' ) ) {
-								$output = esc_html( GFCommon::get_label( $field, $field_id ) );
-							} else {
-								#$output = RGForms::escape_text(RGForms::get_label($field,$field_id));  // No longer used
-								$output = esc_html( RGForms::get_label( $field, $field_id ) );  // No longer used
-							}
+							$output = esc_html( GFCommon::get_label( $field, $field_id ) );
 						}
 					}
 				}

From 1bb9d77fb99ad6d729585cd1aa1e5d15aab0b0e1 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:35:09 -0700
Subject: [PATCH 23/59] Convert field array to GF_Field

---
 gravity-forms-addons.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 556538b..1125820 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -2546,7 +2546,7 @@ static function hide_in_single( $form, $field_id ) {
 
 	static function check_hide_in( $type, $form, $field_id ) {
 		foreach ( $form['fields'] as $field ) {
-			if ( floor( $field_id ) === floor( $field['id'] ) && ! empty( $field["{$type}"] ) ) {
+			if ( floor( $field_id ) === floor( $field->id ) && ! empty( $field->{$type} ) ) {
 				return true;
 			}
 		}

From e38a3230319b9967bcf3359af0f7fb788fcde6d4 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:37:34 -0700
Subject: [PATCH 24/59] Remove show_only_user_entries() filter

Now it's baked into search
---
 gravity-forms-addons.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 1125820..ad5862a 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -2296,6 +2296,13 @@ public static function get_leads( $form_id, $sort_field_number = 0, $sort_direct
 		}
 
 
+	/**
+     * @deprecated 4.0
+	 */
+	static function show_only_user_entries( $leads = array(), $settings = array() ) {
+		_deprecated_function( __METHOD__, '4.0' );
+		return $leads;
+	}
 
 
 		if ( apply_filters( 'kws_gf_directory_anchor_text_striphttp', true ) ) {

From 041ad3761e0f5a3ad5fc2fb831f24c7a08d8e0bd Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:37:47 -0700
Subject: [PATCH 25/59] Remove deprecated call to get_currentuserinfo()

---
 gravity-forms-addons.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index ad5862a..3563892 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -2290,11 +2290,15 @@ public static function get_leads( $form_id, $sort_field_number = 0, $sort_direct
 	 *
 	 * @return bool true: same user; false: nope!
 	 */
+	public static function is_current_user( $lead = array() ) {
+		$current_user = wp_get_current_user();
 
 		if ( empty( $lead["created_by"] ) ) {
             return false;
 		}
 
+		return ( (int) $current_user->ID === (int) $lead["created_by"] );
+	}
 
 	/**
      * @deprecated 4.0

From a1579e70031b6cc5d3f7fafc8fa10c5e3047167b Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:38:20 -0700
Subject: [PATCH 26/59] Fix incorrect search results when no search being
 performed

---
 gravity-forms-addons.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 3563892..c0cb361 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -2226,7 +2226,7 @@ public static function get_leads( $form_id, $sort_field_number = 0, $sort_direct
 
 		$search_criteria['field_filters'] = rgar( $search_criteria, 'field_filters', array() );
 
-		if ( '' !== $search ) {
+		if ( '' !== $search && ! is_null( $search ) ) {
 			$search_criteria['field_filters'][] = array(
 				'key' => 0,
 				'value' => $search,

From b6d7154719e67c7f3d675ba8df65ad9476c9eae6 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:38:42 -0700
Subject: [PATCH 27/59] Don't silently fail when fetching $_COOKIE

---
 gravity-forms-addons.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index c0cb361..ade8bc4 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -676,7 +676,8 @@ static public function lead_detail( $Form, $lead, $allow_display_empty_fields =
 		$display_empty_fields       = '';
 		$allow_display_empty_fields = true;
 		if ( $allow_display_empty_fields ) {
-			$display_empty_fields = @rgget( "gf_display_empty_fields", $_COOKIE );
+			$cookie_array = isset( $_COOKIE ) ? $_COOKIE : array();
+			$display_empty_fields = rgar( $cookie_array, "gf_display_empty_fields" );
 		}
 		if ( empty( $options ) ) {
 			$options = self::directory_defaults();

From 026c7e09f27c303714ea512ec1a795bb53458108 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:45:13 -0700
Subject: [PATCH 28/59] Use rg* functions instead of RGForms functions

---
 gravity-forms-addons.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index ade8bc4..ef2e020 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -481,7 +481,7 @@ static public function add_rewrite() {
 
 	//Returns true if the current page is one of Gravity Forms pages. Returns false if not
 	public static function is_gravity_page( $page = array() ) {
-		$current_page = trim( strtolower( RGForms::get( "page" ) ) );
+		$current_page = trim( strtolower( rgget( "page" ) ) );
 		if ( empty( $page ) ) {
 			$gf_pages = array( "gf_edit_forms", "gf_new_form", "gf_entries", "gf_settings", "gf_export", "gf_help" );
 		} else {
@@ -559,7 +559,7 @@ static public function edit_lead_detail( $Form, $lead, $options ) {
 		$validation_message = '';
 
 		// If the form is submitted
-		if ( RGForms::post( "action" ) === "update" ) {
+		if ( rgpost( "action" ) === "update" ) {
 			check_admin_referer( 'gforms_save_entry', 'gforms_save_entry' );
 
 			$lead = apply_filters( 'kws_gf_directory_lead_being_updated', $lead, $Form );
@@ -577,6 +577,7 @@ static public function edit_lead_detail( $Form, $lead, $options ) {
 			foreach ( $Form['fields'] as $field ) {
 				if ( ! GFCommon::is_product_field( $field["type"] ) ) {
 					$validation_message .= ( rgget( "failed_validation", $field ) && ! empty( $field["validation_message"] ) ) ? sprintf( "<li class='gfield_description validation_message'><strong>%s</strong>: %s</li>", $field["label"], $field["validation_message"] ) : "";;
+				if ( ! GFCommon::is_product_field( $field->type ) ) {
 				}
 			}
 			if ( ! empty( $validation_message ) ) {
@@ -684,10 +685,10 @@ static public function lead_detail( $Form, $lead, $allow_display_empty_fields =
 		}
 
 		// There is no edit link
-		if ( isset( $_GET['edit'] ) || RGForms::post( "action" ) === "update" ) {
+		if ( isset( $_GET['edit'] ) || rgpost( "action" ) === "update" ) {
 			// Process editing leads
 			$lead = self::edit_lead_detail( $Form, $lead, $options );
-			if ( RGForms::post( "action" ) !== "update" ) {
+			if ( rgpost( "action" ) !== "update" ) {
 				return;
 			}
 		}

From af32d2497347fe94a26409fec87b71346b1e7b5c Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:46:39 -0700
Subject: [PATCH 29/59] =?UTF-8?q?Fix=20accessing=20$field=20as=20array?=
 =?UTF-8?q?=E2=80=94now=20GF=5FField?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gravity-forms-addons.php | 61 ++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index ef2e020..9d371ec 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -566,7 +566,7 @@ static public function edit_lead_detail( $Form, $lead, $options ) {
 
 			// We don't DO passwords.
 			foreach ( $Form['fields'] as $key => $field ) {
-				if ( $field['type'] === 'password' ) {
+				if ( $field->type === 'password' ) {
 					unset( $Form['fields'][ $key ] );
 				}
 			}
@@ -575,9 +575,8 @@ static public function edit_lead_detail( $Form, $lead, $options ) {
 
 			$validation_message = '';
 			foreach ( $Form['fields'] as $field ) {
-				if ( ! GFCommon::is_product_field( $field["type"] ) ) {
-					$validation_message .= ( rgget( "failed_validation", $field ) && ! empty( $field["validation_message"] ) ) ? sprintf( "<li class='gfield_description validation_message'><strong>%s</strong>: %s</li>", $field["label"], $field["validation_message"] ) : "";;
 				if ( ! GFCommon::is_product_field( $field->type ) ) {
+					$validation_message .= ( rgget( "failed_validation", $field ) && ! empty( $field->validation_message ) ) ? sprintf( "<li class='gfield_description validation_message'><strong>%s</strong>: %s</li>", $field->label, $field->validation_message ) : "";;
 				}
 			}
 			if ( ! empty( $validation_message ) ) {
@@ -624,7 +623,7 @@ static public function edit_lead_detail( $Form, $lead, $options ) {
 				$product_fields        = array();
 				foreach ( $Form['fields'] as $key => $field ) {
 					if (
-						GFCommon::is_product_field( $field["type"] ) ||
+						GFCommon::is_product_field( $field->type ) ||
 						is_numeric( $lead["post_id"] ) && GFCommon::is_post_field( $field )
 					) {
 						if ( is_numeric( $lead["post_id"] ) && GFCommon::is_post_field( $field ) && ! $message_shown ) {
@@ -633,9 +632,9 @@ static public function edit_lead_detail( $Form, $lead, $options ) {
 						}
 
 						unset( $form_without_products['fields'][ $key ] );
-						$product_fields[] = $field['id'];
-						if ( ! empty( $field['inputs'] ) ) {
-							foreach ( $field['inputs'] as $input ) {
+						$product_fields[] = $field->id;
+						if ( ! empty( $field->inputs ) ) {
+							foreach ( $field->inputs as $input ) {
 								$product_fields[] = $input['id'];
 							}
 						}
@@ -729,9 +728,9 @@ static public function lead_detail( $Form, $lead, $allow_display_empty_fields =
 			foreach ( $Form["fields"] as $field ) {
 
 				// Don't show fields defined as hide in single.
-				if ( ! empty( $field['hideInSingle'] ) ) {
+				if ( ! empty( $field->hideInSingle ) ) {
 					if ( self::has_access( "gravityforms_directory" ) ) {
-						echo "\n\t\t\t\t\t\t\t\t\t" . '<!-- ' . sprintf( esc_html__( '(Admin-only notice) Field #%d not shown: "Hide This Field in Single Entry View" was selected.', 'gravity-forms-addons' ), $field['id'] ) . ' -->' . "\n\n";
+						echo "\n\t\t\t\t\t\t\t\t\t" . '<!-- ' . sprintf( esc_html__( '(Admin-only notice) Field #%d not shown: "Hide This Field in Single Entry View" was selected.', 'gravity-forms-addons' ), $field->id ) . ' -->' . "\n\n";
 					}
 					continue;
 				}
@@ -773,7 +772,7 @@ class="entry-view-section-break<?php echo $is_last ? " lastrow" : "" ?>"><?php e
 
 					default :
 						//ignore product fields as they will be grouped together at the end of the grid
-						if ( GFCommon::is_product_field( $field["type"] ) ) {
+						if ( GFCommon::is_product_field( $field->type ) ) {
 							$has_product_fields = true;
 							continue;
 						}
@@ -1144,21 +1143,21 @@ public static function get_grid_columns( $form_id, $input_label_only = false ) {
 			for ( $i = 0, $count = sizeof( $form["fields"] ); $i < $count && $i < 5; $i ++ ) {
 				$field = $form["fields"][ $i ];
 
-				if ( RGForms::get( "displayOnly", $field ) ) {
+				if ( $field->displayOnly ) {
 					continue;
 				}
 
 
-				if ( isset( $field["inputs"] ) && is_array( $field["inputs"] ) ) {
-					$field_ids[] = $field["id"];
-					if ( $field["type"] == "name" ) {
-						$field_ids[] = $field["id"] . '.3'; //adding first name
-						$field_ids[] = $field["id"] . '.6'; //adding last name
-					} else if ( isset( $field["inputs"][0] ) ) {
-						$field_ids[] = $field["inputs"][0]["id"]; //getting first input
+				if ( isset( $field->inputs ) && is_array( $field->inputs ) ) {
+					$field_ids[] = $field->id;
+					if ( 'name' === $field->type ) {
+						$field_ids[] = $field->id . '.3'; //adding first name
+						$field_ids[] = $field->id . '.6'; //adding last name
+					} else if ( isset( $field->inputs[0] ) ) {
+						$field_ids[] = $field->inputs[0]["id"]; //getting first input
 					}
 				} else {
-					$field_ids[] = $field["id"];
+					$field_ids[] = $field->id;
 				}
 			}
 			//adding default entry meta columns
@@ -1210,8 +1209,8 @@ public static function get_grid_columns( $form_id, $input_label_only = false ) {
 					if ( $field ) {
 						$columns[ strval( $field_id ) ] = array(
 							"label"     => self::get_label( $field, $field_id, $input_label_only ),
-							"type"      => rgget( "type", $field ),
-							"inputType" => rgget( "inputType", $field ),
+							"type"      => rgobj( $field, 'type' ),
+							"inputType" => rgobj( $field, 'inputType' ),
 						);
 					}
 			}
@@ -1224,9 +1223,9 @@ public static function get_grid_columns( $form_id, $input_label_only = false ) {
 	 * Get the label for the input field. This is necessary to prevent Admin Labels from being used instead of normal labels.
 	 */
 	public static function get_label( $field, $input_id = 0, $input_only = false ) {
-		$field_label = rgar( $field, "label" );
+		$field_label = rgobj( $field, "label" );
 		$input       = GFFormsModel::get_input( $field, $input_id );
-		if ( rgget( "type", $field ) == "checkbox" && $input != NULL ) {
+		if ( 'checkbox' === rgobj( $field, "type" ) && $input != NULL ) {
 			return $input["label"];
 		} else if ( $input != NULL ) {
 			return $input_only ? $input["label"] : $field_label . ' (' . $input["label"] . ')';
@@ -2175,8 +2174,8 @@ public static function get_search_filters( $form ) {
 		$search_fields = array();
 
 		foreach ( $form['fields'] as $field ) {
-			if ( ! empty( $field['isSearchFilter'] ) ) {
-				$search_fields[] = $field['id'];
+			if ( ! empty( $field->isSearchFilter ) ) {
+				$search_fields[] = $field->id;
 			}
 		}
 
@@ -2578,7 +2577,7 @@ static function get_field_property( $property, $form, $field_id = '' ) {
 		}
 		foreach ( $form['fields'] as $field ) {
 
-			if ( floor( $field_id ) === floor( $field['id'] ) && ! empty( $field[ $property ] ) ) {
+			if ( floor( $field_id ) === floor( $field->id ) && ! empty( $field[ $property ] ) ) {
 				return $field[ $property ];
 			}
 		}
@@ -2602,7 +2601,7 @@ static function get_field_properties( $form, $field_id = '' ) {
 		}
 
 		foreach ( $form['fields'] as $field ) {
-			if ( floor( $field_id ) === floor( $field['id'] ) ) {
+			if ( floor( $field_id ) === floor( $field->id ) ) {
 				return $field;
 			}
 		}
@@ -2915,10 +2914,10 @@ function gf_field_value_long( $leadid, $fieldid, $form = array() ) {
 		function get_gf_field_label( $form_id, $field_id ) {
 			$form = RGFormsModel::get_form_meta( $form_id );
 			foreach ( $form["fields"] as $field ) {
-				if ( $field['id'] == $field_id ) {
-					$output = esc_html( $field['label'] ); // Using esc_html(), a WP function
-				} elseif ( is_array( $field['inputs'] ) ) {
-					foreach ( $field["inputs"] as $input ) {
+				if ( $field->id == $field_id ) {
+					$output = esc_html( $field->label ); // Using esc_html(), a WP function
+				} elseif ( is_array( $field->inputs ) ) {
+					foreach ( $field->inputs as $input ) {
 						if ( $input['id'] == $field_id ) {
 							$output = esc_html( GFCommon::get_label( $field, $field_id ) );
 						}

From bd9ecdacfcf1b0a196d286c4f84ccc1ef269a911 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:47:10 -0700
Subject: [PATCH 30/59] Improve variable naming

---
 gravity-forms-addons.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 9d371ec..505622b 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -525,14 +525,14 @@ static public function edit_lead_detail( $Form, $lead, $options ) {
 		global $current_user;
 		require_once( GFCommon::get_base_path() . "/form_display.php" );
 
-		$_gform_directory_approvedcolumn = self::get_approved_column( $Form );
+		$approvedcolumn = self::get_approved_column( $Form );
 
 		// We fetch this again, since it may have had some admin-only columns taken out.
 		#$lead = RGFormsModel::get_lead($lead["id"]);
 
 		// If you want to allow users to edit their own approval (?) add a filter and return true.
 		if ( apply_filters( 'kws_gf_directory_allow_user_edit_approved', false ) === false ) {
-			$Form['fields'] = self::remove_approved_column( 'form', $Form['fields'], $_gform_directory_approvedcolumn );
+			$Form['fields'] = self::remove_approved_column( 'form', $Form['fields'], $approvedcolumn );
 		}
 
 		// If this is not the form that should be edited
@@ -1989,10 +1989,10 @@ static public function add_lead_approved_hidden_input( $value, $lead, $field = '
 		if ( ! in_array( $lead['id'], $processed_meta ) ) {
 			$processed_meta[] = $lead['id'];
 
-			$forms                           = RGFormsModel::get_forms( NULL, "title" );
-            $_gform_directory_approvedcolumn = self::globals_get_approved_column( $forms[0]->id );
+			$forms          = RGFormsModel::get_forms( null, "title" );
+			$approvedcolumn = self::globals_get_approved_column( $forms[0]->id );
 
-			if ( self::check_approval( $lead, $_gform_directory_approvedcolumn ) ) {
+			if ( self::check_approval( $lead, $approvedcolumn ) ) {
 				echo '<span style="display:none;"><input type="hidden" class="lead_approved" id="lead_approved_' . $lead['id'] . '" value="true" /></span>';
 			}
 		}

From 2a60389ba49eaea856886e74b9a72143cc3ff2b9 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:47:44 -0700
Subject: [PATCH 31/59] Docblocks, whitespace, and unused code

---
 gravity-forms-addons.php | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 505622b..32f0ff7 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -587,12 +587,16 @@ static public function edit_lead_detail( $Form, $lead, $options ) {
 			// So the form submission always throws an error even though there's no problem.
 			// Product fields can't be edited, so that doesn't really matter.
 			if ( ! empty( $is_valid ) || ( empty( $is_valid ) && empty( $validation_message ) ) ) {
-				do_action( 'kws_gf_directory_pre_update_lead', $lead, $Form );
-				// since @3.6.1 to enable conditional fields' updates.
+
+			    do_action( 'kws_gf_directory_pre_update_lead', $lead, $Form );
+
+			    // since @3.6.1 to enable conditional fields' updates.
 				self::save_lead( $Form, $lead );
+
 				$lead = RGFormsModel::get_lead( $lead["id"] );
 
 				do_action( 'kws_gf_directory_post_update_lead', $lead, $Form );
+
 				echo apply_filters( 'kws_gf_directory_lead_updated_message', sprintf( esc_html__( "%sThe entry was successfully updated.%s", 'gravity-forms-addons' ), "<p class='updated' id='message' style='padding:.5em .75em; background-color:#ffffcc; border:1px solid #ccc;'>", "</p>" ), $lead, $Form );
 
 				return $lead;
@@ -619,7 +623,6 @@ static public function edit_lead_detail( $Form, $lead, $options ) {
 				<?php
 
 				$form_without_products = $Form;
-				$post_message_shown    = false;
 				$product_fields        = array();
 				foreach ( $Form['fields'] as $key => $field ) {
 					if (
@@ -958,10 +961,11 @@ static public function get_admin_only( $form, $adminOnly = array() ) {
 		return $adminOnly;
 	}
 
-	/*
-	* 	Get the form and lead IDs from the URL or from $_REQUEST
-	*	@return array|null $formid, $leadid if found. Null if not.
-	*/
+	/**
+	 * Get the form and lead IDs from the URL or from $_REQUEST
+	 *
+	 * @return array|null $formid, $leadid if found. Null if not.
+	 */
 	static private function get_form_and_lead_ids() {
 		global $wp, $wp_rewrite;
 
@@ -2309,6 +2313,14 @@ static function show_only_user_entries( $leads = array(), $settings = array() )
 		return $leads;
 	}
 
+	/**
+     * Modify how the anchor text is displayed based on filters
+     *
+     * @param string $value Original anchor text (eg: "https://www.example.com?query=string")
+     *
+     * @return string Modified anchor text (eg: "example.com")
+     */
+	static function directory_anchor_text( $value = '' ) {
 
 		if ( apply_filters( 'kws_gf_directory_anchor_text_striphttp', true ) ) {
 			$value = str_replace( 'http://', '', $value );
@@ -2646,7 +2658,7 @@ static function remove_approved_column( $type = 'form', $fields, $approvedcolumn
 	 * @param bool $show_admin_only (default: false)
 	 * @param mixed $form
 	 *
-	 * @return void
+	 * @return array
 	 */
 	static function remove_hidden_fields( $leads, $admin_only, $approved, $is_leads, $is_single = false, $show_admin_only = false, $form ) {
 

From e89823287137e4ca11358b71b9df894a01e5ea77 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:47:59 -0700
Subject: [PATCH 32/59] Make smartapproval more clear

---
 gravity-forms-addons.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 32f0ff7..5587ee3 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1336,11 +1336,12 @@ public static function make_directory( $atts ) {
 
 		$approvedcolumn = NULL;
 
-		if ( ( ! $approved && $approved !== - 1 ) || ( ! empty( $smartapproval ) && $approved === - 1 ) ) {
+		if ( true === $approved || ( $smartapproval && $approved === - 1 ) ) {
 			$approvedcolumn = self::get_approved_column( $form );
 		}
 
-		if ( ! empty( $smartapproval ) && $approved === - 1 && ! empty( $approvedcolumn ) ) {
+
+		if ( $approved || ( ! empty( $smartapproval ) && $approved === - 1 ) && ! empty( $approvedcolumn ) ) {
 			$approved = true; // If there is an approved column, turn on approval
 		} else {
 			$approved = false; // Otherwise, show entries as normal.

From 35b7336acf45b1af474aa5b81f98eb3b905955bb Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Mon, 5 Mar 2018 21:48:12 -0700
Subject: [PATCH 33/59] Use GFAPI to get the form

---
 gravity-forms-addons.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 5587ee3..c367502 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1298,9 +1298,9 @@ public static function make_directory( $atts ) {
 
 		$form_id = $form;
 
-		$form = RGFormsModel::get_form_meta( $form_id );
+		$form = GFAPI::get_form( $form_id );
 
-		if ( empty( $form ) ) {
+		if ( ! $form ) {
 			return;
 		}
 

From 693772a6f211c2b6791aa18d38bba266d8f7b913 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 12:55:07 -0700
Subject: [PATCH 34/59] Fix spelling error

---
 entry-details.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entry-details.php b/entry-details.php
index f37b84f..5c742a0 100644
--- a/entry-details.php
+++ b/entry-details.php
@@ -30,7 +30,7 @@
 
 // Verify that the link is accessed properly
 if ( false == wp_verify_nonce( $_GET['view'], sprintf('view-%d-%d', $_REQUEST['leadid'], $_REQUEST['form']) )) {
-     wp_die( 'Verication failed. Please return to the original page, refresh, and click on the entry again.', 'gravity-forms-addons');
+     wp_die( 'Verification failed. Please return to the original page, refresh, and click on the entry again.', 'gravity-forms-addons');
 }
 
 // Force a happy header

From 8c2bc3c06a9aca7af4d7a4998212ab813ca9b2cf Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 12:56:54 -0700
Subject: [PATCH 35/59] Restore bulk Approve/Disapprove actions

---
 admin.php     | 76 ++++++++++++++++++++++++++++++++++++---------------
 edit-form.php |  2 --
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/admin.php b/admin.php
index a47ea95..98cabcb 100644
--- a/admin.php
+++ b/admin.php
@@ -41,37 +41,59 @@ function __construct() {
 
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_edit_entry_link' ), 10, 5 );
 
+		add_action( 'gform_entry_list_bulk_actions', array( $this, 'add_bulk_actions' ), 10, 2 );
+
 		self::process_bulk_update();
 	}
 
+	/**
+     * Add Approve and Disapprove bulk actions to the entries dropdown
+	 * @param array $actions
+	 * @param int $form_id
+	 *
+	 * @return array
+	 */
+	public function add_bulk_actions( $actions = array(), $form_id = 0 ) {
+
+		$actions['approve-' . $form_id ] = esc_html__('Approve', 'gravity-forms-addons');
+		$actions['unapprove-' . $form_id ] = esc_html__('Disapprove', 'gravity-forms-addons');
+
+	    return $actions;
+    }
+
 	public static function process_bulk_update() {
 		global $process_bulk_update_message;
 
-		if ( RGForms::post( "action" ) === 'bulk' ) {
-			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
+		if ( empty( $_POST['action'] ) && empty( $_POST['action2'] ) || empty( $_POST['gforms_entry_list'] ) ) {
+            return;
+		}
 
-			$bulk_action = ! empty( $_POST["bulk_action"] ) ? $_POST["bulk_action"] : $_POST["bulk_action2"];
-			$leads       = $_POST["lead"];
+		$bulk_action = ! empty( $_POST["action"] ) ? $_POST["action"] : $_POST["action2"];
 
-			$entry_count = count( $leads ) > 1 ? sprintf( __( "%d entries", "gravityforms" ), count( $leads ) ) : __( "1 entry", "gravityforms" );
+		$bulk_action = explode( '-', $bulk_action );
+		if ( !in_array( $bulk_action[0], array( 'approve', 'unapprove' ) ) || ! isset( $bulk_action[1] ) || ! is_numeric( $bulk_action[1] ) ) {
+		    return;
+		}
 
-			$bulk_action = explode( '-', $bulk_action );
-			if ( ! isset( $bulk_action[1] ) || empty( $leads ) ) {
-				return false;
-			}
+        check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
 
-			switch ( $bulk_action[0] ) {
-				case "approve":
-					self::directory_update_bulk( $leads, 1, $bulk_action[1] );
-					$process_bulk_update_message = sprintf( __( "%s approved.", "gravity-forms-addons" ), $entry_count );
-					break;
+		$leads = isset( $_POST["lead"] ) ? $_POST["lead"] : $_POST["entry"];
 
-				case "unapprove":
-					self::directory_update_bulk( $leads, 0, $bulk_action[1] );
-					$process_bulk_update_message = sprintf( __( "%s disapproved.", "gravity-forms-addons" ), $entry_count );
-					break;
-			}
-		}
+		$leads = array_map( 'intval', $leads );
+
+        $entry_count = count( $leads ) > 1 ? sprintf( __( "%d entries", "gravityforms" ), count( $leads ) ) : __( "1 entry", "gravityforms" );
+
+        switch ( $bulk_action[0] ) {
+            case "approve":
+                self::directory_update_bulk( $leads, 1, $bulk_action[1] );
+                $process_bulk_update_message = sprintf( __( "%s approved.", "gravity-forms-addons" ), $entry_count );
+                break;
+
+            case "unapprove":
+                self::directory_update_bulk( $leads, 0, $bulk_action[1] );
+                $process_bulk_update_message = sprintf( __( "%s disapproved.", "gravity-forms-addons" ), $entry_count );
+                break;
+        }
 	}
 
 	static private function directory_update_bulk( $leads, $approved, $form_id ) {
@@ -150,8 +172,8 @@ public function admin_head( $settings = array() ) {
 			}
 		}
 
-		if ( isset( $_REQUEST['page'] ) && ( $_REQUEST['page'] == 'gf_edit_forms' || $_REQUEST['page'] == 'gf_entries' ) ) {
-			echo self::add_edit_js( isset( $_REQUEST['id'] ), $settings );
+		if ( in_array( rgget( 'page' ), array( 'gf_entries', 'gf_edit_forms' ), true ) ) {
+			self::add_edit_js( isset( $_REQUEST['id'] ), $settings );
 		}
 	}
 
@@ -160,6 +182,16 @@ static private function add_edit_js( $edit_forms = false, $settings = array() )
 		<script>
 			// Edit link for Gravity Forms entries
 			jQuery( document ).ready( function ( $ ) {
+
+				$('select[id^=bulk-action-selector-]').each(function() {
+					var $optgroup = $('<optgroup label="<?php esc_attr_e('Directory', 'gravity-forms-addons' ); ?>"></optgroup>');
+
+					$('option[value^="approve-"]', $( this ) ).remove().appendTo( $optgroup );
+					$('option[value^="unapprove-"]', $( this ) ).remove().appendTo( $optgroup );
+
+					$( this ).append( $optgroup );
+                });
+
 				<?php    if(! empty( $settings['modify_admin']['expand'] ) && $edit_forms) { ?>
 				var onScrollScript = window.onscroll;
 				$( 'div.gforms_edit_form #add_fields #floatMenu' ).prepend( '<div class="gforms_expend_all_menus_form"><label for="expandAllMenus"><input type="checkbox" id="expandAllMenus" value="1" /> Expand All Menus</label></div>' );
diff --git a/edit-form.php b/edit-form.php
index 527f6fd..c03faaa 100644
--- a/edit-form.php
+++ b/edit-form.php
@@ -214,8 +214,6 @@ function hideMessage(container, messageQueued){
 			    	displayMessage('<?php echo esc_js($process_bulk_update_message); ?>', 'updated', '#lead_form');
 			    <?php } ?>
 
-		    	$("#bulk_action,#bulk_action2").append('<optgroup label="Directory"><option value="approve-'+formID+'"><?php echo esc_js( __('Approve', 'gravity-forms-addons')); ?></option><option value="unapprove-'+formID+'"><?php echo esc_js( __('Disapprove', 'gravity-forms-addons')); ?></option></optgroup>');
-
 		    	var approveTitle = '<?php echo esc_js( __('Entry not approved for directory viewing. Click to approve this entry.', 'gravity-forms-addons')); ?>';
 		    	var unapproveTitle = '<?php echo esc_js( __('Entry approved for directory viewing. Click to disapprove this entry.', 'gravity-forms-addons')); ?>';
 

From c8151438df4aa689b5f52ecaa3a92524fa262cee Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 12:59:12 -0700
Subject: [PATCH 36/59] Fix bulk approval (pass approved column)

See 8c2bc3c
---
 admin.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/admin.php b/admin.php
index 98cabcb..a576a74 100644
--- a/admin.php
+++ b/admin.php
@@ -97,17 +97,16 @@ public static function process_bulk_update() {
 	}
 
 	static private function directory_update_bulk( $leads, $approved, $form_id ) {
-		global $_gform_directory_approvedcolumn;
 
 		if ( empty( $leads ) || ! is_array( $leads ) ) {
 			return false;
 		}
 
-		$_gform_directory_approvedcolumn = empty( $_gform_directory_approvedcolumn ) ? self::globals_get_approved_column( $_POST['form_id'] ) : $_gform_directory_approvedcolumn;
+		$approvedcolumn = GFDirectory::globals_get_approved_column( $form_id );
 
 		$approved = empty( $approved ) ? 0 : 'Approved';
 		foreach ( $leads as $lead_id ) {
-			GFDirectory::directory_update_approved( $lead_id, $approved, $form_id );
+			GFDirectory::directory_update_approved( $lead_id, $approved, $form_id, $approvedcolumn );
 		}
 	}
 

From 40127f5b7a39a224e8d05d545fd044f12a6582af Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 13:00:17 -0700
Subject: [PATCH 37/59] Fix smart approval in directory context

---
 template-row.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template-row.php b/template-row.php
index 0e7e6be..8961e29 100644
--- a/template-row.php
+++ b/template-row.php
@@ -13,7 +13,7 @@
 		$celltitle = '';
 
 		if ( $approved ) {
-			$leadapproved = self::check_approval( $lead, $approvedcolumn );
+			$leadapproved = self::check_approval( $lead, $approvedcolumn, $smartapproval );
 		}
 
 		if ( ( isset( $leadapproved ) && $leadapproved && $approved ) || ! $approved ) {

From 3498ccc669725841ab1870a65036924fdf06580e Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 13:01:11 -0700
Subject: [PATCH 38/59] Code cleanup

---
 edit-form.php                  | 23 ++++++++++++-----------
 gravity-forms-lead-creator.php |  6 +++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/edit-form.php b/edit-form.php
index c03faaa..0ad85c9 100644
--- a/edit-form.php
+++ b/edit-form.php
@@ -102,7 +102,7 @@ public function directory_add_default_values() {
 	}
 
 	public function directory_admin_head() {
-		global $_gform_directory_approvedcolumn, $process_bulk_update_message;
+		global $process_bulk_update_message;
 
 		// Entries screen shows first form's entries by default, if not specified
 		if( isset( $_GET['id'] ) ) {
@@ -146,16 +146,14 @@ public function directory_admin_head() {
 
 			<?php
 
-			//$formID = RGForms::get("id");
-
 	        if(empty($formID)) {
-		        $forms = RGFormsModel::get_forms(NULL, "title");
+		        $forms = RGFormsModel::get_forms(null, "title");
 	            $formID = $forms[0]->id;
 	        }
 
-		   	$_gform_directory_approvedcolumn = empty($_gform_directory_approvedcolumn) ? GFDirectory::globals_get_approved_column($formID) : $_gform_directory_approvedcolumn;
+		   	$approvedcolumn = GFDirectory::globals_get_approved_column( $formID );
 
-			if(!empty($_gform_directory_approvedcolumn)) {
+			if(!empty($approvedcolumn)) {
 			    echo 'formID = '.$formID.';';
 		       ?>
 
@@ -228,14 +226,17 @@ function hideMessage(container, messageQueued){
 				    }
 
 					// Update the title and screen-reader text
-			        if(!is_approved) { $(this).text('X').prop('title', unapproveTitle); }
-			        else { $(this).text('O').prop('title', approveTitle); }
+			        if(!is_approved) {
+						$(this).text('X').prop('title', unapproveTitle);
+					} else {
+						$(this).text('O').prop('title', approveTitle);
+					}
 
 					if(e.type == 'click') {
 				        UpdateApproved($('th input[type="checkbox"]', $tr).val(), is_approved ? 0 : 'Approved');
 				    }
 
-					UpdateApprovedColumns($(this).parents('table'), false);
+					UpdateApprovedColumns($(this).parents('table.gf_entries'), false);
 
 					return false;
 
@@ -258,14 +259,14 @@ function UpdateApprovedColumns($table, onLoad) {
 		    	}
 
 				// Add the header column
-		    	$('thead .column-is_starred, tfoot .column-is_starred').after('<th class="manage-column column-is_starred sortable"><a href="<?php echo esc_url( add_query_arg(array('sort' => $_gform_directory_approvedcolumn)) ); ?>"><img src="<?php echo plugins_url( '/images/form-button-1.png', __FILE__); ?>" title="<?php echo esc_js( __('Show entry in directory view?', 'gravity-forms-addons')); ?>" /></span></a></th>');
+		    	$('thead .column-is_starred, tfoot .column-is_starred').after('<th class="manage-column column-is_starred sortable"><a href="<?php echo esc_url( add_query_arg(array('sort' => $approvedcolumn)) ); ?>"><img src="<?php echo plugins_url( '/images/form-button-1.png', __FILE__); ?>" title="<?php echo esc_js( __('Show entry in directory view?', 'gravity-forms-addons')); ?>" /></span></a></th>');
 
 				// Add to each row
 		    	$('tbody td:has(img[src*="star"]), tbody th:has(img[src*="star"])').after('<td><a href="#" class="toggleApproved" title="'+approveTitle+'">X</a></td>');
 
 		    	$('tr:has(input.lead_approved)').addClass('lead_approved').find('a.toggleApproved').prop('title', unapproveTitle).text('O');
 
-		    	UpdateApprovedColumns($('table'), true);
+		    	UpdateApprovedColumns($('table.gf_entries'), true);
 
 		    });
 			<?php } // end if(!empty($_gform_directory_approvedcolumn)) check ?>
diff --git a/gravity-forms-lead-creator.php b/gravity-forms-lead-creator.php
index 189bed7..99dffa0 100644
--- a/gravity-forms-lead-creator.php
+++ b/gravity-forms-lead-creator.php
@@ -58,7 +58,7 @@ function update_entry_creator( $form, $leadid ) {
 		RGFormsModel::update_lead_property( $leadid, 'created_by', $created_by );
 
 		// If the creator has changed, let's add a note about who it used to be.
-		$originally_created_by = rgpost( 'originally_created_by' );
+		$originally_created_by = intval( rgpost( 'originally_created_by' ) );
 
 		if ( $originally_created_by !== $created_by ) {
 
@@ -100,7 +100,7 @@ function add_select( $form_id, $lead ) {
 		/**
 		 * There are issues with too many users where it breaks the select. We try to keep it at a reasonable number.
 		 *
-		 * @link   texthttp://codex.wordpress.org/Function_Reference/get_users
+		 * @link http://codex.wordpress.org/Function_Reference/get_users
 		 * @var  array Settings array
 		 */
 		$get_users_settings = apply_filters( 'gravityview_change_entry_creator_user_parameters', array( 'number' => 300 ) );
@@ -113,7 +113,7 @@ function add_select( $form_id, $lead ) {
         <select name="created_by" id="change_created_by" class="widefat">';
 		$output .= '<option value=""> &mdash; ' . esc_attr__( 'No User', 'gravity-view' ) . ' &mdash; </option>';
 		foreach ( $users as $user ) {
-			$output .= '<option value="' . $user->ID . '"' . selected( $lead['created_by'], $user->ID, false ) . '>' . esc_attr( $user->display_name . ' (' . $user->user_nicename . ')' ) . '</option>';
+			$output .= '<option value="' . $user->ID . '" ' . selected( $lead['created_by'], $user->ID, false ) . '>' . esc_attr( $user->display_name . ' (' . $user->user_nicename . ')' ) . '</option>';
 		}
 		$output .= '</select>';
 		$output .= '<input name="originally_created_by" value="' . $lead['created_by'] . '" type="hidden" />';

From 7f37fec45d2cd554887430b171e6b63652129ac8 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 13:02:07 -0700
Subject: [PATCH 39/59] Code cleanup (cont)

Converted http://katz.si to https://katz.si
Fixed escaping functions
---
 admin.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/admin.php b/admin.php
index a576a74..9e42229 100644
--- a/admin.php
+++ b/admin.php
@@ -130,7 +130,7 @@ function gf_warning() {
 				If you haven\'t installed the plugin, you can %3$spurchase the plugin here%4$s. If you have, and you believe this notice is in error, %5$sstart a topic on the plugin support forum%4$s.
 
 				%6$s%7$sBuy Gravity Forms%4$s%8$s
-				', 'gravity-forms-addons' ), '<strong>', '</strong>', "<a href='http://katz.si/gravityforms'>", '</a>', '<a href="http://wordpress.org/tags/gravity-forms-addons?forum_id=10#postform">', '<p class="submit">', "<a href='http://katz.si/gravityforms' style='color:white!important' class='button button-primary'>", '</p>' );
+				', 'gravity-forms-addons' ), '<strong>', '</strong>', "<a href='https://katz.si/gravityforms'>", '</a>', '<a href="https://wordpress.org/tags/gravity-forms-addons?forum_id=10#postform">', '<p class="submit">', "<a href='https://katz.si/gravityforms' style='color:white!important' class='button button-primary'>", '</p>' );
 			}
 		}
 		if ( ! empty( $message ) ) {
@@ -146,10 +146,8 @@ public function activation() {
 	}
 
 	public function add_activation_notice() {
-#		if(!get_option("gf_addons_settings")) {
-		$message = sprintf( esc_html__( 'Congratulations - the Gravity Forms Directory & Addons plugin has been installed. %sGo to the settings page%s to read usage instructions and configure the plugin default settings. %sGo to settings page%s', 'gravity-forms-addons' ), '<a href="' . admin_url( 'admin.php?page=gf_settings&addon=Directory+%26+Addons&viewinstructions=true' ) . '">', '</a>', '<p class="submit"><a href="' . admin_url( 'admin.php?page=gf_settings&addon=Directory+%26+Addons&viewinstructions=true' ) . '" class="button button-secondary">', '</a></p>' );
+		$message = sprintf( esc_html__( 'Congratulations - the Gravity Forms Directory & Addons plugin has been installed. %sGo to the settings page%s to read usage instructions and configure the plugin default settings. %sGo to settings page%s', 'gravity-forms-addons' ), '<a href="' . esc_url_raw( admin_url( 'admin.php?page=gf_settings&addon=Directory+%26+Addons&viewinstructions=true' ) . '">', '</a>', '<p class="submit"><a href="' . admin_url( 'admin.php?page=gf_settings&addon=Directory+%26+Addons&viewinstructions=true' ) ) . '" class="button button-secondary">', '</a></p>' );
 		set_transient( 'kws_gf_activation_notice', $message, 60 * 60 );
-#		}
 	}
 
 	public function admin_head( $settings = array() ) {
@@ -233,7 +231,7 @@ function add_edit_entry_link( $form_id, $field_id, $value, $entry, $query_string
                     'width' => 370
             ), $field_id_url );
 			?>
-            <span class="edit"> | <a title="<?php esc_attr( printf( __( "Fields for Form ID %s", "gravity-forms-addons" ), $form_id ) ); ?>" href="<?php echo esc_url( $field_id_url ) ; ?>" class="thickbox form_ids"><?php echo esc_js( __( "IDs", "gravity-forms-addons" ) ); ?></a></span>
+            <span class="edit"> | <a title="<?php esc_attr( printf( __( "Fields for Form ID %s", "gravity-forms-addons" ), $form_id ) ); ?>" href="<?php echo esc_url( $field_id_url ) ; ?>" class="thickbox form_ids"><?php esc_attr_e( "IDs", "gravity-forms-addons" ); ?></a></span>
 		<?php
         }
 
@@ -501,7 +499,6 @@ static function make_popup_options( $js = false ) {
 				true,
 				esc_html__( "If there's a displayed Entry ID column, add link to each full entry", 'gravity-forms-addons' ),
 			),
-			#array('checkbox',  'wpautop'  ,  true, sprintf( esc_html__( "Convert bulk paragraph text to paragraphs (using the WordPress function %s)", 'gravity-forms-addons'), "<code><a href='http://codex.wordpress.org/Function_Reference/wpautop'>wpautop()</a></code>" )),
 			array(
 				'checkbox',
 				'getimagesize',
@@ -1198,7 +1195,7 @@ class="description"><?php esc_html_e( 'Need help getting started?', 'gravity-for
 						        src="http<?php echo is_ssl() ? 's' : ''; ?>://www.youtube.com/embed/PMI7Jb-RP2I?hd=1"
 						        frameborder="0" allowfullscreen></iframe>
 					</div>
-					<h3 style="padding-top:1em;"><?php esc_html_e( 'To integrate a form with Directory:', 'gravity-forms-addons' ); ?></h3>
+					<h3 style="padding-top:1em; line-height: 1"><?php esc_html_e( 'To integrate a form with Directory:', 'gravity-forms-addons' ); ?></h3>
 					<ol class="ol-decimal">
 						<li><?php esc_html_e( 'Go to the post or page where you would like to add the directory.', 'gravity-forms-addons' ); ?></li>
 						<li><?php esc_html_e( 'Click the "Add Directory" button above the content area.', 'gravity-forms-addons' ); ?></li>

From 9c6f551b031ac0b7e49b42f5290bede4c7e48c17 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 13:05:21 -0700
Subject: [PATCH 40/59] Fix Approved field checkboxes not toggling when status
 changes

Also, use GF's FontAwesome icons instead of images
---
 edit-form.php | 41 +++++++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/edit-form.php b/edit-form.php
index 0ad85c9..cc8320b 100644
--- a/edit-form.php
+++ b/edit-form.php
@@ -209,7 +209,7 @@ function hideMessage(container, messageQueued){
 			jQuery(document).ready(function($) {
 
 		    	<?php if(!empty($process_bulk_update_message)) { ?>
-			    	displayMessage('<?php echo esc_js($process_bulk_update_message); ?>', 'updated', '#lead_form');
+			    	displayMessage('<?php echo esc_js($process_bulk_update_message); ?>', 'updated', '.gf_entries');
 			    <?php } ?>
 
 		    	var approveTitle = '<?php echo esc_js( __('Entry not approved for directory viewing. Click to approve this entry.', 'gravity-forms-addons')); ?>';
@@ -221,7 +221,7 @@ function hideMessage(container, messageQueued){
 		    		var $tr = $(this).parents('tr');
 					var is_approved = $tr.is(".lead_approved");
 
-					if(e.type == 'click') {
+					if(e.type === 'click') {
 				        $tr.toggleClass("lead_approved");
 				    }
 
@@ -245,15 +245,40 @@ function hideMessage(container, messageQueued){
 		    	// We want to make sure that the checkboxes go away even if the Approved column is showing.
 		    	// They will be in sync when loaded, so only upon click will we process.
 		    	function UpdateApprovedColumns($table, onLoad) {
-					var colIndex = $('th:contains("Approved")', $table).index() - 1;
+
+		    		<?php
+
+		    		if( ! empty( $approvedcolumn ) ) {
+		    		   /** @see https://stackoverflow.com/a/350300/480856 */
+		    		   $approved_column_jquery = str_replace( '.', '\\\.', $approvedcolumn );
+		    		   $approved_column_jquery = 'field_id-' . esc_html( $approved_column_jquery );
+		    		} else {
+		    		    echo 'return;'; // No need to update approval columns; the only approval is the meta checkbox
+		    		}
+		    		?>
 
 					$('tr', $table).each(function() {
-						if($(this).is('.lead_approved') || (onLoad && $("input.lead_approved", $(this)).length > 0)) {
-							if(onLoad && $(this).not('.lead_approved')) { $(this).addClass('lead_approved'); }
-							$('td:visible:eq('+colIndex+'):has(.toggleApproved)', $(this)).html("<img src='<?php echo plugins_url('images/tick.png', __FILE__); ?>/>");
+
+						// No GF approval; don't modify things
+						if( 0 === $( '.toggleApproved', $( this ) ).length ) {
+							return;
+						}
+
+						if( $(this).is('.lead_approved') || (onLoad && $("input.lead_approved", $(this)).length > 0)) {
+
+							if(onLoad && $(this).not('.lead_approved')) {
+								$(this).addClass('lead_approved');
+							}
+
+							$('td.column-<?php echo $approved_column_jquery; ?>:visible', $(this)).html('<i class="fa fa-check gf_valid"></i>');
+
 						} else {
-							if(onLoad && $(this).is('.lead_approved')) { $(this).removeClass('lead_approved'); }
-							$('td:visible:eq('+colIndex+'):has(.toggleApproved)', $(this)).html('');
+
+							if(onLoad && $(this).is('.lead_approved')) {
+								$(this).removeClass('lead_approved');
+							}
+
+							$('td.column-<?php echo $approved_column_jquery; ?>:visible', $(this)).html('');
 						}
 					});
 		    	}

From 59493d853e34237ec2d6dae4c4f8441d1040f250 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 13:06:48 -0700
Subject: [PATCH 41/59] Fix smart approval to work with GFAPI search criteria

Added third paramater to check_approval to pass whether $smartapproval
is being used.
---
 gravity-forms-addons.php | 52 ++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index c367502..7daa419 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -514,6 +514,8 @@ static function directory_update_approved( $lead_id = 0, $approved = 0, $form_id
 		    return;
         }
 
+		$approved = $approved ? $approved : '';
+
         GFAPI::update_entry_field( $lead_id, $approvedcolumn, $approved );
 
 		$message = empty( $approved ) ? __( 'Disapproved the lead', 'gravity-forms-addons' ) : __( 'Approved the lead', 'gravity-forms-addons' );
@@ -1072,7 +1074,7 @@ static public function process_lead_detail( $inline = true, $entryback = '', $sh
 				$adminonlycolumns = self::get_admin_only( $form );
 			}
 
-			$approved = self::check_approval( $lead, $approvedcolumn );
+			$approved = self::check_approval( $lead, $approvedcolumn, rgar( $options, 'smartapproval', false ) );
 
 			//since 3.5
 			$lead = self::remove_hidden_fields( array( $lead ), $adminonlycolumns, $approvedcolumn, true, true, $showadminonly, $form );
@@ -1336,7 +1338,16 @@ public static function make_directory( $atts ) {
 
 		$approvedcolumn = NULL;
 
-		if ( true === $approved || ( $smartapproval && $approved === - 1 ) ) {
+		$smartapproval = ! empty( $smartapproval );
+		$enable_smart_approval = false;
+
+		// Approved is not enabled, and smart approval is enabled
+		if ( - 1 === $approved && $smartapproval ) {
+		    $enable_smart_approval = true;
+            $approved = true;
+		}
+
+		if ( true === $approved ) {
 			$approvedcolumn = self::get_approved_column( $form );
 		}
 
@@ -1391,6 +1402,23 @@ public static function make_directory( $atts ) {
 				$search_criteria[ $key ] = $_GET[ 'filter_' . $key ];
 			}
 		}
+		if( $smartapproval && $enable_smart_approval ) {
+
+			$search_criteria['field_filters'][] = array(
+				'key' => 'is_approved',
+				'operator' => 'isnot',
+				'value' => ''
+			);
+
+			$search_criteria['field_filters'][] = array(
+				'key' => 'is_approved',
+				'operator' => 'isnot',
+				'value' => '0'
+			);
+
+			$search_criteria['field_filters']['mode'] = 'all';
+
+        }
 
 		$total_count = 0;
 
@@ -2047,8 +2075,6 @@ static public function get_approved_column( $form ) {
 						}
 					}
 				}
-			}
-		}
 
 				foreach ( $field->inputs as $input ) {
 					if ( in_array( $input['label'], $approved_strings ) || ( isset( $input['value'] ) && in_array( $input['value'], $approved_strings ) ) ) {
@@ -2272,12 +2298,6 @@ public static function get_leads( $form_id, $sort_field_number = 0, $sort_direct
 		}
 
 		if ( $approvedcolumn ) {
-			$search_criteria['field_filters'][] = array(
-				'key' => $approvedcolumn,
-				'operator' => 'is',
-				'value' => 'Approved'
-			);
-
 			$search_criteria['field_filters']['mode'] = 'all';
 		}
 
@@ -2557,8 +2577,16 @@ static function check_meta_approval( $lead_id ) {
 		return gform_get_meta( $lead_id, 'is_approved' );
 	}
 
-	static function check_approval( $lead, $column ) {
-		return self::check_meta_approval( $lead['id'] ) || ! empty( $lead[ $column ] );
+	static function check_approval( $lead, $column, $smartapproval = false ) {
+
+	    $approved = self::check_meta_approval( $lead['id'] ) || ! empty( $lead[ $column ] );
+
+	    // Approval isn't set yet
+	    if( ! $approved && ! empty( $smartapproval ) ) {
+		    $approved = false === gform_get_meta( $lead['id'], 'is_approved' );
+        }
+
+		return $approved;
 	}
 
 	static function hide_in_directory( $form, $field_id ) {

From f01715c8d9692c927527bcdda2d5e589ae8bc1d5 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 13:07:18 -0700
Subject: [PATCH 42/59] Add field property to make it easier to identify an
 approval field

---
 edit-form.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/edit-form.php b/edit-form.php
index cc8320b..b6c458d 100644
--- a/edit-form.php
+++ b/edit-form.php
@@ -85,6 +85,7 @@ public function directory_add_default_values() {
 
 				field.choices = null;
 		        field.inputs = null;
+		        field.gf_directory_approval = true;
 
 		        if(!field.choices)
 		            field.choices = new Array(new Choice("<?php echo esc_js( __("Approved", "gravity-forms-addons")); ?>"));

From 77d443d3b93113730f9121ecb4776fc95db2f858 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 13:15:42 -0700
Subject: [PATCH 43/59] Update minimum version requirements

Based on the bulk actions filter
---
 gravity-forms-addons.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 7daa419..d01d7f9 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -37,7 +37,7 @@ class GFDirectory {
 	private static $path = "gravity-forms-addons/gravity-forms-addons.php";
 	private static $slug = "gravity-forms-addons";
 	private static $version = "3.8.1";
-	private static $min_gravityforms_version = "1.5";
+	private static $min_gravityforms_version = "2.2.3.12";
 
 	public static function directory_defaults( $args = array() ) {
 		$defaults = array(

From b9d894ab917aeb5c95756f37612bb739dcb62654 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 13:15:59 -0700
Subject: [PATCH 44/59] Use our own is_gravity_page() method

---
 admin.php                | 2 +-
 gravity-forms-addons.php | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin.php b/admin.php
index 9e42229..8bd1b2c 100644
--- a/admin.php
+++ b/admin.php
@@ -169,7 +169,7 @@ public function admin_head( $settings = array() ) {
 			}
 		}
 
-		if ( in_array( rgget( 'page' ), array( 'gf_entries', 'gf_edit_forms' ), true ) ) {
+		if ( GFDirectory::is_gravity_page('gf_entries') || GFDirectory::is_gravity_page('gf_edit_forms') ) {
 			self::add_edit_js( isset( $_REQUEST['id'] ), $settings );
 		}
 	}
diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index d01d7f9..dc256ca 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -479,7 +479,11 @@ static public function add_rewrite() {
 		$wp_rewrite->add_endpoint( "{$endpoint}", EP_ALL );
 	}
 
-	//Returns true if the current page is one of Gravity Forms pages. Returns false if not
+	/**
+	 * @param array $page
+	 *
+	 * @return bool Returns true if the current page is one of Gravity Forms pages. Returns false if not
+	 */
 	public static function is_gravity_page( $page = array() ) {
 		$current_page = trim( strtolower( rgget( "page" ) ) );
 		if ( empty( $page ) ) {
@@ -488,7 +492,7 @@ public static function is_gravity_page( $page = array() ) {
 			$gf_pages = is_array( $page ) ? $page : array( $page );
 		}
 
-		return in_array( $current_page, $gf_pages );
+		return in_array( $current_page, $gf_pages, true );
 	}
 
 	/**

From e4b0c77a75a89e0cb5765c0c117f46565a0a09e3 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 13:16:13 -0700
Subject: [PATCH 45/59] Version bump

---
 gravity-forms-addons.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index dc256ca..ca3e46e 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1,17 +1,16 @@
 <?php
 /*
 Plugin Name: 	Gravity Forms Directory & Addons
-Plugin URI: 	http://katz.co/gravity-forms-addons/
-Description: 	Turn <a href="http://katz.si/gravityforms">Gravity Forms</a> into a great WordPress directory...and more!
+Plugin URI: 	https://katz.co/gravity-forms-addons/
+Description: 	Turn <a href="https://katz.si/gravityforms">Gravity Forms</a> into a great WordPress directory...and more!
 Author: 		Katz Web Services, Inc.
-Version: 		3.8.1
+Version: 		4.0
 Author URI:		https://gravityview.co
 Text Domain:    gravity-forms-addons
 License:		GPLv2 or later
-License URI: 	http://www.gnu.org/licenses/gpl-2.0.html
-Domain Path:	/languages
+License URI: 	https://www.gnu.org/licenses/gpl-2.0.html
 
-Copyright 2015 Katz Web Services, Inc.  (email: info@katzwebservices.com)
+Copyright 2018 Katz Web Services, Inc.  (email: info@katzwebservices.com)
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -36,7 +35,7 @@ class GFDirectory {
 
 	private static $path = "gravity-forms-addons/gravity-forms-addons.php";
 	private static $slug = "gravity-forms-addons";
-	private static $version = "3.8.1";
+	private static $version = "4.0";
 	private static $min_gravityforms_version = "2.2.3.12";
 
 	public static function directory_defaults( $args = array() ) {

From 50613944f00eeee781b6d4e896bf373756e6ca56 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 13:33:42 -0700
Subject: [PATCH 46/59] readme update

---
 readme.txt | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/readme.txt b/readme.txt
index 02df8cb..b567825 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,8 +1,8 @@
 === Gravity Forms Directory ===
 Tags: gravity forms, gravity form, forms, gravity, form, directory, business, business directory, directorypress, classifieds, cforms, formidable, gravityview
-Requires at least: 3.3
-Tested up to: 4.6
-Stable tag: 3.8.1
+Requires at least: 4.0
+Tested up to: 4.9.4
+Stable tag: 4.0
 Contributors: katzwebdesign, katzwebservices
 License: GPLv2 or later
 Donate link: https://gravityview.co
@@ -13,7 +13,7 @@ Add directory capabilities and other functionality to the great Gravity Forms pl
 
 > #### [GravityView](https://gravityview.co/?utm_source=wordpress&utm_medium=readme&utm_campaign=readme) is the best way to display Gravity Forms entries
 >
-> We set out to make a better Directory plugin, and we did it: GravityView is a brand-new plugin that takes displaying your form entries to the next level. It is easier, more powerful and more customizable than the Directory plugin. If you like the Directory plugin, you'll *love* GravityView.
+> We set out to make a better Directory plugin, and we did it: GravityView is a brand-new plugin that takes displaying your form entries to the next level. It is easier, more powerful and more customizable than the Directory plugin. You'll *love* GravityView.
 > 
 > [Check out GravityView](https://gravityview.co/?utm_source=wordpress&utm_medium=readme&utm_campaign=readme) or [try a demo](http://demo.gravityview.co?utm_source=wordpress&utm_medium=readme&utm_campaign=readme) today!
 
@@ -226,6 +226,34 @@ Since 3.6.3, the Directory plugin displays formatted values (like currency). To
 
 == Changelog ==
 
+= 4.0 on March 6, 2018 =
+
+A big update to make Gravity Forms Directory compatible with Gravity Forms 2.3, and to fix entry approval.
+
+** New: **
+
+- Compatible with Gravity Forms 2.3
+- Now requires Gravity Forms 2.2.3.12 or newer
+- Uses Gravity Forms API to fetch entries, instead of direct queries
+- Prevent access to unapproved single entries for users without permission
+
+** Fixed: **
+
+- "Edit" action links for entries work again
+- The ability to see the IDs for each field in an entry
+- Bulk Approve and Bulk Disapprove
+- Allow users with `gravityforms_edit_entries` capabilities to edit entries (previously, only users with `gravityforms_directory` capability)
+
+** Improvements **
+
+- Update code to use `GF_Field` instead of array
+- Remove calls to deprecated `get_currentuserinfo()` function
+- Remove unused code
+- Removed use of global variables
+- Added additional text & URL escaping
+- Update Google Maps links to use HTTPS
+- Security improvements
+
 = 3.8.1 on August 17, 2016 =
 * Fixed: Compatibility with Gravity Forms 2.0 Entries screen
     - The "Directory Columns" menu returns to the toolbar

From bcf10df4075c845ee6f1f4944d1f58ed828802d9 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 15:42:13 -0700
Subject: [PATCH 47/59] Fix single field searches

---
 gravity-forms-addons.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index ca3e46e..723abf9 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1402,7 +1402,10 @@ public static function make_directory( $atts ) {
 		$search_criteria     = array();
 		foreach ( $show_search_filters as $key ) {
 			if ( ! empty( $_GET[ 'filter_' . $key ] ) ) {
-				$search_criteria[ $key ] = $_GET[ 'filter_' . $key ];
+				$search_criteria['field_filters'][] = array(
+                  'key' => $key,
+                  'value' => $_GET[ 'filter_' . $key ],
+                );
 			}
 		}
 		if( $smartapproval && $enable_smart_approval ) {

From c9f23e139631bda2b6312c4826abb619d84c11ef Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 15:43:06 -0700
Subject: [PATCH 48/59] Fix spacing

---
 gravity-forms-addons.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 723abf9..2a92b90 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1408,6 +1408,7 @@ public static function make_directory( $atts ) {
                 );
 			}
 		}
+
 		if( $smartapproval && $enable_smart_approval ) {
 
 			$search_criteria['field_filters'][] = array(
@@ -1426,7 +1427,7 @@ public static function make_directory( $atts ) {
 
         }
 
-		$total_count = 0;
+        $total_count = 0;
 
 		//
 		// Or start to generate the directory

From e5429bb1a9d6f7c5a6add72c916d6c60b26b3166 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 16:02:46 -0700
Subject: [PATCH 49/59] Fixed searching for values of "0"

---
 gravity-forms-addons.php | 4 ++--
 readme.txt               | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 2a92b90..42aa621 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1401,10 +1401,10 @@ public static function make_directory( $atts ) {
 		$show_search_filters = apply_filters( 'kws_gf_directory_search_filters', $show_search_filters, $form );
 		$search_criteria     = array();
 		foreach ( $show_search_filters as $key ) {
-			if ( ! empty( $_GET[ 'filter_' . $key ] ) ) {
+			if ( '' !== rgget('filter_' . $key ) ) {
 				$search_criteria['field_filters'][] = array(
                   'key' => $key,
-                  'value' => $_GET[ 'filter_' . $key ],
+                  'value' => rgget('filter_' . $key ),
                 );
 			}
 		}
diff --git a/readme.txt b/readme.txt
index b567825..39bc380 100644
--- a/readme.txt
+++ b/readme.txt
@@ -243,6 +243,7 @@ A big update to make Gravity Forms Directory compatible with Gravity Forms 2.3,
 - The ability to see the IDs for each field in an entry
 - Bulk Approve and Bulk Disapprove
 - Allow users with `gravityforms_edit_entries` capabilities to edit entries (previously, only users with `gravityforms_directory` capability)
+- Searching for `0` values
 
 ** Improvements **
 

From ada3abf36e372e5d99dbebbe12d244e1da2add9b Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 16:33:07 -0700
Subject: [PATCH 50/59] Update to use GF code (thanks, y'all)

Just one tweak: <p> tags in the description
---
 images/arrow-rightleft.jpg   | Bin 2717 -> 0 bytes
 images/arrow-rightleft.png   | Bin 0 -> 1134 bytes
 select_directory_columns.php | 439 ++++++++++++++++-------------------
 3 files changed, 194 insertions(+), 245 deletions(-)
 delete mode 100644 images/arrow-rightleft.jpg
 create mode 100644 images/arrow-rightleft.png

diff --git a/images/arrow-rightleft.jpg b/images/arrow-rightleft.jpg
deleted file mode 100644
index b0a372301ebdac7011900954c91b442c02390b8e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2717
zcmbtW4Nwzj8vb_k%a3UikcLWiiJYBLNwP^uNFZQHf~GCDqCKh36+*H?3dycXfIuA)
zRIJkj<=}d?3Zho8(^6V!>rb@`!ksXB1y8R>!4WaGcn9?qgMU?XyD<dj#<RWi-Oab}
z_kPd&|7K@>{k~x!Fu1L205BTo12&i<-x%QOi_8V300MMUychuAFl|=8%SEWgV!Kmh
zvf#Ox$c)>>ZWAF!MG`ScPIVI|a{=Z;a<M$CT_gP0(Gx<%YS9Q+CS*u52pyJhT~g-2
zmX|GEVJ<5$t1QCQ6eQWLcH0OW<}x8}TcO>lc58%w<7$$p#9|@hhqwwfLM`PL$;x;Y
z(cumZNf626%@Pzv6bcb4Pf#e(g@{ywO2rcLR>Y%nb%H`IRU!crlHMGaHR?=#dcYUC
z(+C4em6Vi-N@OD3ktaq~DivizDvc)*@y=4a%jAx?JLgVX&|^-s!%DcUxE-M^nsV_X
zmqtiN`X~h(k&zKJ{Mc&QY*b!;w9}P|O@;ATv~xu%fr&FQCtl<*V<dd;q%v8%Cp)5m
zWHf3$ZZ5K6c9&7F5t0&-#cENf$)zf}Ql?ePm1!tykgD`rxk0W=)XUTK=?1NGQrBpA
zx=eO6HmPf!(p5cCSFLkkCKv8lf#Zdf-Fr13cj3-_oIrHT6-b83Y_(H+s<eSfF^9Dn
zv!pw48{)5x+B(gDLZTLxY87Z=x<RFvX|?GRL%Lj!DrAy0tz4-?g#jJQw0wV7M@%{w
zQ;nR~*hvvNEfgCZQ*sj=bj(gpw}TvG-!(ALKb*kQPX1jW8kk9^F+*nnz*GXj`V@eW
z*8m9J=^F%_0G&n=xzd?*^2cP*=?o@|Nf9fQ#U_ar8X6WJ9v&7-E+p|NiU<-!r_<Ri
zHYYTc6UpIlA|t62{}O~enem+jJT`O@%%VX&0P`Rk5At<^763tj29e7o(Eu4346&w(
z0!Lf`(*O)Hf><sLp(H$l;PE3FOdeSQm_g+jz(Z?0V1x%^Q9g~UT~-mH+ar`#)|%=3
zpn(98h#*zz<PFmTM-brcL1IzuGSk`$E>YW>bM|`2@D1Mp2qzIRkH#a*{op>z-pGCX
z=@!tNu5DJ;HARj)4_xYxW*+O2{iXCn#g-<H{_2d{U8ZQ}>)xmHu#vlsjGIlC6Jo%g
z*9+pY<}crE`*zjo|H_)Yn@0}b>^{4<G%0VF*xQi(LiU$i%AZj*4lLA(FS}xIoSJ>0
zeD(Wx9;Q5hq+WO^<)w&EfAq@qgR_4~%`M%lznMMql@D<Kxbm6a)1xO2?)Y<U;y?KB
zrFH)T&t`w5Fcs-Ur=O=y<6)SY3KNgSQ!E6L(yrI4dB2t$vd+#l>z|ID7;OHgR=~Uw
z^<(b(BRPw=XEm_<yjMoPf43iYYBo8#x;AYQ96DGey}2<ZY3%rg@iVzT@b~h8TU~b!
zh(ksitM2`FX=csU7Y9ua#oa#7fDg!vD;?E6M;2^5?YZ?}-Q^2AhO|TH=Gd3r5Q@Em
zR=VSEo$JaEjkSka?KOvoW-seD9Pb`&QC{yQ)JuvJzdo*c_|@u|WBk9qbz<wKpOWit
zOAn66x0Hn!UOuzCyTP)y;Qm|X1w+xJ{dd~Gs9K+{Tykyuxpwd9Q<uSC$Zgq=CWi*4
z#%7-XKdy_d+|F-bN#^Y5+hyLU!9TDW(ukck+LdW<uwOABzY<vxUond_cNJD7-z5U9
zpR$|J)0H_;M@f$>@6gs;V|31pwzm1JPWCsBGCQxS8@9g3@qAY@w)NV>j&=L4d~B_b
zYaGU*-+SuEH>`_QSH44RcoqhqSBLGXXt{Ybn!ccH{XaocbZ650r!fBc?l@h{qNQ{4
zKVa;}PTdb%gbyXno4di(o6C#}saP=VwO1uC94p)Z;s1PnjX#=Ns!F#5Qyb)`-WS}-
z7u?T1+2D5}ar}_D$|clC&@Z82m$=%ytC`^fNlwSc|9mid`Hc3$>SM65$J{HZvpzRO
zV?mqytNIq)TYIAZ^w@CzvHdN^i@c+E>YD{sZ}zxK8u-5<ztKKtBQ3vbEnVOHfjcJU
z2vE$s6!StxA5&PuURWFvQ@idYhq0&XOhnrkshi%oy0ZycBk{~3KIzskPRSz#ajcof
zx1TM0=-Iw|!+4(O`Q=@bzwOpsu-|T4eEnr&G%Ds#4N+Tm?R$rB=tMSuR5&zIQ+;?%
zmeRO`RvA_^yPNp_n-}4P17U5ly|Tk0eU7Z0=z)92@+R%6`Nn4ZzU{>`>YR>6tx#;G
n>0Fy~gcEyPJZmDZ{=sK=CnTMoIdzXMgdo^0?zC=E{CEEbX;G9$

diff --git a/images/arrow-rightleft.png b/images/arrow-rightleft.png
new file mode 100644
index 0000000000000000000000000000000000000000..b60e3592d05a85f7ac15c7f2da3ffbc5aa568913
GIT binary patch
literal 1134
zcmeAS@N?(olHy`uVBq!ia0vp^Y77iaOdQNW))YtosX$7y#5JNMI6tkVJh3R1!7(L2
zDOJHUH!(dmC^a#qvhZZ84FdzCLV!<*D^M{*$)c-%iUdeP%KrcV4>tkGKxQKwe$ZVG
z&V@7JiqS+KHYGi5OnguqZ9i=%M2*GdZ9rr`Y1_S$KxADyJ)4lZ_}Tn5%dbc1Ley|q
zErT%F%9mUVQp40Zf4}H4px@(4g8YIR7#W$Fd3nXfB_t#zrPS0kHMO*?th~I^s;X-1
z8yY&gyL)<idwZu$nL2IS^yy2NE?>T4#l}rLcJAK2|G>e6Cr+F^dHVeMOP6lkxO3;;
zy+@CpKY#W5!-tQbK7IT4=g;52r}cMO1LLvE)5S5Q;?~=1nZ>sZ1lSTBJ)$<u{?gDQ
zS7vcZyHUn=vYbrolJA_YavOgC|L>|QEq!{E<oPeJcgs6GNZ)cP>!?DDWcVs2?}kP~
zAT{x)*JkUqe|K}kKE2FJKat2&9(3VYXN}eS?RR&t|6OcpbJHVeDfhFL*{c&nZ@ioG
zbI}xo=^^QIw{|Uzdu#mi%+Hi#i<_iuQtFo7<90V%zp=`4`f|P}tLiG^MW57ctbNjM
zvz7U%|6l#Ln*3jPh0M4cAj|T!bf&gc_NP01Q#oeXK3{fh*PZxPsb6-k-e|bJwPL}Q
zKev_kU1`nu9Fd%rX?Fb4tf)B$y$ZLb8t7-n+W!8XDEK~arsrSXJHhWhcIoPH2^G6J
zHhp?^P9wh}V&3ZIve!PnnEHE4*_VlKlYZAuy5%u(+n$(J%eJQ;Q|phBEWbMSWEG=v
z{PQ*Td^?L48!P>~nmMKTWmdIABG0zq3%@qjSiRmV^E@<Pt^N3G&s7zECWSit^QIXq
zTIs8uQN6mdeO>-4-H7FvW_~`|)1IBR!TXET-u1Gl_8fclG-jTV{L@X}Y}KE4zg0G0
z(D{`AeZYe?oV;IlP3fGIut(mieZ`uMY-e>6EwbHsdrMb{|NLT9VEZZ~$3<5$YySRU
zAA>`uzvI5RXyUOem(~U8=xnuU&OH`+F(K~K?EL$`KmP3xGBsYguhrb^t!j>=_KC#~
zlB}K6%tO*DmD@wPr&dO6Tzuc#@|TD5UA3xtAYbdmMO~aGIoswn#K-A>+?kjOf#31d
b1pYJJ&KECV^x|D7s7&y5^>bP0l+XkKPh<cR

literal 0
HcmV?d00001

diff --git a/select_directory_columns.php b/select_directory_columns.php
index a3b59bd..5f894e7 100644
--- a/select_directory_columns.php
+++ b/select_directory_columns.php
@@ -1,5 +1,21 @@
 <?php
 
+// For backwards compatibility, load WordPress if it hasn't been loaded yet
+// Will be used if this file is being called directly
+if ( ! class_exists( 'RGForms' ) ) {
+	for ( $i = 0; $i < $depth = 10; $i ++ ) {
+		$wp_root_path = str_repeat( '../', $i );
+
+		if ( file_exists( "{$wp_root_path}wp-load.php" ) ) {
+			require_once( "{$wp_root_path}wp-load.php" );
+			require_once( "{$wp_root_path}wp-admin/includes/admin.php" );
+			break;
+		}
+	}
+
+	auth_redirect();
+}
+
 class GFDirectorySelectColumns {
 
 	public function __construct() {
@@ -24,149 +40,116 @@ public static function select_columns_page() {
 			<?php
 			wp_print_styles( array( "wp-admin", "colors-fresh" ) );
 			wp_print_scripts( array( "jquery", "sack", "jquery-ui-sortable" ) );
-			?>
-			<style type="text/css">
-				#wrapper {
-					padding: 10px;
-				}
-
-				#sortable_available, #sortable_selected {
-					list-style-type: none;
-					margin: 0;
-					padding: 2px;
-					min-height: 250px;
-					border: 1px solid #eaeaea;
-					-moz-border-radius: 4px;
-					-webkit-border-radius: 4px;
-					-khtml-border-radius: 4px;
-					border-radius: 4px;
-					background-color: #FFF;
-				}
-
-				#sortable_available li, #sortable_selected li {
-					margin: 0 2px 2px 2px;
-					padding: 2px;
-					width: 96%;
-					border: 1px solid white;
-					cursor: pointer;
-					font-size: 13px;
-				}
-
-				.field_hover {
-					border: 1px dashed #2175A9 !important;
-				}
-
-				.placeholder {
-					background-color: #FFF0A5;
-					height: 20px;
-				}
-
-				.gcolumn_wrapper {
-					overflow: auto;
-					height: 80%;
-				}
-
-				.gcolumn_container_left, .gcolumn_container_right {
-					width: 46%;
-				}
-
-				.gcolumn_container_left {
-					float: left;
-				}
-
-				.gcolumn_container_right {
-					float: right;
-				}
-
-				.gform_select_column_heading {
-					font-weight: bold;
-					padding-bottom: 7px;
-					font-size: 13px;
-				}
-
-				.column-arrow-mid {
-					float: left;
-					width: 7%;
-					min-width: 27px;
-					height: 100%;
-					background: url(<?php echo plugins_url('images/arrow-rightleft.jpg', __FILE__); ?>) repeat-y top center;
-					/*background-attachment: fixed;*/
-					margin-top: 26px;
-				}
-
-				.panel-instructions {
-					border-bottom: 1px solid #dfdfdf;
-					color: #555;
-					font-size: 12px;
-					margin-bottom: 6px;
-				}
-
-				.panel-instructions p {
-					padding: 0 0 5px 0;
-					margin: 0;
-				}
-
-				.clear {
-					clear: both;
-					display: block;
-				}
 
-				div.panel-buttons {
-					margin-top: 8px
-				}
-
-				div.panel-buttons {
-					*margin-top: 0px
-				}
-
-				/* ie specific */
-				code {
-					font-size: 12px;
-				}
-			</style>
-
-			<script type="text/javascript">
-				function equalHeights( makeTheseEqual ) {
-					var currentTallest = 0;
-					var $makeTheseEqual = jQuery( makeTheseEqual );
-					$makeTheseEqual.each( function ( i ) {
-						if ( jQuery( this ).height() > currentTallest ) {
-							currentTallest = jQuery( this ).height();
+			//adds touchscreen support on mobile devices
+			if ( wp_is_mobile() ) {
+				wp_print_scripts( array( 'jquery-touch-punch' ) );
+			}
+			?>
+            <style type="text/css">
+                body {
+                    font-family: "Lucida Grande", Verdana, Arial, sans-serif;
+                }
+
+                #sortable_available, #sortable_selected {
+                    list-style-type: none;
+                    margin: 0;
+                    padding: 2px;
+                    height: 250px;
+                    border: 1px solid #eaeaea;
+                    -moz-border-radius: 4px;
+                    -webkit-border-radius: 4px;
+                    -khtml-border-radius: 4px;
+                    border-radius: 4px;
+                    background-color: #FFF;
+                    overflow: auto;
+                }
+                #sortable_available li, #sortable_selected li {
+                    margin: 0 2px 2px 2px;
+                    padding: 2px;
+                    width: 96%;
+                    border: 1px solid white;
+                    cursor: pointer;
+                    font-size: 13px;
+                }
+
+                .field_hover {
+                    border: 1px dashed #2175A9 !important;
+                }
+
+                .placeholder {
+                    background-color: #FFF0A5;
+                    height: 20px;
+                }
+
+                .gcolumn_wrapper {
+                    height: 290px;
+                    padding: 0 20px;
+                }
+
+                .gcolumn_container_left, .gcolumn_container_right {
+                    width: 46%;
+                }
+
+                .gcolumn_container_left {
+                    float: left;
+                }
+
+                .gcolumn_container_right {
+                    float: right;
+                }
+
+                .gform_select_column_heading {
+                    font-weight: bold;
+                    padding-bottom: 7px;
+                    font-size: 13px;
+                }
+
+                .column-arrow-mid {
+                    float: left;
+                    width: 45px;
+                    height: 250px;
+                    background-image: url(<?php echo GFCommon::get_base_url(); ?>/images/arrow-rightleft.png);
+                    background-repeat: no-repeat;
+                    background-position: center center;
+                    margin-top: 26px;
+                }
+
+                .panel-instructions {
+                    border-bottom: 1px solid #dfdfdf;
+                    color: #555;
+                    font-size: 11px;
+                    padding: 10px 20px;
+                    margin-bottom: 6px
+                }
+
+                div.panel-buttons {
+                    margin-top: 8px;
+                    padding: 0 20px;
+                }
+
+                div.panel-buttons {
+                    *margin-top: 0
+                }
+
+                /* ie specific */
+            </style>
+
+            <script type="text/javascript">
+				jQuery(document).ready(function () {
+
+					jQuery("#sortable_available, #sortable_selected").sortable({connectWith: '.sortable_connected', placeholder: 'placeholder'});
+
+					jQuery(".sortable_connected li").hover(
+						function () {
+							jQuery(this).addClass("field_hover");
+						},
+						function () {
+							jQuery(this).removeClass("field_hover");
 						}
-					} );
-					// for ie6, set height since min-height isn't supported
-					if ( jQuery.browser.msie && jQuery.browser.version === 6.0 ) {
-						$makeTheseEqual.css( { 'height': currentTallest } );
-					}
-					$makeTheseEqual.css( { 'min-height': currentTallest } );
-				}
-
-				jQuery( document ).ready( function ( $ ) {
+					);
 
-					$( "#sortable_available, #sortable_selected" ).sortable( {
-						connectWith: '.sortable_connected',
-						placeholder: 'placeholder'
-					} );
-
-					equalHeights( '.gcolumn_wrapper ul, .column-arrow-mid' );
-
-					$( ".sortable_connected li" ).hover( function () {
-						$( this ).addClass( "field_hover" );
-					}, function () {
-						$( this ).removeClass( "field_hover" );
-					} );
-
-				} );
-
-				var columns = new Array();
-
-				function SelectColumns() {
-					columns = [];
-					jQuery( "#sortable_selected li" ).each( function () {
-						columns.push( this.id );
-					} );
-					ChangeColumns( columns );
-				}
+				});
 
 				function ChangeColumns( columns ) {
 					var json_columns = JSON.stringify( columns );
@@ -182,7 +165,9 @@ function UpdateColumns( form_id, columns ) {
 					mysack.setVar( "form_id", form_id );
 					mysack.setVar( "directory_columns", columns );
 					mysack.onCompletion = function () {
-						self.parent.tb_remove();
+						if( self.parent.hasOwnProperty('tb_remove')){
+						    self.parent.tb_remove();
+                        }
 					};
 					mysack.onError = function () {
 						alert( '<?php echo esc_js( __( "Ajax error while setting lead property", "gravity-forms-addons" ) ) ?>' )
@@ -191,136 +176,100 @@ function UpdateColumns( form_id, columns ) {
 
 					return true;
 				}
-			</script>
+
+				var columns = new Array();
+
+				function SelectColumns() {
+					jQuery("#sortable_selected li").each(function () {
+						columns.push(this.id);
+					});
+					self.ChangeColumns(columns);
+				}
+            </script>
 
 		</head>
 		<body data-formid="<?php echo $form_id; ?>">
 		<div id="wrapper">
-			<?php
-			$columns   = GFDirectory::get_grid_columns( $form_id );
-			$field_ids = array_keys( $columns );
-			#$form = RGFormsModel::get_form_meta($form_id);
-			array_push( $form["fields"], array(
-				"id"    => "id",
-				"label" => esc_html__( "Entry Id", "gravity-forms-addons" ),
-			) );
-			array_push( $form["fields"], array(
-				"id"    => "date_created",
-				"label" => esc_html__( "Entry Date", "gravity-forms-addons" ),
-			) );
-			array_push( $form["fields"], array(
-				"id"    => "ip",
-				"label" => esc_html__( "User IP", "gravity-forms-addons" ),
-			) );
-			array_push( $form["fields"], array(
-				"id"    => "source_url",
-				"label" => esc_html__( "Source Url", "gravity-forms-addons" ),
-			) );
-			array_push( $form["fields"], array(
-				"id"    => "payment_status",
-				"label" => esc_html__( "Payment Status", "gravity-forms-addons" ),
-			) );
-			array_push( $form["fields"], array(
-				"id"    => "transaction_id",
-				"label" => esc_html__( "Transaction Id", "gravity-forms-addons" ),
-			) );
-			array_push( $form["fields"], array(
-				"id"    => "payment_amount",
-				"label" => esc_html__( "Payment Amount", "gravity-forms-addons" ),
-			) );
-			array_push( $form["fields"], array(
-				"id"    => "payment_date",
-				"label" => esc_html__( "Payment Date", "gravity-forms-addons" ),
-			) );
-			array_push( $form["fields"], array(
-				"id"    => "created_by",
-				"label" => esc_html__( "User", "gravity-forms-addons" ),
-			) );
-
-			$form = self::get_selectable_entry_meta( $form );
-			?>
-			<div class="panel-instructions">
-				<p><?php esc_html_e( "Drag & drop to order and select which columns are displayed in the Gravity Forms Directory.", "gravity-forms-addons" ) ?></p>
-				<p><?php echo sprintf( esc_html__( "Embed the Directory on a post or a page using %s ", "gravity-forms-addons" ), '<code>[directory form="' . $form_id . '"]</code>' ); ?></p>
-			</div>
-			<div class="clear"></div>
-			<div class="gcolumn_wrapper">
-				<div class="gcolumn_container_left">
-					<div
-						class="gform_select_column_heading"><?php esc_html_e( "Visible Columns", "gravity-forms-addons" ); ?></div>
-					<ul id="sortable_selected" class="sortable_connected">
+        <?php
+		$columns   = GFDirectory::get_grid_columns( $form_id );
+		$field_ids = array_keys( $columns );
+		$form = RGFormsModel::get_form_meta( $form_id );
+		array_push( $form['fields'], array( 'id' => 'id', 'label' => __( 'Entry Id', 'gravity-forms-addons' ) ) );
+		array_push( $form['fields'], array( 'id' => 'date_created', 'label' => __( 'Entry Date', 'gravity-forms-addons' ) ) );
+		array_push( $form['fields'], array( 'id' => 'ip', 'label' => __( 'User IP', 'gravity-forms-addons' ) ) );
+		array_push( $form['fields'], array( 'id' => 'source_url', 'label' => __( 'Source Url', 'gravity-forms-addons' ) ) );
+		array_push( $form['fields'], array( 'id' => 'payment_status', 'label' => __( 'Payment Status', 'gravity-forms-addons' ) ) );
+		array_push( $form['fields'], array( 'id' => 'transaction_id', 'label' => __( 'Transaction Id', 'gravity-forms-addons' ) ) );
+		array_push( $form['fields'], array( 'id' => 'payment_amount', 'label' => __( 'Payment Amount', 'gravity-forms-addons' ) ) );
+		array_push( $form['fields'], array( 'id' => 'payment_date', 'label' => __( 'Payment Date', 'gravity-forms-addons' ) ) );
+		array_push( $form['fields'], array( 'id' => 'created_by', 'label' => __( 'User', 'gravity-forms-addons' ) ) );
+
+		$form = self::get_selectable_entry_meta( $form );
+		$form = GFFormsModel::convert_field_objects( $form );
+		?>
+            <div class="panel-instructions">
+                <p><?php esc_html_e( "Drag & drop to order and select which columns are displayed in the Gravity Forms Directory.", "gravity-forms-addons" ) ?></p>
+                <p><?php echo sprintf( esc_html__( "Embed the Directory on a post or a page using %s ", "gravity-forms-addons" ), '<code>[directory form="' . $form_id . '"]</code>' ); ?></p>
+            </div>
+            <div class="gcolumn_wrapper">
+                <div class="gcolumn_container_left">
+                    <div class="gform_select_column_heading"><?php esc_html_e( 'Active Columns', 'gravity-forms-addons' ); ?></div>
+                    <ul id="sortable_selected" class="sortable_connected">
 						<?php
 						foreach ( $columns as $field_id => $field_info ) {
 							?>
-							<li id="<?php echo $field_id ?>"><?php echo esc_html( $field_info["label"] ) ?></li>
+                            <li id="<?php echo esc_attr( $field_id ) ?>"><?php echo esc_html( $field_info['label'] ) ?></li>
 							<?php
 						}
 						?>
-					</ul>
-				</div>
+                    </ul>
+                </div>
 
-				<div class="column-arrow-mid"></div>
+                <div class="column-arrow-mid"></div>
 
-				<div class="gcolumn_container_right" id="available_column">
-					<div
-						class="gform_select_column_heading"> <?php esc_html_e( "Hidden Columns", "gravity-forms-addons" ); ?></div>
-					<ul id="sortable_available" class="sortable_connected">
+                <div class="gcolumn_container_right" id="available_column">
+                    <div class="gform_select_column_heading"> <?php esc_html_e( 'Inactive Columns', 'gravity-forms-addons' ); ?></div>
+                    <ul id="sortable_available" class="sortable_connected">
 						<?php
-
-						$approvedcolumn = GFDirectory::get_approved_column( $form );
-						foreach ( $form["fields"] as $field ) {
-							if ( is_array( $field ) && ! isset( $field['type'] ) ) {
-								continue;
-							}
-							if (
-								( $field instanceof GF_Field || is_array( $field ) && ! isset( $field['type'] ) ) &&
-								in_array( RGFormsModel::get_input_type( $field ), array(
-									"checkbox",
-									'address',
-									'radio',
-									'name',
-								) ) &&
-								! in_array( $field["id"], $field_ids )
-								&& floatval( $field['id'] ) !== floor( floatval( $approvedcolumn ) )
-							) {
+						foreach ( $form['fields'] as $field ) {
+							/* @var GF_Field $field */
+							if ( RGFormsModel::get_input_type( $field ) == 'checkbox' && ! in_array( $field->id, $field_ids ) ) {
 								?>
-								<li id="<?php echo $field["id"] ?>"><?php echo esc_html( rgar( $field, "label" ) ) ?></li>
+                                <li id="<?php echo esc_attr( $field->id ); ?>"><?php echo esc_html( GFCommon::get_label( $field ) ) ?></li>
 								<?php
 							}
 
-							if (
-							is_array( rgar( $field, "inputs" ) )
-							) {
-								foreach ( $field["inputs"] as $input ) {
-									if ( ! in_array( $input["id"], $field_ids ) && ! ( rgar( $field, 'type' ) === "creditcard" && in_array( $input["id"], array(
-												floatval( "{$field["id"]}.2" ),
-												floatval( "{$field["id"]}.3" ),
-											) ) )
-									) {
+							$inputs = $field->get_entry_inputs();
+
+							if ( is_array( $inputs ) ) {
+								foreach ( $inputs as $input ) {
+									if ( rgar( $input, 'isHidden' ) ) {
+										continue;
+									}
+
+									if ( ! in_array( $input['id'], $field_ids ) && ! ( $field->type == 'creditcard' && in_array( $input['id'], array( floatval( "{$field->id}.2" ), floatval( "{$field->id}.3" ), floatval( "{$field->id}.5" ) ) ) ) ) {
 										?>
-										<li id="<?php echo $input["id"] ?>"><?php echo esc_html( GFDirectory::get_label( $field, $input["id"] ) ) ?><span class="description">(<?php echo esc_html( rgar( $field, "label" ) ) ?>)</span></li>
+                                        <li id="<?php echo esc_attr( $input['id'] ); ?>"><?php echo esc_html( GFCommon::get_label( $field, $input['id'] ) ); ?></li>
 										<?php
 									}
 								}
-							} else if ( ! rgar( $field, "displayOnly" ) && ! in_array( $field["id"], $field_ids ) ) {
+							} else if ( ! $field->displayOnly && ! in_array( $field->id, $field_ids ) && RGFormsModel::get_input_type( $field ) != 'list' ) {
 								?>
-								<li id="<?php echo $field["id"] ?>"><?php echo esc_html( $field["label"] ) ?></li>
+                                <li id="<?php echo $field->id ?>"><?php echo esc_html( GFCommon::get_label( $field ) ); ?></li>
 								<?php
 							}
 						}
 						?>
-					</ul>
-				</div>
-			</div>
-
-			<div class="panel-buttons">
-				       class="button-primary" onclick="SelectColumns();"/>&nbsp;
-				<input type="button" value="<?php esc_html_e( "Cancel", "gravity-forms-addons" ); ?>" class="button"
-				<input type="button" value="<?php esc_attr_e( "Save", "gravity-forms-addons" ); ?>"
-				       onclick="self.parent.tb_remove();"/>
-			</div>
-		</div>
-		</body>
+                    </ul>
+                </div>
+            </div>
+
+            <div class="panel-buttons">
+                <input type="button" value="  <?php esc_attr_e( 'Save', 'gravity-forms-addons' ); ?>  " class="button-primary" onclick="SelectColumns();" onkeypress="SelectColumns();" />&nbsp;
+                <input type="button" value="<?php esc_attr_e( 'Cancel', 'gravity-forms-addons' ); ?>" class="button" onclick="self.parent.tb_remove();" onkeypress="self.parent.tb_remove();" />
+            </div>
+
+        </body>
 		</html>
 
 		<?php

From 6e0fda86f060fdf2d4ee757b34ec715a6220adb2 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 16:33:29 -0700
Subject: [PATCH 51/59] Fix showing entry meta

---
 template-row.php | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/template-row.php b/template-row.php
index 8961e29..eafbcc1 100644
--- a/template-row.php
+++ b/template-row.php
@@ -34,6 +34,22 @@
 
 					$field = RGFormsModel::get_field( $form, $field_id );
 
+					if( $field ) {
+						$value = RGFormsModel::get_lead_field_value( $lead, $field );
+
+						if ( GFCommon::is_post_field( $field ) ) {
+							$input_type = $field->type;
+						} else {
+							$input_type = $field->get_input_type();
+						}
+
+					} else {
+						$value = rgar( $lead, $field_id );
+						$input_type = $field_id;
+                    }
+
+					$display_value = $value;
+
 					$lightboxclass = '';
 
 					if ( ! empty( $lightboxsettings['images'] ) ) {
@@ -44,9 +60,6 @@
 						}
 					}
 
-					$value         = RGFormsModel::get_lead_field_value( $lead, $field );
-					$display_value = $value;
-
 					/**
 					 * @since 3.6.3
 					 */
@@ -55,15 +68,6 @@
 						$display_value = apply_filters( "gform_entry_field_value", $display_value, $field, $lead, $form );
 					}
 
-					// `id`, `ip`, etc.
-					if ( ! is_numeric( $field_id ) ) {
-						$input_type = $field_id;
-					} elseif ( GFCommon::is_post_field( $field ) ) {
-						$input_type = $field['type'];
-					} else {
-						$input_type = RGFormsModel::get_input_type( $field );
-					}
-
 					switch ( $input_type ) {
 
 						case "business_hours":
@@ -83,7 +87,7 @@
 								if ( $input_type === 'address' && $appendaddress ) {
 									$address['id']        = floor( (int) $field_id );
 									$address[ $field_id ] = $value;
-									if ( $hideaddresspieces ) {
+									if ( ! empty( $hideaddresspieces ) ) {
 										$value = NULL;
 									}
 								} else {
@@ -143,8 +147,8 @@
 							if ( in_array( 'urls', $lightboxsettings ) || ! empty( $lightboxsettings['urls'] ) ) {
 								$lightboxclass .= ' rel="directory_all directory_urls"';
 							}
-							if ( $linkwebsite ) {
-								$value = "<a href='" . esc_attr( $lead["source_url"] ) . "'{$target}{$lightboxclass} title='" . esc_attr( $lead["source_url"] ) . "'$nofollow>.../" . esc_attr( GFCommon::truncate_url( $lead["source_url"] ) ) . "</a>";
+							if ( ! empty( $linkwebsite ) ) {
+								$value = "<a href='" . esc_url_raw( $lead["source_url"] ) . "'{$target}{$lightboxclass} title='" . esc_attr( $lead["source_url"] ) . "'$nofollow>.../" . esc_attr( GFCommon::truncate_url( $lead["source_url"] ) ) . "</a>";
 							} else {
 								$value = esc_attr( GFCommon::truncate_url( $lead["source_url"] ) );
 							}
@@ -175,7 +179,7 @@
 							break;
 
 						case "date" :
-							if ( $dateformat ) {
+							if ( ! empty( $dateformat ) ) {
 								$value = GFCommon::date_display( $value, $dateformat );
 							} else {
 								$value = GFCommon::date_display( $value, $field["dateFormat"] );
@@ -192,7 +196,6 @@
 
 						default:
 							$input_type = 'text';
-
 							if ( is_email( $value ) && $linkemail ) {
 								$value = "<a href='mailto:$value'$nofollow>$value</a>";
 							} elseif ( preg_match( '|^http(s)?://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$|i', $value ) && $linkwebsite ) {

From cf8a600ff9b5a0a1f911cb14c0f03103afca138b Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 20:32:18 -0700
Subject: [PATCH 52/59] Fix saving Directory Columns

---
 gravity-forms-addons.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 42aa621..722f034 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -193,6 +193,12 @@ public static function init() {
 
 		self::add_rewrite();
 
+		add_action( 'wp_ajax_rg_update_feed_active', array( 'GFDirectory', 'update_feed_active' ) );
+        add_action( 'wp_ajax_gf_select_directory_form', array( 'GFDirectory', 'select_directory_form' ) );
+        add_action( 'wp_ajax_rg_update_approved', array( 'GFDirectory', 'directory_update_approved_hook' ) );
+        add_action( 'wp_ajax_change_directory_columns', array( 'GFDirectory', 'change_directory_columns' ) );
+		add_filter( 'plugin_action_links', array( 'GFDirectory', 'settings_link' ), 10, 2 );
+
 		if ( ! self::is_gravityforms_supported() ) {
 			return;
 		}
@@ -229,15 +235,6 @@ public static function init() {
 		} else if ( self::is_gravity_page( 'gf_entries' ) ) {
 			wp_enqueue_script( 'thickbox', array( 'jquery' ) );
 			add_filter( "gform_get_field_value", array( 'GFDirectory', 'add_lead_approved_hidden_input' ), 1, 3 );
-		} else if ( in_array( RG_CURRENT_PAGE, array( "admin-ajax.php" ) ) ) {
-			add_action( 'wp_ajax_rg_update_feed_active', array( 'GFDirectory', 'update_feed_active' ) );
-			add_action( 'wp_ajax_gf_select_directory_form', array( 'GFDirectory', 'select_directory_form' ) );
-			add_action( 'wp_ajax_rg_update_approved', array( 'GFDirectory', 'directory_update_approved_hook' ) );
-			add_action( 'wp_ajax_change_directory_columns', array( 'GFDirectory', 'change_directory_columns' ) );
-		} else if ( in_array( RG_CURRENT_PAGE, array( "plugins.php" ) ) ) {
-
-			add_filter( 'plugin_action_links', array( 'GFDirectory', 'settings_link' ), 10, 2 );
-
 		}
 
 	}

From 26c589415541fb6396c01d3a3484180cba9cd080 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 20:32:46 -0700
Subject: [PATCH 53/59] Fix error when trying to show entry that doesn't exist

---
 gravity-forms-addons.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 722f034..e008f9d 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1062,10 +1062,11 @@ static public function process_lead_detail( $inline = true, $entryback = '', $sh
 
 		list( $formid, $leadid ) = self::get_form_and_lead_ids();
 
-		if ( ! is_null( $leadid ) && ! is_null( $formid ) ) {
+		$lead = is_null( $leadid ) ? false : apply_filters( 'kws_gf_directory_lead_detail', RGFormsModel::get_lead( (int) $leadid ) );
+
+		if ( $lead && ! is_null( $formid ) ) {
 
 			$form = apply_filters( 'kws_gf_directory_lead_detail_form', RGFormsModel::get_form_meta( (int) $formid ) );
-			$lead = apply_filters( 'kws_gf_directory_lead_detail', RGFormsModel::get_lead( (int) $leadid ) );
 
 			if ( empty( $approvedcolumn ) ) {
 				$approvedcolumn = self::get_approved_column( $form );
@@ -1078,7 +1079,7 @@ static public function process_lead_detail( $inline = true, $entryback = '', $sh
 
 			//since 3.5
 			$lead = self::remove_hidden_fields( array( $lead ), $adminonlycolumns, $approvedcolumn, true, true, $showadminonly, $form );
-			$lead = $lead[0];
+			$lead = isset( $lead[0] ) ? $lead[0] : false;
 
 			ob_start(); // Using ob_start() allows us to filter output
 
@@ -2706,6 +2707,12 @@ static function remove_hidden_fields( $leads, $admin_only, $approved, $is_leads,
 		if ( $is_leads ) {
 
 			foreach ( $leads as $index => $lead ) {
+
+				if ( ! $lead ) {
+					unset( $leads[ $index ] );
+					continue;
+				}
+
 				// the field_ids are the numeric array keys of a lead
 				$field_ids = array_filter( array_keys( $lead ), 'is_int' );
 

From ae50d096eaff72faaf43993684697b5518d83601 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Tue, 6 Mar 2018 20:32:53 -0700
Subject: [PATCH 54/59] Escape HTML

---
 gravity-forms-addons.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index e008f9d..2ebae9c 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -2107,7 +2107,7 @@ static public function settings_link( $links, $file ) {
 			$this_plugin = plugin_basename( __FILE__ );
 		}
 		if ( $file == $this_plugin ) {
-			$settings_link = '<a href="' . admin_url( 'admin.php?page=gf_settings&addon=Directory+%26+Addons' ) . '">' . __( 'Settings', 'gravity-forms-addons' ) . '</a>';
+			$settings_link = '<a href="' . admin_url( 'admin.php?page=gf_settings&addon=Directory+%26+Addons' ) . '">' . esc_html__( 'Settings', 'gravity-forms-addons' ) . '</a>';
 			array_unshift( $links, $settings_link ); // before other links
 		}
 

From 67a7445dec835eb212cffe8c9ca01d57ebc96a1a Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Wed, 7 Mar 2018 14:07:49 -0700
Subject: [PATCH 55/59] Fix is_callable to make sure the method exists

---
 gravity-forms-addons.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 2ebae9c..edbcbf5 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -509,7 +509,7 @@ static function directory_update_approved( $lead_id = 0, $approved = 0, $form_id
 			gform_update_meta( $lead_id, 'is_approved', $approved );
 		}
 
-		if( ! is_callable( array( 'GFAPI', 'update_entry_field' ) ) ) {
+		if( ! method_exists( array( 'GFAPI', 'update_entry_field' ) ) ) {
 			GFCommon::log_error( "Cannot update approval; update_entry_field not available in Gravity Forms" );
 		    return;
         }
@@ -2802,7 +2802,7 @@ public static function save_lead( $form, &$lead ) {
 		}
 
 
-		if( is_callable( array( 'GFFormsModel', 'get_entry_meta_table_name' ) ) ) {
+		if( method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
 			$entry_meta_table = RGFormsModel::get_entry_meta_table_name();
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, meta_key FROM $entry_meta_table WHERE entry_id=%d", $lead['id'] ) );
         } else {
@@ -2857,7 +2857,7 @@ public static function save_lead( $form, &$lead ) {
 				}
 			}
 
-			if( is_callable( 'GFFormsModel', 'commit_batch_field_operations' ) ) {
+			if( method_exists( 'GFFormsModel', 'commit_batch_field_operations' ) ) {
 				GFFormsModel::commit_batch_field_operations();
             }
 
@@ -2867,7 +2867,7 @@ public static function save_lead( $form, &$lead ) {
 
 		if ( ! empty( $calculation_fields ) ) {
 
-			if( is_callable( 'GFFormsModel', 'begin_batch_field_operations' ) ) {
+			if( method_exists( 'GFFormsModel', 'begin_batch_field_operations' ) ) {
 				GFFormsModel::begin_batch_field_operations();
 			}
 
@@ -2884,7 +2884,7 @@ public static function save_lead( $form, &$lead ) {
 				}
 			}
 
-			if( is_callable( 'GFFormsModel', 'commit_batch_field_operations' ) ) {
+			if( method_exists( 'GFFormsModel', 'commit_batch_field_operations' ) ) {
 				GFFormsModel::commit_batch_field_operations();
 			}
 
@@ -2894,7 +2894,7 @@ public static function save_lead( $form, &$lead ) {
 		//saving total field as the last field of the form.
 		if ( ! empty( $total_fields ) ) {
 
-			if( is_callable( 'GFFormsModel', 'begin_batch_field_operations' ) ) {
+			if( method_exists( 'GFFormsModel', 'begin_batch_field_operations' ) ) {
 				GFFormsModel::begin_batch_field_operations();
 			}
 
@@ -2905,7 +2905,7 @@ public static function save_lead( $form, &$lead ) {
 
 			}
 
-			if( is_callable( 'GFFormsModel', 'commit_batch_field_operations' ) ) {
+			if( method_exists( 'GFFormsModel', 'commit_batch_field_operations' ) ) {
                 GFFormsModel::commit_batch_field_operations();
             }
 		}

From 3fbe07f1b50c89478a44919992423b9f8fa6a918 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Wed, 7 Mar 2018 14:08:01 -0700
Subject: [PATCH 56/59] Clean up code

---
 gravity-forms-addons.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index edbcbf5..e86c270 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -1062,9 +1062,9 @@ static public function process_lead_detail( $inline = true, $entryback = '', $sh
 
 		list( $formid, $leadid ) = self::get_form_and_lead_ids();
 
-		$lead = is_null( $leadid ) ? false : apply_filters( 'kws_gf_directory_lead_detail', RGFormsModel::get_lead( (int) $leadid ) );
+		$lead = apply_filters( 'kws_gf_directory_lead_detail', GFAPI::get_entry( $leadid ) );
 
-		if ( $lead && ! is_null( $formid ) ) {
+		if ( $lead && ! is_wp_error( $lead ) && ! is_null( $formid ) ) {
 
 			$form = apply_filters( 'kws_gf_directory_lead_detail_form', RGFormsModel::get_form_meta( (int) $formid ) );
 

From c0fffa98dd46653ecdb296f0b7c6ae679242ab6c Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Wed, 7 Mar 2018 14:17:34 -0700
Subject: [PATCH 57/59] Fix issue where DB wasn't upgraded yet, but code was
 available

---
 gravity-forms-addons.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index e86c270..6219a3b 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -2802,7 +2802,7 @@ public static function save_lead( $form, &$lead ) {
 		}
 
 
-		if( method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) {
+		if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
 			$entry_meta_table = RGFormsModel::get_entry_meta_table_name();
 			$current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, meta_key FROM $entry_meta_table WHERE entry_id=%d", $lead['id'] ) );
         } else {

From 0efa0edd90559f5bdab28ba81c9f3afd1ba13c9a Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Wed, 7 Mar 2018 14:17:45 -0700
Subject: [PATCH 58/59] Fix method_exists call

---
 gravity-forms-addons.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gravity-forms-addons.php b/gravity-forms-addons.php
index 6219a3b..ee46d2c 100644
--- a/gravity-forms-addons.php
+++ b/gravity-forms-addons.php
@@ -509,7 +509,7 @@ static function directory_update_approved( $lead_id = 0, $approved = 0, $form_id
 			gform_update_meta( $lead_id, 'is_approved', $approved );
 		}
 
-		if( ! method_exists( array( 'GFAPI', 'update_entry_field' ) ) ) {
+		if( ! method_exists( 'GFAPI', 'update_entry_field' ) ) {
 			GFCommon::log_error( "Cannot update approval; update_entry_field not available in Gravity Forms" );
 		    return;
         }
@@ -2902,7 +2902,6 @@ public static function save_lead( $form, &$lead ) {
 				GFCommon::log_debug( "Saving total field." );
 
 				RGFormsModel::save_input( $form, $total_field, $lead, $current_fields, $total_field->id );
-
 			}
 
 			if( method_exists( 'GFFormsModel', 'commit_batch_field_operations' ) ) {

From 119af10766a7f1382161657ba7c74419f0d16186 Mon Sep 17 00:00:00 2001
From: Zack Katz <zack@katz.co>
Date: Wed, 7 Mar 2018 14:20:51 -0700
Subject: [PATCH 59/59] Add active development note

---
 readme.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 39bc380..d4f3dab 100644
--- a/readme.txt
+++ b/readme.txt
@@ -13,7 +13,7 @@ Add directory capabilities and other functionality to the great Gravity Forms pl
 
 > #### [GravityView](https://gravityview.co/?utm_source=wordpress&utm_medium=readme&utm_campaign=readme) is the best way to display Gravity Forms entries
 >
-> We set out to make a better Directory plugin, and we did it: GravityView is a brand-new plugin that takes displaying your form entries to the next level. It is easier, more powerful and more customizable than the Directory plugin. You'll *love* GravityView.
+> We set out to make a better Directory plugin, and we did it: GravityView takes displaying your form entries to the next level. It is easier, more powerful and more customizable than the Directory plugin. You'll *love* GravityView.
 > 
 > [Check out GravityView](https://gravityview.co/?utm_source=wordpress&utm_medium=readme&utm_campaign=readme) or [try a demo](http://demo.gravityview.co?utm_source=wordpress&utm_medium=readme&utm_campaign=readme) today!
 
@@ -230,6 +230,8 @@ Since 3.6.3, the Directory plugin displays formatted values (like currency). To
 
 A big update to make Gravity Forms Directory compatible with Gravity Forms 2.3, and to fix entry approval.
 
+**Gravity Forms Directory is not under active development.** We're focusing on [GravityView](https://gravityview.co), which is a way better plugin! Try it out for 30 days, if you don't like it, we'll give you your money back.
+
 ** New: **
 
 - Compatible with Gravity Forms 2.3