@@ -5,239 +5,239 @@ |
||
| 5 | 5 | */ |
| 6 | 6 | class GravityView_Change_Entry_Creator { |
| 7 | 7 | |
| 8 | - function __construct() { |
|
| 9 | - |
|
| 10 | - /** |
|
| 11 | - * @since 1.5.1 |
|
| 12 | - */ |
|
| 13 | - add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 ); |
|
| 14 | - |
|
| 15 | - // ONLY ADMIN FROM HERE ON. |
|
| 16 | - if( !is_admin() ) { return; } |
|
| 17 | - |
|
| 18 | - /** |
|
| 19 | - * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality |
|
| 20 | - * @since 1.7.4 |
|
| 21 | - * @param boolean $disable Disable the Change Entry Creator functionality. Default: false. |
|
| 22 | - */ |
|
| 23 | - if( apply_filters('gravityview_disable_change_entry_creator', false ) ) { |
|
| 24 | - return; |
|
| 25 | - } |
|
| 26 | - |
|
| 27 | - /** |
|
| 28 | - * Use `init` to fix bbPress warning |
|
| 29 | - * @see https://bbpress.trac.wordpress.org/ticket/2309 |
|
| 30 | - */ |
|
| 31 | - add_action('init', array( $this, 'load'), 100 ); |
|
| 32 | - |
|
| 33 | - add_action('plugins_loaded', array( $this, 'prevent_conflicts') ); |
|
| 34 | - |
|
| 35 | - } |
|
| 36 | - |
|
| 37 | - /** |
|
| 38 | - * When an user is created using the User Registration add-on, assign the entry to them |
|
| 39 | - * |
|
| 40 | - * @since 1.5.1 |
|
| 41 | - * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field |
|
| 42 | - * @param int $user_id WordPress User ID |
|
| 43 | - * @param array $config User registration feed configuration |
|
| 44 | - * @param array $entry GF Entry array |
|
| 45 | - * @param string $password User password |
|
| 46 | - * @return void |
|
| 47 | - */ |
|
| 48 | - function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) { |
|
| 49 | - |
|
| 50 | - /** |
|
| 51 | - * Disable assigning the new user to the entry by returning false. |
|
| 52 | - * @param int $user_id WordPress User ID |
|
| 53 | - * @param array $config User registration feed configuration |
|
| 54 | - * @param array $entry GF Entry array |
|
| 55 | - */ |
|
| 56 | - $assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry ); |
|
| 57 | - |
|
| 58 | - // If filter returns false, do not process |
|
| 59 | - if( empty( $assign_to_lead ) ) { |
|
| 60 | - return; |
|
| 61 | - } |
|
| 62 | - |
|
| 63 | - // Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing |
|
| 64 | - $result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true ); |
|
| 65 | - |
|
| 66 | - if ( false === $result ) { |
|
| 67 | - $status = __('Error', 'gravityview'); |
|
| 68 | - global $wpdb; |
|
| 69 | - $note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error ); |
|
| 70 | - } else { |
|
| 71 | - $status = __('Success', 'gravityview'); |
|
| 72 | - $note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id ); |
|
| 73 | - } |
|
| 74 | - |
|
| 75 | - gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) ); |
|
| 76 | - |
|
| 77 | - /** |
|
| 78 | - * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator |
|
| 79 | - * @since 1.21.5 |
|
| 80 | - * @param boolean $disable Disable the Change Entry Creator note. Default: false. |
|
| 81 | - */ |
|
| 82 | - if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) { |
|
| 83 | - return; |
|
| 84 | - } |
|
| 85 | - |
|
| 86 | - GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' ); |
|
| 87 | - |
|
| 88 | - } |
|
| 89 | - |
|
| 90 | - /** |
|
| 91 | - * Disable previous functionality; use this one as the canonical. |
|
| 92 | - * @return void |
|
| 93 | - */ |
|
| 94 | - function prevent_conflicts() { |
|
| 95 | - |
|
| 96 | - // Plugin that was provided here: |
|
| 97 | - // @link https://gravityview.co/support/documentation/201991205/ |
|
| 98 | - remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 ); |
|
| 99 | - remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 ); |
|
| 100 | - |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - /** |
|
| 104 | - * @since 3.6.3 |
|
| 105 | - * @return void |
|
| 106 | - */ |
|
| 107 | - function load() { |
|
| 108 | - |
|
| 109 | - // Does GF exist? |
|
| 110 | - if( !class_exists('GFCommon') ) { |
|
| 111 | - return; |
|
| 112 | - } |
|
| 113 | - |
|
| 114 | - // Can the user edit entries? |
|
| 115 | - if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) { |
|
| 116 | - return; |
|
| 117 | - } |
|
| 118 | - |
|
| 119 | - // If screen mode isn't set, then we're in the wrong place. |
|
| 120 | - if( empty( $_REQUEST['screen_mode'] ) ) { |
|
| 121 | - return; |
|
| 122 | - } |
|
| 123 | - |
|
| 124 | - // Now, no validation is required in the methods; let's hook in. |
|
| 125 | - add_action('admin_init', array( &$this, 'set_screen_mode' ) ); |
|
| 126 | - |
|
| 127 | - add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2); |
|
| 128 | - |
|
| 129 | - add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2); |
|
| 130 | - |
|
| 131 | - } |
|
| 132 | - |
|
| 133 | - /** |
|
| 134 | - * Allows for edit links to work with a link instead of a form (GET instead of POST) |
|
| 135 | - * @return void |
|
| 136 | - */ |
|
| 137 | - function set_screen_mode() { |
|
| 138 | - |
|
| 139 | - // If $_GET['screen_mode'] is set to edit, set $_POST value |
|
| 140 | - if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) { |
|
| 141 | - $_POST["screen_mode"] = 'edit'; |
|
| 142 | - } |
|
| 143 | - |
|
| 144 | - } |
|
| 145 | - |
|
| 146 | - /** |
|
| 147 | - * When the entry creator is changed, add a note to the entry |
|
| 148 | - * @param array $form GF entry array |
|
| 149 | - * @param int $entry_id Entry ID |
|
| 150 | - * @return void |
|
| 151 | - */ |
|
| 152 | - function update_entry_creator($form, $entry_id) { |
|
| 153 | - global $current_user; |
|
| 8 | + function __construct() { |
|
| 9 | + |
|
| 10 | + /** |
|
| 11 | + * @since 1.5.1 |
|
| 12 | + */ |
|
| 13 | + add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 ); |
|
| 14 | + |
|
| 15 | + // ONLY ADMIN FROM HERE ON. |
|
| 16 | + if( !is_admin() ) { return; } |
|
| 17 | + |
|
| 18 | + /** |
|
| 19 | + * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality |
|
| 20 | + * @since 1.7.4 |
|
| 21 | + * @param boolean $disable Disable the Change Entry Creator functionality. Default: false. |
|
| 22 | + */ |
|
| 23 | + if( apply_filters('gravityview_disable_change_entry_creator', false ) ) { |
|
| 24 | + return; |
|
| 25 | + } |
|
| 26 | + |
|
| 27 | + /** |
|
| 28 | + * Use `init` to fix bbPress warning |
|
| 29 | + * @see https://bbpress.trac.wordpress.org/ticket/2309 |
|
| 30 | + */ |
|
| 31 | + add_action('init', array( $this, 'load'), 100 ); |
|
| 32 | + |
|
| 33 | + add_action('plugins_loaded', array( $this, 'prevent_conflicts') ); |
|
| 34 | + |
|
| 35 | + } |
|
| 36 | + |
|
| 37 | + /** |
|
| 38 | + * When an user is created using the User Registration add-on, assign the entry to them |
|
| 39 | + * |
|
| 40 | + * @since 1.5.1 |
|
| 41 | + * @uses RGFormsModel::update_lead_property() Modify the entry `created_by` field |
|
| 42 | + * @param int $user_id WordPress User ID |
|
| 43 | + * @param array $config User registration feed configuration |
|
| 44 | + * @param array $entry GF Entry array |
|
| 45 | + * @param string $password User password |
|
| 46 | + * @return void |
|
| 47 | + */ |
|
| 48 | + function assign_new_user_to_lead( $user_id, $config, $entry = array(), $password = '' ) { |
|
| 49 | + |
|
| 50 | + /** |
|
| 51 | + * Disable assigning the new user to the entry by returning false. |
|
| 52 | + * @param int $user_id WordPress User ID |
|
| 53 | + * @param array $config User registration feed configuration |
|
| 54 | + * @param array $entry GF Entry array |
|
| 55 | + */ |
|
| 56 | + $assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry ); |
|
| 57 | + |
|
| 58 | + // If filter returns false, do not process |
|
| 59 | + if( empty( $assign_to_lead ) ) { |
|
| 60 | + return; |
|
| 61 | + } |
|
| 62 | + |
|
| 63 | + // Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing |
|
| 64 | + $result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true ); |
|
| 65 | + |
|
| 66 | + if ( false === $result ) { |
|
| 67 | + $status = __('Error', 'gravityview'); |
|
| 68 | + global $wpdb; |
|
| 69 | + $note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error ); |
|
| 70 | + } else { |
|
| 71 | + $status = __('Success', 'gravityview'); |
|
| 72 | + $note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id ); |
|
| 73 | + } |
|
| 74 | + |
|
| 75 | + gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) ); |
|
| 76 | + |
|
| 77 | + /** |
|
| 78 | + * @filter `gravityview_disable_change_entry_creator_note` Disable adding a note when changing the entry creator |
|
| 79 | + * @since 1.21.5 |
|
| 80 | + * @param boolean $disable Disable the Change Entry Creator note. Default: false. |
|
| 81 | + */ |
|
| 82 | + if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) { |
|
| 83 | + return; |
|
| 84 | + } |
|
| 85 | + |
|
| 86 | + GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' ); |
|
| 87 | + |
|
| 88 | + } |
|
| 89 | + |
|
| 90 | + /** |
|
| 91 | + * Disable previous functionality; use this one as the canonical. |
|
| 92 | + * @return void |
|
| 93 | + */ |
|
| 94 | + function prevent_conflicts() { |
|
| 95 | + |
|
| 96 | + // Plugin that was provided here: |
|
| 97 | + // @link https://gravityview.co/support/documentation/201991205/ |
|
| 98 | + remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 ); |
|
| 99 | + remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 ); |
|
| 100 | + |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + /** |
|
| 104 | + * @since 3.6.3 |
|
| 105 | + * @return void |
|
| 106 | + */ |
|
| 107 | + function load() { |
|
| 108 | + |
|
| 109 | + // Does GF exist? |
|
| 110 | + if( !class_exists('GFCommon') ) { |
|
| 111 | + return; |
|
| 112 | + } |
|
| 113 | + |
|
| 114 | + // Can the user edit entries? |
|
| 115 | + if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) { |
|
| 116 | + return; |
|
| 117 | + } |
|
| 118 | + |
|
| 119 | + // If screen mode isn't set, then we're in the wrong place. |
|
| 120 | + if( empty( $_REQUEST['screen_mode'] ) ) { |
|
| 121 | + return; |
|
| 122 | + } |
|
| 123 | + |
|
| 124 | + // Now, no validation is required in the methods; let's hook in. |
|
| 125 | + add_action('admin_init', array( &$this, 'set_screen_mode' ) ); |
|
| 126 | + |
|
| 127 | + add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2); |
|
| 128 | + |
|
| 129 | + add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2); |
|
| 130 | + |
|
| 131 | + } |
|
| 132 | + |
|
| 133 | + /** |
|
| 134 | + * Allows for edit links to work with a link instead of a form (GET instead of POST) |
|
| 135 | + * @return void |
|
| 136 | + */ |
|
| 137 | + function set_screen_mode() { |
|
| 138 | + |
|
| 139 | + // If $_GET['screen_mode'] is set to edit, set $_POST value |
|
| 140 | + if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) { |
|
| 141 | + $_POST["screen_mode"] = 'edit'; |
|
| 142 | + } |
|
| 143 | + |
|
| 144 | + } |
|
| 145 | + |
|
| 146 | + /** |
|
| 147 | + * When the entry creator is changed, add a note to the entry |
|
| 148 | + * @param array $form GF entry array |
|
| 149 | + * @param int $entry_id Entry ID |
|
| 150 | + * @return void |
|
| 151 | + */ |
|
| 152 | + function update_entry_creator($form, $entry_id) { |
|
| 153 | + global $current_user; |
|
| 154 | 154 | |
| 155 | - // Update the entry |
|
| 156 | - $created_by = absint( \GV\Utils::_POST( 'created_by') ); |
|
| 155 | + // Update the entry |
|
| 156 | + $created_by = absint( \GV\Utils::_POST( 'created_by') ); |
|
| 157 | 157 | |
| 158 | - RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by ); |
|
| 158 | + RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by ); |
|
| 159 | 159 | |
| 160 | - // If the creator has changed, let's add a note about who it used to be. |
|
| 161 | - $originally_created_by = \GV\Utils::_POST( 'originally_created_by' ); |
|
| 160 | + // If the creator has changed, let's add a note about who it used to be. |
|
| 161 | + $originally_created_by = \GV\Utils::_POST( 'originally_created_by' ); |
|
| 162 | 162 | |
| 163 | - // If there's no owner and there didn't used to be, keep going |
|
| 164 | - if( empty( $originally_created_by ) && empty( $created_by ) ) { |
|
| 165 | - return; |
|
| 166 | - } |
|
| 163 | + // If there's no owner and there didn't used to be, keep going |
|
| 164 | + if( empty( $originally_created_by ) && empty( $created_by ) ) { |
|
| 165 | + return; |
|
| 166 | + } |
|
| 167 | 167 | |
| 168 | - // If the values have changed |
|
| 169 | - if( absint( $originally_created_by ) !== absint( $created_by ) ) { |
|
| 168 | + // If the values have changed |
|
| 169 | + if( absint( $originally_created_by ) !== absint( $created_by ) ) { |
|
| 170 | 170 | |
| 171 | - $user_data = get_userdata($current_user->ID); |
|
| 171 | + $user_data = get_userdata($current_user->ID); |
|
| 172 | 172 | |
| 173 | - $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview'); |
|
| 173 | + $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview'); |
|
| 174 | 174 | |
| 175 | - $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview'); |
|
| 175 | + $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview'); |
|
| 176 | 176 | |
| 177 | - if( !empty( $originally_created_by ) ) { |
|
| 178 | - $originally_created_by_user_data = get_userdata($originally_created_by); |
|
| 179 | - $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID ); |
|
| 180 | - } |
|
| 177 | + if( !empty( $originally_created_by ) ) { |
|
| 178 | + $originally_created_by_user_data = get_userdata($originally_created_by); |
|
| 179 | + $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID ); |
|
| 180 | + } |
|
| 181 | 181 | |
| 182 | - if( !empty( $created_by ) ) { |
|
| 183 | - $created_by_user_data = get_userdata($created_by); |
|
| 184 | - $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID ); |
|
| 185 | - } |
|
| 182 | + if( !empty( $created_by ) ) { |
|
| 183 | + $created_by_user_data = get_userdata($created_by); |
|
| 184 | + $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID ); |
|
| 185 | + } |
|
| 186 | 186 | |
| 187 | - GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' ); |
|
| 188 | - } |
|
| 187 | + GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' ); |
|
| 188 | + } |
|
| 189 | 189 | |
| 190 | - } |
|
| 190 | + } |
|
| 191 | 191 | |
| 192 | - /** |
|
| 193 | - * Output the select to change the entry creator |
|
| 194 | - * @param int $form_id GF Form ID |
|
| 195 | - * @param array $entry GF entry array |
|
| 196 | - * @return void |
|
| 197 | - */ |
|
| 198 | - function add_select($form_id, $entry ) { |
|
| 192 | + /** |
|
| 193 | + * Output the select to change the entry creator |
|
| 194 | + * @param int $form_id GF Form ID |
|
| 195 | + * @param array $entry GF entry array |
|
| 196 | + * @return void |
|
| 197 | + */ |
|
| 198 | + function add_select($form_id, $entry ) { |
|
| 199 | 199 | |
| 200 | - if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) { |
|
| 201 | - return; |
|
| 202 | - } |
|
| 200 | + if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) { |
|
| 201 | + return; |
|
| 202 | + } |
|
| 203 | 203 | |
| 204 | - $created_by_id = \GV\Utils::get( $entry, 'created_by' ); |
|
| 204 | + $created_by_id = \GV\Utils::get( $entry, 'created_by' ); |
|
| 205 | 205 | |
| 206 | - $users = GVCommon::get_users( 'change_entry_creator' ); |
|
| 206 | + $users = GVCommon::get_users( 'change_entry_creator' ); |
|
| 207 | 207 | |
| 208 | - $is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) ); |
|
| 208 | + $is_created_by_in_users = wp_list_filter( $users, array( 'ID' => $created_by_id ) ); |
|
| 209 | 209 | |
| 210 | - // Make sure that the entry creator is included in the users list. If not, add them. |
|
| 211 | - if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) { |
|
| 210 | + // Make sure that the entry creator is included in the users list. If not, add them. |
|
| 211 | + if ( ! empty( $created_by_id ) && empty( $is_created_by_in_users ) ) { |
|
| 212 | 212 | |
| 213 | - if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) { |
|
| 214 | - $users = array_merge( $users, $created_by_user ); |
|
| 215 | - } |
|
| 216 | - } |
|
| 213 | + if ( $created_by_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $created_by_id ) ) ) { |
|
| 214 | + $users = array_merge( $users, $created_by_user ); |
|
| 215 | + } |
|
| 216 | + } |
|
| 217 | 217 | |
| 218 | - $output = '<label for="change_created_by">'; |
|
| 219 | - $output .= esc_html__('Change Entry Creator:', 'gravityview'); |
|
| 220 | - $output .= '</label>'; |
|
| 218 | + $output = '<label for="change_created_by">'; |
|
| 219 | + $output .= esc_html__('Change Entry Creator:', 'gravityview'); |
|
| 220 | + $output .= '</label>'; |
|
| 221 | 221 | |
| 222 | - // If there are users who are not being shown, show a warning. |
|
| 223 | - // TODO: Use AJAX instead of <select> |
|
| 224 | - $count_users = count_users(); |
|
| 225 | - if( sizeof( $users ) < $count_users['total_users'] ) { |
|
| 226 | - $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>'; |
|
| 227 | - } |
|
| 222 | + // If there are users who are not being shown, show a warning. |
|
| 223 | + // TODO: Use AJAX instead of <select> |
|
| 224 | + $count_users = count_users(); |
|
| 225 | + if( sizeof( $users ) < $count_users['total_users'] ) { |
|
| 226 | + $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>'; |
|
| 227 | + } |
|
| 228 | 228 | |
| 229 | - $output .= '<select name="created_by" id="change_created_by" class="widefat">'; |
|
| 230 | - $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> — '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' — </option>'; |
|
| 231 | - foreach($users as $user) { |
|
| 232 | - $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>'; |
|
| 233 | - } |
|
| 234 | - $output .= '</select>'; |
|
| 235 | - $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />'; |
|
| 229 | + $output .= '<select name="created_by" id="change_created_by" class="widefat">'; |
|
| 230 | + $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> — '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' — </option>'; |
|
| 231 | + foreach($users as $user) { |
|
| 232 | + $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>'; |
|
| 233 | + } |
|
| 234 | + $output .= '</select>'; |
|
| 235 | + $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />'; |
|
| 236 | 236 | |
| 237 | - unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users ); |
|
| 237 | + unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users ); |
|
| 238 | 238 | |
| 239 | - echo $output; |
|
| 240 | - } |
|
| 239 | + echo $output; |
|
| 240 | + } |
|
| 241 | 241 | |
| 242 | 242 | } |
| 243 | 243 | |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | if( is_array( $search_field['value'] ) ) { |
| 19 | - gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
|
| 19 | + gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' ); |
|
| 20 | 20 | $search_field['value'] = reset( $search_field['value'] ); |
| 21 | 21 | } |
| 22 | 22 | |
@@ -94,10 +94,10 @@ discard block |
||
| 94 | 94 | |
| 95 | 95 | /** |
| 96 | 96 | * ID of the current post. May also be ID of the current View. |
| 97 | - * |
|
| 98 | - * @since 2.0.13 |
|
| 99 | - * |
|
| 100 | - * @var int |
|
| 97 | + * |
|
| 98 | + * @since 2.0.13 |
|
| 99 | + * |
|
| 100 | + * @var int |
|
| 101 | 101 | */ |
| 102 | 102 | public $post_id; |
| 103 | 103 | |
@@ -169,12 +169,12 @@ discard block |
||
| 169 | 169 | public function prevent_maybe_process_form() { |
| 170 | 170 | |
| 171 | 171 | if( ! empty( $_POST ) ) { |
| 172 | - gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) ); |
|
| 172 | + gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] $_POSTed data (sanitized): ', array( 'data' => esc_html( print_r( $_POST, true ) ) ) ); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | if( $this->is_edit_entry_submission() ) { |
| 176 | 176 | remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
| 177 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 177 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 178 | 178 | } |
| 179 | 179 | } |
| 180 | 180 | |
@@ -202,14 +202,14 @@ discard block |
||
| 202 | 202 | * When Edit entry view is requested setup the vars |
| 203 | 203 | */ |
| 204 | 204 | private function setup_vars() { |
| 205 | - global $post; |
|
| 205 | + global $post; |
|
| 206 | 206 | |
| 207 | 207 | $gravityview_view = GravityView_View::getInstance(); |
| 208 | 208 | |
| 209 | 209 | |
| 210 | 210 | $entries = $gravityview_view->getEntries(); |
| 211 | - self::$original_entry = $entries[0]; |
|
| 212 | - $this->entry = $entries[0]; |
|
| 211 | + self::$original_entry = $entries[0]; |
|
| 212 | + $this->entry = $entries[0]; |
|
| 213 | 213 | |
| 214 | 214 | self::$original_form = $gravityview_view->getForm(); |
| 215 | 215 | $this->form = $gravityview_view->getForm(); |
@@ -333,8 +333,8 @@ discard block |
||
| 333 | 333 | |
| 334 | 334 | GFFormsModel::save_lead( $form, $this->entry ); |
| 335 | 335 | |
| 336 | - // Delete the values for hidden inputs |
|
| 337 | - $this->unset_hidden_field_values(); |
|
| 336 | + // Delete the values for hidden inputs |
|
| 337 | + $this->unset_hidden_field_values(); |
|
| 338 | 338 | |
| 339 | 339 | $this->entry['date_created'] = $date_created; |
| 340 | 340 | |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | // Perform actions normally performed after updating a lead |
| 345 | 345 | $this->after_update(); |
| 346 | 346 | |
| 347 | - /** |
|
| 347 | + /** |
|
| 348 | 348 | * Must be AFTER after_update()! |
| 349 | 349 | * @see https://github.com/gravityview/GravityView/issues/764 |
| 350 | 350 | */ |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | |
| 353 | 353 | /** |
| 354 | 354 | * @action `gravityview/edit_entry/after_update` Perform an action after the entry has been updated using Edit Entry |
| 355 | - * @since 2.1 Added $gv_data parameter |
|
| 355 | + * @since 2.1 Added $gv_data parameter |
|
| 356 | 356 | * @param array $form Gravity Forms form array |
| 357 | 357 | * @param string $entry_id Numeric ID of the entry that was updated |
| 358 | 358 | * @param GravityView_Edit_Entry_Render $this This object |
@@ -376,7 +376,7 @@ discard block |
||
| 376 | 376 | * @return void |
| 377 | 377 | */ |
| 378 | 378 | private function unset_hidden_field_values() { |
| 379 | - global $wpdb; |
|
| 379 | + global $wpdb; |
|
| 380 | 380 | |
| 381 | 381 | /** |
| 382 | 382 | * @filter `gravityview/edit_entry/unset_hidden_field_values` Whether to delete values of fields hidden by conditional logic |
@@ -398,27 +398,27 @@ discard block |
||
| 398 | 398 | $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT id, field_number FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
| 399 | 399 | } |
| 400 | 400 | |
| 401 | - foreach ( $this->entry as $input_id => $field_value ) { |
|
| 401 | + foreach ( $this->entry as $input_id => $field_value ) { |
|
| 402 | 402 | |
| 403 | - $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
| 403 | + $field = RGFormsModel::get_field( $this->form, $input_id ); |
|
| 404 | 404 | |
| 405 | - // Reset fields that are hidden |
|
| 406 | - // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
| 407 | - if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
| 405 | + // Reset fields that are hidden |
|
| 406 | + // Don't pass $entry as fourth parameter; force using $_POST values to calculate conditional logic |
|
| 407 | + if ( GFFormsModel::is_field_hidden( $this->form, $field, array(), NULL ) ) { |
|
| 408 | 408 | |
| 409 | - // List fields are stored as empty arrays when empty |
|
| 410 | - $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : ''; |
|
| 409 | + // List fields are stored as empty arrays when empty |
|
| 410 | + $empty_value = $this->is_field_json_encoded( $field ) ? '[]' : ''; |
|
| 411 | 411 | |
| 412 | - $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
| 412 | + $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
|
| 413 | 413 | |
| 414 | - GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
| 414 | + GFFormsModel::update_lead_field_value( $this->form, $this->entry, $field, $lead_detail_id, $input_id, $empty_value ); |
|
| 415 | 415 | |
| 416 | - // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
| 416 | + // Prevent the $_POST values of hidden fields from being used as default values when rendering the form |
|
| 417 | 417 | // after submission |
| 418 | - $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
| 419 | - $_POST[ $post_input_id ] = ''; |
|
| 420 | - } |
|
| 421 | - } |
|
| 418 | + $post_input_id = 'input_' . str_replace( '.', '_', $input_id ); |
|
| 419 | + $_POST[ $post_input_id ] = ''; |
|
| 420 | + } |
|
| 421 | + } |
|
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | /** |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | |
| 513 | 513 | $form = $this->form; |
| 514 | 514 | |
| 515 | - /** @var GF_Field $field */ |
|
| 515 | + /** @var GF_Field $field */ |
|
| 516 | 516 | foreach( $form['fields'] as $k => &$field ) { |
| 517 | 517 | |
| 518 | 518 | /** |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | |
| 529 | 529 | if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
| 530 | 530 | foreach( $field->inputs as $key => $input ) { |
| 531 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 531 | + $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 532 | 532 | } |
| 533 | 533 | } |
| 534 | 534 | } |
@@ -561,9 +561,9 @@ discard block |
||
| 561 | 561 | foreach ( $this->fields_with_calculation as $field ) { |
| 562 | 562 | $inputs = $field->get_entry_inputs(); |
| 563 | 563 | if ( is_array( $inputs ) ) { |
| 564 | - foreach ( $inputs as $input ) { |
|
| 564 | + foreach ( $inputs as $input ) { |
|
| 565 | 565 | GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
| 566 | - } |
|
| 566 | + } |
|
| 567 | 567 | } else { |
| 568 | 568 | GFFormsModel::save_input( $form, $field, $entry, $current_fields, $field->id ); |
| 569 | 569 | } |
@@ -605,7 +605,7 @@ discard block |
||
| 605 | 605 | $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
| 606 | 606 | |
| 607 | 607 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
| 608 | - $ary = stripslashes_deep( $ary ); |
|
| 608 | + $ary = stripslashes_deep( $ary ); |
|
| 609 | 609 | $img_url = \GV\Utils::get( $ary, 0 ); |
| 610 | 610 | |
| 611 | 611 | $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
@@ -678,7 +678,7 @@ discard block |
||
| 678 | 678 | private function maybe_update_post_fields( $form ) { |
| 679 | 679 | |
| 680 | 680 | if( empty( $this->entry['post_id'] ) ) { |
| 681 | - gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
| 681 | + gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
|
| 682 | 682 | return; |
| 683 | 683 | } |
| 684 | 684 | |
@@ -713,51 +713,51 @@ discard block |
||
| 713 | 713 | |
| 714 | 714 | switch( $field->type ) { |
| 715 | 715 | |
| 716 | - case 'post_title': |
|
| 717 | - $post_title = $value; |
|
| 718 | - if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 719 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 720 | - } |
|
| 721 | - $updated_post->post_title = $post_title; |
|
| 722 | - $updated_post->post_name = $post_title; |
|
| 723 | - unset( $post_title ); |
|
| 724 | - break; |
|
| 725 | - |
|
| 726 | - case 'post_content': |
|
| 727 | - $post_content = $value; |
|
| 728 | - if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
| 729 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 730 | - } |
|
| 731 | - $updated_post->post_content = $post_content; |
|
| 732 | - unset( $post_content ); |
|
| 733 | - break; |
|
| 734 | - case 'post_excerpt': |
|
| 735 | - $updated_post->post_excerpt = $value; |
|
| 736 | - break; |
|
| 737 | - case 'post_tags': |
|
| 738 | - wp_set_post_tags( $post_id, $value, false ); |
|
| 739 | - break; |
|
| 740 | - case 'post_category': |
|
| 741 | - break; |
|
| 742 | - case 'post_custom_field': |
|
| 716 | + case 'post_title': |
|
| 717 | + $post_title = $value; |
|
| 718 | + if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
|
| 719 | + $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 720 | + } |
|
| 721 | + $updated_post->post_title = $post_title; |
|
| 722 | + $updated_post->post_name = $post_title; |
|
| 723 | + unset( $post_title ); |
|
| 724 | + break; |
|
| 725 | + |
|
| 726 | + case 'post_content': |
|
| 727 | + $post_content = $value; |
|
| 728 | + if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
|
| 729 | + $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 730 | + } |
|
| 731 | + $updated_post->post_content = $post_content; |
|
| 732 | + unset( $post_content ); |
|
| 733 | + break; |
|
| 734 | + case 'post_excerpt': |
|
| 735 | + $updated_post->post_excerpt = $value; |
|
| 736 | + break; |
|
| 737 | + case 'post_tags': |
|
| 738 | + wp_set_post_tags( $post_id, $value, false ); |
|
| 739 | + break; |
|
| 740 | + case 'post_category': |
|
| 741 | + break; |
|
| 742 | + case 'post_custom_field': |
|
| 743 | 743 | if ( is_array( $value ) && ( floatval( $field_id ) !== floatval( $field->id ) ) ) { |
| 744 | 744 | $value = $value[ $field_id ]; |
| 745 | 745 | } |
| 746 | 746 | |
| 747 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 748 | - $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
| 749 | - } |
|
| 747 | + if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 748 | + $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
|
| 749 | + } |
|
| 750 | 750 | |
| 751 | - if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
|
| 752 | - $value = wp_json_encode( $value ); |
|
| 753 | - } |
|
| 751 | + if ( $this->is_field_json_encoded( $field ) && ! is_string( $value ) ) { |
|
| 752 | + $value = wp_json_encode( $value ); |
|
| 753 | + } |
|
| 754 | 754 | |
| 755 | - update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
| 756 | - break; |
|
| 755 | + update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
|
| 756 | + break; |
|
| 757 | 757 | |
| 758 | - case 'post_image': |
|
| 759 | - $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
| 760 | - break; |
|
| 758 | + case 'post_image': |
|
| 759 | + $value = $this->update_post_image( $form, $field, $field_id, $value, $this->entry, $post_id ); |
|
| 760 | + break; |
|
| 761 | 761 | |
| 762 | 762 | } |
| 763 | 763 | |
@@ -802,20 +802,20 @@ discard block |
||
| 802 | 802 | */ |
| 803 | 803 | private function is_field_json_encoded( $field ) { |
| 804 | 804 | |
| 805 | - $json_encoded = false; |
|
| 805 | + $json_encoded = false; |
|
| 806 | 806 | |
| 807 | 807 | $input_type = RGFormsModel::get_input_type( $field ); |
| 808 | 808 | |
| 809 | - // Only certain custom field types are supported |
|
| 810 | - switch( $input_type ) { |
|
| 811 | - case 'fileupload': |
|
| 812 | - case 'list': |
|
| 813 | - case 'multiselect': |
|
| 814 | - $json_encoded = true; |
|
| 815 | - break; |
|
| 816 | - } |
|
| 809 | + // Only certain custom field types are supported |
|
| 810 | + switch( $input_type ) { |
|
| 811 | + case 'fileupload': |
|
| 812 | + case 'list': |
|
| 813 | + case 'multiselect': |
|
| 814 | + $json_encoded = true; |
|
| 815 | + break; |
|
| 816 | + } |
|
| 817 | 817 | |
| 818 | - return $json_encoded; |
|
| 818 | + return $json_encoded; |
|
| 819 | 819 | } |
| 820 | 820 | |
| 821 | 821 | /** |
@@ -905,14 +905,14 @@ discard block |
||
| 905 | 905 | ?><h2 class="gv-edit-entry-title"> |
| 906 | 906 | <span><?php |
| 907 | 907 | |
| 908 | - /** |
|
| 909 | - * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
| 910 | - * @param string $edit_entry_title Modify the "Edit Entry" title |
|
| 911 | - * @param GravityView_Edit_Entry_Render $this This object |
|
| 912 | - */ |
|
| 913 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 908 | + /** |
|
| 909 | + * @filter `gravityview_edit_entry_title` Modify the edit entry title |
|
| 910 | + * @param string $edit_entry_title Modify the "Edit Entry" title |
|
| 911 | + * @param GravityView_Edit_Entry_Render $this This object |
|
| 912 | + */ |
|
| 913 | + $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 914 | 914 | |
| 915 | - echo esc_attr( $edit_entry_title ); |
|
| 915 | + echo esc_attr( $edit_entry_title ); |
|
| 916 | 916 | ?></span> |
| 917 | 917 | </h2> |
| 918 | 918 | |
@@ -975,26 +975,26 @@ discard block |
||
| 975 | 975 | |
| 976 | 976 | switch ( $edit_redirect ) { |
| 977 | 977 | |
| 978 | - case '0': |
|
| 979 | - $redirect_url = $back_link; |
|
| 980 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
| 981 | - break; |
|
| 982 | - |
|
| 983 | - case '1': |
|
| 984 | - $redirect_url = $directory_link = GravityView_API::directory_link(); |
|
| 985 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
| 986 | - break; |
|
| 987 | - |
|
| 988 | - case '2': |
|
| 989 | - $redirect_url = $edit_redirect_url; |
|
| 990 | - $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
|
| 991 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
| 992 | - break; |
|
| 993 | - |
|
| 994 | - case '': |
|
| 995 | - default: |
|
| 996 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
| 997 | - break; |
|
| 978 | + case '0': |
|
| 979 | + $redirect_url = $back_link; |
|
| 980 | + $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
| 981 | + break; |
|
| 982 | + |
|
| 983 | + case '1': |
|
| 984 | + $redirect_url = $directory_link = GravityView_API::directory_link(); |
|
| 985 | + $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to %s%s', 'Replacement 1 is HTML. Replacement 2 is the title of the page where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $view->post_title ), '</a>' ); |
|
| 986 | + break; |
|
| 987 | + |
|
| 988 | + case '2': |
|
| 989 | + $redirect_url = $edit_redirect_url; |
|
| 990 | + $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
|
| 991 | + $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sRedirecting to %s%s', 'Replacement 1 is HTML. Replacement 2 is the URL where the user will be taken. Replacement 3 is HTML.','gravityview'), '<a href="'. esc_url( $redirect_url ) . '">', esc_html( $edit_redirect_url ), '</a>' ); |
|
| 992 | + break; |
|
| 993 | + |
|
| 994 | + case '': |
|
| 995 | + default: |
|
| 996 | + $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
| 997 | + break; |
|
| 998 | 998 | } |
| 999 | 999 | |
| 1000 | 1000 | if ( isset( $redirect_url ) ) { |
@@ -1051,7 +1051,7 @@ discard block |
||
| 1051 | 1051 | |
| 1052 | 1052 | ob_get_clean(); |
| 1053 | 1053 | |
| 1054 | - remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
| 1054 | + remove_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000 ); |
|
| 1055 | 1055 | remove_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
| 1056 | 1056 | remove_filter( 'gform_disable_view_counter', '__return_true' ); |
| 1057 | 1057 | remove_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5 ); |
@@ -1105,7 +1105,7 @@ discard block |
||
| 1105 | 1105 | |
| 1106 | 1106 | // for now we don't support Save and Continue feature. |
| 1107 | 1107 | if( ! self::$supports_save_and_continue ) { |
| 1108 | - unset( $form['save'] ); |
|
| 1108 | + unset( $form['save'] ); |
|
| 1109 | 1109 | } |
| 1110 | 1110 | |
| 1111 | 1111 | $form = $this->unselect_default_values( $form ); |
@@ -1132,30 +1132,30 @@ discard block |
||
| 1132 | 1132 | return $field_content; |
| 1133 | 1133 | } |
| 1134 | 1134 | |
| 1135 | - $message = null; |
|
| 1135 | + $message = null; |
|
| 1136 | 1136 | |
| 1137 | - // First, make sure they have the capability to edit the post. |
|
| 1138 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1137 | + // First, make sure they have the capability to edit the post. |
|
| 1138 | + if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1139 | 1139 | |
| 1140 | - /** |
|
| 1141 | - * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
| 1142 | - * @param string $message The existing "You don't have permission..." text |
|
| 1143 | - */ |
|
| 1144 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1140 | + /** |
|
| 1141 | + * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
|
| 1142 | + * @param string $message The existing "You don't have permission..." text |
|
| 1143 | + */ |
|
| 1144 | + $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1145 | 1145 | |
| 1146 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1147 | - /** |
|
| 1148 | - * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
| 1149 | - * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
| 1150 | - */ |
|
| 1151 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1152 | - } |
|
| 1146 | + } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1147 | + /** |
|
| 1148 | + * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
|
| 1149 | + * @param string $message The existing "This field is not editable; the post no longer exists." text |
|
| 1150 | + */ |
|
| 1151 | + $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1152 | + } |
|
| 1153 | 1153 | |
| 1154 | - if( $message ) { |
|
| 1155 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1156 | - } |
|
| 1154 | + if( $message ) { |
|
| 1155 | + $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1156 | + } |
|
| 1157 | 1157 | |
| 1158 | - return $field_content; |
|
| 1158 | + return $field_content; |
|
| 1159 | 1159 | } |
| 1160 | 1160 | |
| 1161 | 1161 | /** |
@@ -1183,7 +1183,7 @@ discard block |
||
| 1183 | 1183 | || ! empty( $field_content ) |
| 1184 | 1184 | || in_array( $field->type, array( 'honeypot' ) ) |
| 1185 | 1185 | ) { |
| 1186 | - return $field_content; |
|
| 1186 | + return $field_content; |
|
| 1187 | 1187 | } |
| 1188 | 1188 | |
| 1189 | 1189 | // SET SOME FIELD DEFAULTS TO PREVENT ISSUES |
@@ -1191,24 +1191,24 @@ discard block |
||
| 1191 | 1191 | |
| 1192 | 1192 | $field_value = $this->get_field_value( $field ); |
| 1193 | 1193 | |
| 1194 | - // Prevent any PHP warnings, like undefined index |
|
| 1195 | - ob_start(); |
|
| 1194 | + // Prevent any PHP warnings, like undefined index |
|
| 1195 | + ob_start(); |
|
| 1196 | 1196 | |
| 1197 | - $return = null; |
|
| 1197 | + $return = null; |
|
| 1198 | 1198 | |
| 1199 | 1199 | /** @var GravityView_Field $gv_field */ |
| 1200 | 1200 | if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
| 1201 | 1201 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
| 1202 | 1202 | } else { |
| 1203 | - $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
| 1204 | - } |
|
| 1203 | + $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
|
| 1204 | + } |
|
| 1205 | 1205 | |
| 1206 | - // If there was output, it's an error |
|
| 1207 | - $warnings = ob_get_clean(); |
|
| 1206 | + // If there was output, it's an error |
|
| 1207 | + $warnings = ob_get_clean(); |
|
| 1208 | 1208 | |
| 1209 | - if( !empty( $warnings ) ) { |
|
| 1210 | - gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
| 1211 | - } |
|
| 1209 | + if( !empty( $warnings ) ) { |
|
| 1210 | + gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
|
| 1211 | + } |
|
| 1212 | 1212 | |
| 1213 | 1213 | return $return; |
| 1214 | 1214 | } |
@@ -1243,8 +1243,8 @@ discard block |
||
| 1243 | 1243 | $input_id = strval( $input['id'] ); |
| 1244 | 1244 | |
| 1245 | 1245 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
| 1246 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1247 | - $allow_pre_populated = false; |
|
| 1246 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1247 | + $allow_pre_populated = false; |
|
| 1248 | 1248 | } |
| 1249 | 1249 | |
| 1250 | 1250 | } |
@@ -1268,7 +1268,7 @@ discard block |
||
| 1268 | 1268 | if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
| 1269 | 1269 | $categories = array(); |
| 1270 | 1270 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
| 1271 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1271 | + $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1272 | 1272 | } |
| 1273 | 1273 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
| 1274 | 1274 | } |
@@ -1278,25 +1278,25 @@ discard block |
||
| 1278 | 1278 | // if value is empty get the default value if defined |
| 1279 | 1279 | $field_value = $field->get_value_default_if_empty( $field_value ); |
| 1280 | 1280 | |
| 1281 | - /** |
|
| 1282 | - * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
| 1283 | - * @since 1.11 |
|
| 1284 | - * @since 1.20 Added third param |
|
| 1285 | - * @param mixed $field_value field value used to populate the input |
|
| 1286 | - * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
| 1287 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1288 | - */ |
|
| 1289 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
| 1290 | - |
|
| 1291 | - /** |
|
| 1292 | - * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
| 1293 | - * @since 1.17 |
|
| 1294 | - * @since 1.20 Added third param |
|
| 1295 | - * @param mixed $field_value field value used to populate the input |
|
| 1296 | - * @param GF_Field $field Gravity Forms field object |
|
| 1297 | - * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1298 | - */ |
|
| 1299 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1281 | + /** |
|
| 1282 | + * @filter `gravityview/edit_entry/field_value` Change the value of an Edit Entry field, if needed |
|
| 1283 | + * @since 1.11 |
|
| 1284 | + * @since 1.20 Added third param |
|
| 1285 | + * @param mixed $field_value field value used to populate the input |
|
| 1286 | + * @param object $field Gravity Forms field object ( Class GF_Field ) |
|
| 1287 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1288 | + */ |
|
| 1289 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value', $field_value, $field, $this ); |
|
| 1290 | + |
|
| 1291 | + /** |
|
| 1292 | + * @filter `gravityview/edit_entry/field_value_{field_type}` Change the value of an Edit Entry field for a specific field type |
|
| 1293 | + * @since 1.17 |
|
| 1294 | + * @since 1.20 Added third param |
|
| 1295 | + * @param mixed $field_value field value used to populate the input |
|
| 1296 | + * @param GF_Field $field Gravity Forms field object |
|
| 1297 | + * @param GravityView_Edit_Entry_Render $this Current object |
|
| 1298 | + */ |
|
| 1299 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1300 | 1300 | |
| 1301 | 1301 | return $field_value; |
| 1302 | 1302 | } |
@@ -1323,7 +1323,7 @@ discard block |
||
| 1323 | 1323 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
| 1324 | 1324 | // expects certain field array items to be set. |
| 1325 | 1325 | foreach ( array( 'noDuplicates', 'adminOnly', 'inputType', 'isRequired', 'enablePrice', 'inputs', 'allowedExtensions' ) as $key ) { |
| 1326 | - $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
| 1326 | + $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
|
| 1327 | 1327 | } |
| 1328 | 1328 | |
| 1329 | 1329 | switch( RGFormsModel::get_input_type( $field ) ) { |
@@ -1337,61 +1337,61 @@ discard block |
||
| 1337 | 1337 | */ |
| 1338 | 1338 | case 'fileupload': |
| 1339 | 1339 | |
| 1340 | - // Set the previous value |
|
| 1341 | - $entry = $this->get_entry(); |
|
| 1340 | + // Set the previous value |
|
| 1341 | + $entry = $this->get_entry(); |
|
| 1342 | 1342 | |
| 1343 | - $input_name = 'input_'.$field->id; |
|
| 1344 | - $form_id = $form['id']; |
|
| 1343 | + $input_name = 'input_'.$field->id; |
|
| 1344 | + $form_id = $form['id']; |
|
| 1345 | 1345 | |
| 1346 | - $value = NULL; |
|
| 1346 | + $value = NULL; |
|
| 1347 | 1347 | |
| 1348 | - // Use the previous entry value as the default. |
|
| 1349 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1350 | - $value = $entry[ $field->id ]; |
|
| 1351 | - } |
|
| 1348 | + // Use the previous entry value as the default. |
|
| 1349 | + if( isset( $entry[ $field->id ] ) ) { |
|
| 1350 | + $value = $entry[ $field->id ]; |
|
| 1351 | + } |
|
| 1352 | 1352 | |
| 1353 | - // If this is a single upload file |
|
| 1354 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1355 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1356 | - $value = $file_path['url']; |
|
| 1353 | + // If this is a single upload file |
|
| 1354 | + if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1355 | + $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1356 | + $value = $file_path['url']; |
|
| 1357 | 1357 | |
| 1358 | - } else { |
|
| 1358 | + } else { |
|
| 1359 | 1359 | |
| 1360 | - // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
| 1361 | - // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
| 1362 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1360 | + // Fix PHP warning on line 1498 of form_display.php for post_image fields |
|
| 1361 | + // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
|
| 1362 | + $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1363 | 1363 | |
| 1364 | - } |
|
| 1364 | + } |
|
| 1365 | 1365 | |
| 1366 | - if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
| 1366 | + if ( \GV\Utils::get( $field, "multipleFiles" ) ) { |
|
| 1367 | 1367 | |
| 1368 | - // If there are fresh uploads, process and merge them. |
|
| 1369 | - // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
| 1370 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1371 | - $value = empty( $value ) ? '[]' : $value; |
|
| 1372 | - $value = stripslashes_deep( $value ); |
|
| 1373 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1374 | - } |
|
| 1368 | + // If there are fresh uploads, process and merge them. |
|
| 1369 | + // Otherwise, use the passed values, which should be json-encoded array of URLs |
|
| 1370 | + if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1371 | + $value = empty( $value ) ? '[]' : $value; |
|
| 1372 | + $value = stripslashes_deep( $value ); |
|
| 1373 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1374 | + } |
|
| 1375 | 1375 | |
| 1376 | - } else { |
|
| 1376 | + } else { |
|
| 1377 | 1377 | |
| 1378 | - // A file already exists when editing an entry |
|
| 1379 | - // We set this to solve issue when file upload fields are required. |
|
| 1380 | - GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
| 1378 | + // A file already exists when editing an entry |
|
| 1379 | + // We set this to solve issue when file upload fields are required. |
|
| 1380 | + GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $value; |
|
| 1381 | 1381 | |
| 1382 | - } |
|
| 1382 | + } |
|
| 1383 | 1383 | |
| 1384 | - $this->entry[ $input_name ] = $value; |
|
| 1385 | - $_POST[ $input_name ] = $value; |
|
| 1384 | + $this->entry[ $input_name ] = $value; |
|
| 1385 | + $_POST[ $input_name ] = $value; |
|
| 1386 | 1386 | |
| 1387 | - break; |
|
| 1387 | + break; |
|
| 1388 | 1388 | |
| 1389 | 1389 | case 'number': |
| 1390 | - // Fix "undefined index" issue at line 1286 in form_display.php |
|
| 1391 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1392 | - $_POST['input_'.$field->id ] = NULL; |
|
| 1393 | - } |
|
| 1394 | - break; |
|
| 1390 | + // Fix "undefined index" issue at line 1286 in form_display.php |
|
| 1391 | + if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1392 | + $_POST['input_'.$field->id ] = NULL; |
|
| 1393 | + } |
|
| 1394 | + break; |
|
| 1395 | 1395 | } |
| 1396 | 1396 | |
| 1397 | 1397 | } |
@@ -1476,42 +1476,42 @@ discard block |
||
| 1476 | 1476 | case 'fileupload' : |
| 1477 | 1477 | case 'post_image': |
| 1478 | 1478 | |
| 1479 | - // in case nothing is uploaded but there are already files saved |
|
| 1480 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1481 | - $field->failed_validation = false; |
|
| 1482 | - unset( $field->validation_message ); |
|
| 1483 | - } |
|
| 1479 | + // in case nothing is uploaded but there are already files saved |
|
| 1480 | + if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1481 | + $field->failed_validation = false; |
|
| 1482 | + unset( $field->validation_message ); |
|
| 1483 | + } |
|
| 1484 | 1484 | |
| 1485 | - // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
| 1486 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1485 | + // validate if multi file upload reached max number of files [maxFiles] => 2 |
|
| 1486 | + if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1487 | 1487 | |
| 1488 | - $input_name = 'input_' . $field->id; |
|
| 1489 | - //uploaded |
|
| 1490 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1488 | + $input_name = 'input_' . $field->id; |
|
| 1489 | + //uploaded |
|
| 1490 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1491 | 1491 | |
| 1492 | - //existent |
|
| 1493 | - $entry = $this->get_entry(); |
|
| 1494 | - $value = NULL; |
|
| 1495 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1496 | - $value = json_decode( $entry[ $field->id ], true ); |
|
| 1497 | - } |
|
| 1492 | + //existent |
|
| 1493 | + $entry = $this->get_entry(); |
|
| 1494 | + $value = NULL; |
|
| 1495 | + if( isset( $entry[ $field->id ] ) ) { |
|
| 1496 | + $value = json_decode( $entry[ $field->id ], true ); |
|
| 1497 | + } |
|
| 1498 | 1498 | |
| 1499 | - // count uploaded files and existent entry files |
|
| 1500 | - $count_files = count( $file_names ) + count( $value ); |
|
| 1499 | + // count uploaded files and existent entry files |
|
| 1500 | + $count_files = count( $file_names ) + count( $value ); |
|
| 1501 | 1501 | |
| 1502 | - if( $count_files > $field->maxFiles ) { |
|
| 1503 | - $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
| 1504 | - $field->failed_validation = 1; |
|
| 1505 | - $gv_valid = false; |
|
| 1502 | + if( $count_files > $field->maxFiles ) { |
|
| 1503 | + $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
|
| 1504 | + $field->failed_validation = 1; |
|
| 1505 | + $gv_valid = false; |
|
| 1506 | 1506 | |
| 1507 | - // in case of error make sure the newest upload files are removed from the upload input |
|
| 1508 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1509 | - } |
|
| 1507 | + // in case of error make sure the newest upload files are removed from the upload input |
|
| 1508 | + GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1509 | + } |
|
| 1510 | 1510 | |
| 1511 | - } |
|
| 1511 | + } |
|
| 1512 | 1512 | |
| 1513 | 1513 | |
| 1514 | - break; |
|
| 1514 | + break; |
|
| 1515 | 1515 | |
| 1516 | 1516 | } |
| 1517 | 1517 | |
@@ -1522,47 +1522,47 @@ discard block |
||
| 1522 | 1522 | |
| 1523 | 1523 | switch ( $field_type ) { |
| 1524 | 1524 | |
| 1525 | - // Captchas don't need to be re-entered. |
|
| 1526 | - case 'captcha': |
|
| 1525 | + // Captchas don't need to be re-entered. |
|
| 1526 | + case 'captcha': |
|
| 1527 | 1527 | |
| 1528 | - // Post Image fields aren't editable, so we un-fail them. |
|
| 1529 | - case 'post_image': |
|
| 1530 | - $field->failed_validation = false; |
|
| 1531 | - unset( $field->validation_message ); |
|
| 1532 | - break; |
|
| 1528 | + // Post Image fields aren't editable, so we un-fail them. |
|
| 1529 | + case 'post_image': |
|
| 1530 | + $field->failed_validation = false; |
|
| 1531 | + unset( $field->validation_message ); |
|
| 1532 | + break; |
|
| 1533 | 1533 | |
| 1534 | 1534 | } |
| 1535 | 1535 | |
| 1536 | 1536 | // You can't continue inside a switch, so we do it after. |
| 1537 | 1537 | if( empty( $field->failed_validation ) ) { |
| 1538 | - continue; |
|
| 1538 | + continue; |
|
| 1539 | 1539 | } |
| 1540 | 1540 | |
| 1541 | 1541 | // checks if the No Duplicates option is not validating entry against itself, since |
| 1542 | 1542 | // we're editing a stored entry, it would also assume it's a duplicate. |
| 1543 | 1543 | if( !empty( $field->noDuplicates ) ) { |
| 1544 | 1544 | |
| 1545 | - $entry = $this->get_entry(); |
|
| 1545 | + $entry = $this->get_entry(); |
|
| 1546 | 1546 | |
| 1547 | - // If the value of the entry is the same as the stored value |
|
| 1548 | - // Then we can assume it's not a duplicate, it's the same. |
|
| 1549 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1550 | - //if value submitted was not changed, then don't validate |
|
| 1551 | - $field->failed_validation = false; |
|
| 1547 | + // If the value of the entry is the same as the stored value |
|
| 1548 | + // Then we can assume it's not a duplicate, it's the same. |
|
| 1549 | + if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1550 | + //if value submitted was not changed, then don't validate |
|
| 1551 | + $field->failed_validation = false; |
|
| 1552 | 1552 | |
| 1553 | - unset( $field->validation_message ); |
|
| 1553 | + unset( $field->validation_message ); |
|
| 1554 | 1554 | |
| 1555 | - gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
| 1555 | + gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field not a duplicate; it is the same entry.', array( 'data' => $entry ) ); |
|
| 1556 | 1556 | |
| 1557 | - continue; |
|
| 1558 | - } |
|
| 1557 | + continue; |
|
| 1558 | + } |
|
| 1559 | 1559 | } |
| 1560 | 1560 | |
| 1561 | 1561 | // if here then probably we are facing the validation 'At least one field must be filled out' |
| 1562 | 1562 | if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
| 1563 | - unset( $field->validation_message ); |
|
| 1564 | - $field->validation_message = false; |
|
| 1565 | - continue; |
|
| 1563 | + unset( $field->validation_message ); |
|
| 1564 | + $field->validation_message = false; |
|
| 1565 | + continue; |
|
| 1566 | 1566 | } |
| 1567 | 1567 | |
| 1568 | 1568 | $gv_valid = false; |
@@ -1626,8 +1626,8 @@ discard block |
||
| 1626 | 1626 | // Hide fields depending on admin settings |
| 1627 | 1627 | $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
| 1628 | 1628 | |
| 1629 | - // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
| 1630 | - $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
| 1629 | + // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
|
| 1630 | + $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
|
| 1631 | 1631 | |
| 1632 | 1632 | /** |
| 1633 | 1633 | * @filter `gravityview/edit_entry/form_fields` Modify the fields displayed in Edit Entry form |
@@ -1687,11 +1687,11 @@ discard block |
||
| 1687 | 1687 | // The edit tab has been configured, so we loop through to configured settings |
| 1688 | 1688 | foreach ( $configured_fields as $configured_field ) { |
| 1689 | 1689 | |
| 1690 | - /** @var GF_Field $field */ |
|
| 1691 | - foreach ( $fields as $field ) { |
|
| 1690 | + /** @var GF_Field $field */ |
|
| 1691 | + foreach ( $fields as $field ) { |
|
| 1692 | 1692 | if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
| 1693 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1694 | - break; |
|
| 1693 | + $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1694 | + break; |
|
| 1695 | 1695 | } |
| 1696 | 1696 | |
| 1697 | 1697 | } |
@@ -1747,28 +1747,28 @@ discard block |
||
| 1747 | 1747 | */ |
| 1748 | 1748 | private function filter_admin_only_fields( $fields = array(), $edit_fields = null, $form = array(), $view_id = 0 ) { |
| 1749 | 1749 | |
| 1750 | - /** |
|
| 1750 | + /** |
|
| 1751 | 1751 | * @filter `gravityview/edit_entry/use_gf_admin_only_setting` When Edit tab isn't configured, should the Gravity Forms "Admin Only" field settings be used to control field display to non-admins? Default: true |
| 1752 | - * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
| 1753 | - * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
| 1754 | - * @since 1.9.1 |
|
| 1755 | - * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions. |
|
| 1756 | - * @param array $form GF Form array |
|
| 1757 | - * @param int $view_id View ID |
|
| 1758 | - */ |
|
| 1759 | - $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
| 1760 | - |
|
| 1761 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 1752 | + * If the Edit Entry tab is not configured, adminOnly fields will not be shown to non-administrators. |
|
| 1753 | + * If the Edit Entry tab *is* configured, adminOnly fields will be shown to non-administrators, using the configured GV permissions |
|
| 1754 | + * @since 1.9.1 |
|
| 1755 | + * @param boolean $use_gf_adminonly_setting True: Hide field if set to Admin Only in GF and the user is not an admin. False: show field based on GV permissions, ignoring GF permissions. |
|
| 1756 | + * @param array $form GF Form array |
|
| 1757 | + * @param int $view_id View ID |
|
| 1758 | + */ |
|
| 1759 | + $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
|
| 1760 | + |
|
| 1761 | + if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 1762 | 1762 | foreach( $fields as $k => $field ) { |
| 1763 | 1763 | if( $field->adminOnly ) { |
| 1764 | - unset( $fields[ $k ] ); |
|
| 1764 | + unset( $fields[ $k ] ); |
|
| 1765 | 1765 | } |
| 1766 | 1766 | } |
| 1767 | 1767 | return array_values( $fields ); |
| 1768 | 1768 | } |
| 1769 | 1769 | |
| 1770 | - foreach( $fields as &$field ) { |
|
| 1771 | - $field->adminOnly = false; |
|
| 1770 | + foreach( $fields as &$field ) { |
|
| 1771 | + $field->adminOnly = false; |
|
| 1772 | 1772 | } |
| 1773 | 1773 | |
| 1774 | 1774 | return $fields; |
@@ -1788,13 +1788,13 @@ discard block |
||
| 1788 | 1788 | */ |
| 1789 | 1789 | private function unselect_default_values( $form ) { |
| 1790 | 1790 | |
| 1791 | - foreach ( $form['fields'] as &$field ) { |
|
| 1791 | + foreach ( $form['fields'] as &$field ) { |
|
| 1792 | 1792 | |
| 1793 | 1793 | if ( empty( $field->choices ) ) { |
| 1794 | - continue; |
|
| 1794 | + continue; |
|
| 1795 | 1795 | } |
| 1796 | 1796 | |
| 1797 | - foreach ( $field->choices as &$choice ) { |
|
| 1797 | + foreach ( $field->choices as &$choice ) { |
|
| 1798 | 1798 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
| 1799 | 1799 | $choice['isSelected'] = false; |
| 1800 | 1800 | } |
@@ -1831,36 +1831,36 @@ discard block |
||
| 1831 | 1831 | |
| 1832 | 1832 | if( 'checkbox' === $field->type ) { |
| 1833 | 1833 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
| 1834 | - $input_id = $input['id']; |
|
| 1835 | - $choice = $field->choices[ $key ]; |
|
| 1836 | - $value = \GV\Utils::get( $this->entry, $input_id ); |
|
| 1837 | - $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
| 1838 | - if( $match ) { |
|
| 1839 | - $field->choices[ $key ]['isSelected'] = true; |
|
| 1840 | - } |
|
| 1834 | + $input_id = $input['id']; |
|
| 1835 | + $choice = $field->choices[ $key ]; |
|
| 1836 | + $value = \GV\Utils::get( $this->entry, $input_id ); |
|
| 1837 | + $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
|
| 1838 | + if( $match ) { |
|
| 1839 | + $field->choices[ $key ]['isSelected'] = true; |
|
| 1840 | + } |
|
| 1841 | 1841 | } |
| 1842 | 1842 | } else { |
| 1843 | 1843 | |
| 1844 | 1844 | // We need to run through each field to set the default values |
| 1845 | 1845 | foreach ( $this->entry as $field_id => $field_value ) { |
| 1846 | 1846 | |
| 1847 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1847 | + if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1848 | 1848 | |
| 1849 | - if( 'list' === $field->type ) { |
|
| 1850 | - $list_rows = maybe_unserialize( $field_value ); |
|
| 1849 | + if( 'list' === $field->type ) { |
|
| 1850 | + $list_rows = maybe_unserialize( $field_value ); |
|
| 1851 | 1851 | |
| 1852 | - $list_field_value = array(); |
|
| 1853 | - foreach ( (array) $list_rows as $row ) { |
|
| 1854 | - foreach ( (array) $row as $column ) { |
|
| 1855 | - $list_field_value[] = $column; |
|
| 1856 | - } |
|
| 1857 | - } |
|
| 1852 | + $list_field_value = array(); |
|
| 1853 | + foreach ( (array) $list_rows as $row ) { |
|
| 1854 | + foreach ( (array) $row as $column ) { |
|
| 1855 | + $list_field_value[] = $column; |
|
| 1856 | + } |
|
| 1857 | + } |
|
| 1858 | 1858 | |
| 1859 | - $field->defaultValue = serialize( $list_field_value ); |
|
| 1860 | - } else { |
|
| 1861 | - $field->defaultValue = $field_value; |
|
| 1862 | - } |
|
| 1863 | - } |
|
| 1859 | + $field->defaultValue = serialize( $list_field_value ); |
|
| 1860 | + } else { |
|
| 1861 | + $field->defaultValue = $field_value; |
|
| 1862 | + } |
|
| 1863 | + } |
|
| 1864 | 1864 | } |
| 1865 | 1865 | } |
| 1866 | 1866 | } |
@@ -1917,7 +1917,7 @@ discard block |
||
| 1917 | 1917 | return $has_conditional_logic; |
| 1918 | 1918 | } |
| 1919 | 1919 | |
| 1920 | - /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
| 1920 | + /** @see GravityView_Edit_Entry_Render::filter_conditional_logic for filter documentation */ |
|
| 1921 | 1921 | return apply_filters( 'gravityview/edit_entry/conditional_logic', $has_conditional_logic, $form ); |
| 1922 | 1922 | } |
| 1923 | 1923 | |
@@ -1984,14 +1984,14 @@ discard block |
||
| 1984 | 1984 | |
| 1985 | 1985 | if( $echo && $error !== true ) { |
| 1986 | 1986 | |
| 1987 | - $error = esc_html( $error ); |
|
| 1987 | + $error = esc_html( $error ); |
|
| 1988 | 1988 | |
| 1989 | - /** |
|
| 1990 | - * @since 1.9 |
|
| 1991 | - */ |
|
| 1992 | - if ( ! empty( $this->entry ) ) { |
|
| 1993 | - $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 1994 | - } |
|
| 1989 | + /** |
|
| 1990 | + * @since 1.9 |
|
| 1991 | + */ |
|
| 1992 | + if ( ! empty( $this->entry ) ) { |
|
| 1993 | + $error .= ' ' . gravityview_get_link( '#', _x('Go back.', 'Link shown when invalid Edit Entry link is clicked', 'gravityview' ), array( 'onclick' => "window.history.go(-1); return false;" ) ); |
|
| 1994 | + } |
|
| 1995 | 1995 | |
| 1996 | 1996 | echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
| 1997 | 1997 | } |