@@ -180,13 +180,13 @@ discard block |
||
| 180 | 180 | $tab = wp_parse_args( $tab_settings, $tab_defaults ); |
| 181 | 181 | |
| 182 | 182 | // Force the screen to be GravityView |
| 183 | - $tab['screen'] = 'gravityview'; |
|
| 183 | + $tab[ 'screen' ] = 'gravityview'; |
|
| 184 | 184 | |
| 185 | 185 | if ( class_exists( 'GravityView_Metabox_Tab' ) ) { |
| 186 | - $metabox = new \GravityView_Metabox_Tab( $tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args'] ); |
|
| 186 | + $metabox = new \GravityView_Metabox_Tab( $tab[ 'id' ], $tab[ 'title' ], $tab[ 'file' ], $tab[ 'icon-class' ], $tab[ 'callback' ], $tab[ 'callback_args' ] ); |
|
| 187 | 187 | \GravityView_Metabox_Tabs::add( $metabox ); |
| 188 | 188 | } else { |
| 189 | - add_meta_box( 'gravityview_' . $tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority'] ); |
|
| 189 | + add_meta_box( 'gravityview_' . $tab[ 'id' ], $tab[ 'title' ], $tab[ 'callback' ], $tab[ 'screen' ], $tab[ 'context' ], $tab[ 'priority' ] ); |
|
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | 192 | |
@@ -211,14 +211,14 @@ discard block |
||
| 211 | 211 | */ |
| 212 | 212 | protected function is_extension_supported() { |
| 213 | 213 | |
| 214 | - self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool) self::$is_compatible ); |
|
| 214 | + self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool)self::$is_compatible ); |
|
| 215 | 215 | |
| 216 | 216 | if ( ! function_exists( 'gravityview' ) ) { |
| 217 | 217 | $message = sprintf( __( 'Could not activate the %s Extension; GravityView is not active.', 'gravityview' ), esc_html( $this->_title ) ); |
| 218 | - } else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version , ">=" ) ) { |
|
| 219 | - $message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_gravityview_version.'</tt>' ); |
|
| 220 | - } else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version , ">=" ) ) { |
|
| 221 | - $message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_php_version.'</tt>' ); |
|
| 218 | + } else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version, ">=" ) ) { |
|
| 219 | + $message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_gravityview_version . '</tt>' ); |
|
| 220 | + } else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version, ">=" ) ) { |
|
| 221 | + $message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_php_version . '</tt>' ); |
|
| 222 | 222 | } else if ( ! empty( $this->_max_gravityview_version ) && false === version_compare( $this->_max_gravityview_version, Plugin::$version, ">" ) ) { |
| 223 | 223 | $message = sprintf( __( 'The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview' ), esc_html( $this->_title ) ); |
| 224 | 224 | } else { |
@@ -258,12 +258,12 @@ discard block |
||
| 258 | 258 | |
| 259 | 259 | $locale = get_locale(); |
| 260 | 260 | |
| 261 | - if ( function_exists('get_user_locale') && is_admin() ) { |
|
| 261 | + if ( function_exists( 'get_user_locale' ) && is_admin() ) { |
|
| 262 | 262 | $locale = get_user_locale(); |
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | // Traditional WordPress plugin locale filter |
| 266 | - $locale = apply_filters( 'plugin_locale', $locale, $this->_text_domain ); |
|
| 266 | + $locale = apply_filters( 'plugin_locale', $locale, $this->_text_domain ); |
|
| 267 | 267 | |
| 268 | 268 | $mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale ); |
| 269 | 269 | |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | public function settings() { |
| 292 | 292 | |
| 293 | 293 | // If doing ajax, get outta here |
| 294 | - if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) ) { |
|
| 294 | + if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST( 'action' ) ) ) { |
|
| 295 | 295 | return; |
| 296 | 296 | } |
| 297 | 297 | |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | 'version' => $this->_version, // current version number |
| 309 | 309 | 'license' => \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ), |
| 310 | 310 | 'item_id' => $this->_item_id, // The ID of the download on _remote_update_url |
| 311 | - 'item_name' => $this->_title, // name of this plugin |
|
| 311 | + 'item_name' => $this->_title, // name of this plugin |
|
| 312 | 312 | 'author' => strip_tags( $this->_author ) // author of this plugin |
| 313 | 313 | ) |
| 314 | 314 | ); |
@@ -337,16 +337,16 @@ discard block |
||
| 337 | 337 | */ |
| 338 | 338 | public static function add_notice( $notice = array() ) { |
| 339 | 339 | |
| 340 | - if ( is_array( $notice ) && empty( $notice['message'] ) ) { |
|
| 340 | + if ( is_array( $notice ) && empty( $notice[ 'message' ] ) ) { |
|
| 341 | 341 | gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) ); |
| 342 | 342 | return; |
| 343 | 343 | } else if ( is_string( $notice ) ) { |
| 344 | 344 | $notice = array( 'message' => $notice ); |
| 345 | 345 | } |
| 346 | 346 | |
| 347 | - $notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class']; |
|
| 347 | + $notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ]; |
|
| 348 | 348 | |
| 349 | - self::$admin_notices []= $notice; |
|
| 349 | + self::$admin_notices [ ] = $notice; |
|
| 350 | 350 | } |
| 351 | 351 | |
| 352 | 352 | /** |
@@ -360,8 +360,8 @@ discard block |
||
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | foreach ( self::$admin_notices as $key => $notice ) { |
| 363 | - echo '<div id="message" class="'. esc_attr( $notice['class'] ).'">'; |
|
| 364 | - echo wpautop( $notice['message'] ); |
|
| 363 | + echo '<div id="message" class="' . esc_attr( $notice[ 'class' ] ) . '">'; |
|
| 364 | + echo wpautop( $notice[ 'message' ] ); |
|
| 365 | 365 | echo '<div class="clear"></div>'; |
| 366 | 366 | echo '</div>'; |
| 367 | 367 | } |
@@ -10,17 +10,17 @@ discard block |
||
| 10 | 10 | /** |
| 11 | 11 | * @since 1.5.1 |
| 12 | 12 | */ |
| 13 | - add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 ); |
|
| 13 | + add_action( 'gform_user_registered', array( $this, 'assign_new_user_to_lead' ), 10, 4 ); |
|
| 14 | 14 | |
| 15 | 15 | // ONLY ADMIN FROM HERE ON. |
| 16 | - if( !is_admin() ) { return; } |
|
| 16 | + if ( ! is_admin() ) { return; } |
|
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality |
| 20 | 20 | * @since 1.7.4 |
| 21 | 21 | * @param boolean $disable Disable the Change Entry Creator functionality. Default: false. |
| 22 | 22 | */ |
| 23 | - if( apply_filters('gravityview_disable_change_entry_creator', false ) ) { |
|
| 23 | + if ( apply_filters( 'gravityview_disable_change_entry_creator', false ) ) { |
|
| 24 | 24 | return; |
| 25 | 25 | } |
| 26 | 26 | |
@@ -28,9 +28,9 @@ discard block |
||
| 28 | 28 | * Use `init` to fix bbPress warning |
| 29 | 29 | * @see https://bbpress.trac.wordpress.org/ticket/2309 |
| 30 | 30 | */ |
| 31 | - add_action('init', array( $this, 'load'), 100 ); |
|
| 31 | + add_action( 'init', array( $this, 'load' ), 100 ); |
|
| 32 | 32 | |
| 33 | - add_action('plugins_loaded', array( $this, 'prevent_conflicts') ); |
|
| 33 | + add_action( 'plugins_loaded', array( $this, 'prevent_conflicts' ) ); |
|
| 34 | 34 | |
| 35 | 35 | } |
| 36 | 36 | |
@@ -56,20 +56,20 @@ discard block |
||
| 56 | 56 | $assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry ); |
| 57 | 57 | |
| 58 | 58 | // If filter returns false, do not process |
| 59 | - if( empty( $assign_to_lead ) ) { |
|
| 59 | + if ( empty( $assign_to_lead ) ) { |
|
| 60 | 60 | return; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 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 ); |
|
| 64 | + $result = RGFormsModel::update_entry_property( (int)$entry[ 'id' ], 'created_by', (int)$user_id, false, true ); |
|
| 65 | 65 | |
| 66 | 66 | if ( false === $result ) { |
| 67 | - $status = __('Error', 'gravityview'); |
|
| 67 | + $status = __( 'Error', 'gravityview' ); |
|
| 68 | 68 | global $wpdb; |
| 69 | 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 | 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 ); |
|
| 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 | 73 | } |
| 74 | 74 | |
| 75 | 75 | gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) ); |
@@ -79,11 +79,11 @@ discard block |
||
| 79 | 79 | * @since 1.21.5 |
| 80 | 80 | * @param boolean $disable Disable the Change Entry Creator note. Default: false. |
| 81 | 81 | */ |
| 82 | - if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) { |
|
| 82 | + if ( apply_filters( 'gravityview_disable_change_entry_creator_note', false ) ) { |
|
| 83 | 83 | return; |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' ); |
|
| 86 | + GravityView_Entry_Notes::add_note( $entry[ 'id' ], -1, 'GravityView', $note, 'gravityview' ); |
|
| 87 | 87 | |
| 88 | 88 | } |
| 89 | 89 | |
@@ -95,8 +95,8 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | // Plugin that was provided here: |
| 97 | 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 ); |
|
| 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 | 100 | |
| 101 | 101 | } |
| 102 | 102 | |
@@ -107,26 +107,26 @@ discard block |
||
| 107 | 107 | function load() { |
| 108 | 108 | |
| 109 | 109 | // Does GF exist? |
| 110 | - if( !class_exists('GFCommon') ) { |
|
| 110 | + if ( ! class_exists( 'GFCommon' ) ) { |
|
| 111 | 111 | return; |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | // Can the user edit entries? |
| 115 | - if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) { |
|
| 115 | + if ( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) { |
|
| 116 | 116 | return; |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | // If screen mode isn't set, then we're in the wrong place. |
| 120 | - if( empty( $_REQUEST['screen_mode'] ) ) { |
|
| 120 | + if ( empty( $_REQUEST[ 'screen_mode' ] ) ) { |
|
| 121 | 121 | return; |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | // Now, no validation is required in the methods; let's hook in. |
| 125 | - add_action('admin_init', array( &$this, 'set_screen_mode' ) ); |
|
| 125 | + add_action( 'admin_init', array( &$this, 'set_screen_mode' ) ); |
|
| 126 | 126 | |
| 127 | - add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2); |
|
| 127 | + add_action( "gform_entry_info", array( &$this, 'add_select' ), 10, 2 ); |
|
| 128 | 128 | |
| 129 | - add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2); |
|
| 129 | + add_action( "gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2 ); |
|
| 130 | 130 | |
| 131 | 131 | } |
| 132 | 132 | |
@@ -136,13 +136,13 @@ discard block |
||
| 136 | 136 | */ |
| 137 | 137 | function set_screen_mode() { |
| 138 | 138 | |
| 139 | - if( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) { |
|
| 139 | + if ( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) { |
|
| 140 | 140 | return; |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | // If $_GET['screen_mode'] is set to edit, set $_POST value |
| 144 | - if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) { |
|
| 145 | - $_POST["screen_mode"] = 'edit'; |
|
| 144 | + if ( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) { |
|
| 145 | + $_POST[ "screen_mode" ] = 'edit'; |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | } |
@@ -153,11 +153,11 @@ discard block |
||
| 153 | 153 | * @param int $entry_id Entry ID |
| 154 | 154 | * @return void |
| 155 | 155 | */ |
| 156 | - function update_entry_creator($form, $entry_id) { |
|
| 156 | + function update_entry_creator( $form, $entry_id ) { |
|
| 157 | 157 | global $current_user; |
| 158 | 158 | |
| 159 | 159 | // Update the entry |
| 160 | - $created_by = absint( \GV\Utils::_POST( 'created_by') ); |
|
| 160 | + $created_by = absint( \GV\Utils::_POST( 'created_by' ) ); |
|
| 161 | 161 | |
| 162 | 162 | RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by ); |
| 163 | 163 | |
@@ -165,30 +165,30 @@ discard block |
||
| 165 | 165 | $originally_created_by = \GV\Utils::_POST( 'originally_created_by' ); |
| 166 | 166 | |
| 167 | 167 | // If there's no owner and there didn't used to be, keep going |
| 168 | - if( empty( $originally_created_by ) && empty( $created_by ) ) { |
|
| 168 | + if ( empty( $originally_created_by ) && empty( $created_by ) ) { |
|
| 169 | 169 | return; |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | // If the values have changed |
| 173 | - if( absint( $originally_created_by ) !== absint( $created_by ) ) { |
|
| 173 | + if ( absint( $originally_created_by ) !== absint( $created_by ) ) { |
|
| 174 | 174 | |
| 175 | - $user_data = get_userdata($current_user->ID); |
|
| 175 | + $user_data = get_userdata( $current_user->ID ); |
|
| 176 | 176 | |
| 177 | - $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview'); |
|
| 177 | + $user_format = _x( '%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview' ); |
|
| 178 | 178 | |
| 179 | - $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'); |
|
| 179 | + $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' ); |
|
| 180 | 180 | |
| 181 | - if( !empty( $originally_created_by ) ) { |
|
| 182 | - $originally_created_by_user_data = get_userdata($originally_created_by); |
|
| 181 | + if ( ! empty( $originally_created_by ) ) { |
|
| 182 | + $originally_created_by_user_data = get_userdata( $originally_created_by ); |
|
| 183 | 183 | $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID ); |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | - if( !empty( $created_by ) ) { |
|
| 187 | - $created_by_user_data = get_userdata($created_by); |
|
| 186 | + if ( ! empty( $created_by ) ) { |
|
| 187 | + $created_by_user_data = get_userdata( $created_by ); |
|
| 188 | 188 | $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID ); |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | - 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' ); |
|
| 191 | + 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' ); |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | } |
@@ -199,9 +199,9 @@ discard block |
||
| 199 | 199 | * @param array $entry GF entry array |
| 200 | 200 | * @return void |
| 201 | 201 | */ |
| 202 | - function add_select($form_id, $entry ) { |
|
| 202 | + function add_select( $form_id, $entry ) { |
|
| 203 | 203 | |
| 204 | - if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) { |
|
| 204 | + if ( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) { |
|
| 205 | 205 | return; |
| 206 | 206 | } |
| 207 | 207 | |
@@ -220,23 +220,23 @@ discard block |
||
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | $output = '<label for="change_created_by">'; |
| 223 | - $output .= esc_html__('Change Entry Creator:', 'gravityview'); |
|
| 223 | + $output .= esc_html__( 'Change Entry Creator:', 'gravityview' ); |
|
| 224 | 224 | $output .= '</label>'; |
| 225 | 225 | |
| 226 | 226 | // If there are users who are not being shown, show a warning. |
| 227 | 227 | // TODO: Use AJAX instead of <select> |
| 228 | 228 | $count_users = count_users(); |
| 229 | - if( sizeof( $users ) < $count_users['total_users'] ) { |
|
| 229 | + if ( sizeof( $users ) < $count_users[ 'total_users' ] ) { |
|
| 230 | 230 | $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>'; |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | $output .= '<select name="created_by" id="change_created_by" class="widefat">'; |
| 234 | - $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> — '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' — </option>'; |
|
| 235 | - foreach($users as $user) { |
|
| 236 | - $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>'; |
|
| 234 | + $output .= '<option value="' . selected( $entry[ 'created_by' ], '0', false ) . '"> — ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' — </option>'; |
|
| 235 | + foreach ( $users as $user ) { |
|
| 236 | + $output .= '<option value="' . $user->ID . '"' . selected( $entry[ 'created_by' ], $user->ID, false ) . '>' . esc_attr( $user->display_name . ' (' . $user->user_nicename . ')' ) . '</option>'; |
|
| 237 | 237 | } |
| 238 | 238 | $output .= '</select>'; |
| 239 | - $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />'; |
|
| 239 | + $output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />'; |
|
| 240 | 240 | |
| 241 | 241 | unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users ); |
| 242 | 242 | |
@@ -102,8 +102,7 @@ discard block |
||
| 102 | 102 | $entries = $view->get_entries( gravityview()->request ); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - $page = \GV\Utils::get( $parameters['paging'], 'current_page' ) ? |
|
| 106 | - : ( ( ( $parameters['paging']['offset'] - $view->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 ); |
|
| 105 | + $page = \GV\Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $view->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 ); |
|
| 107 | 106 | |
| 108 | 107 | /** Set paging, count and unwrap the entries. */ |
| 109 | 108 | $paging = array( |
@@ -142,17 +141,17 @@ discard block |
||
| 142 | 141 | * @return null|string The value of a field in an entry. |
| 143 | 142 | */ |
| 144 | 143 | function GravityView_API_field_value( $entry, $field_settings, $format ) { |
| 145 | - if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) { |
|
| 144 | + if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) { |
|
| 146 | 145 | gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) ); |
| 147 | 146 | return null; |
| 148 | 147 | } |
| 149 | 148 | |
| 150 | - if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) { |
|
| 151 | - $multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry['_multi'] ) ); |
|
| 152 | - $entry = $entry['_multi'][ $field_settings['form_id'] ]; |
|
| 149 | + if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) { |
|
| 150 | + $multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry[ '_multi' ] ) ); |
|
| 151 | + $entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ]; |
|
| 153 | 152 | } |
| 154 | 153 | |
| 155 | - if ( empty( $entry['id'] ) || ! $entry = \GV\GF_Entry::by_id( $entry['id'] ) ) { |
|
| 154 | + if ( empty( $entry[ 'id' ] ) || ! $entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) { |
|
| 156 | 155 | gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) ); |
| 157 | 156 | return null; |
| 158 | 157 | } |
@@ -162,18 +161,18 @@ discard block |
||
| 162 | 161 | * |
| 163 | 162 | * Fields with a numeric ID are Gravity Forms ones. |
| 164 | 163 | */ |
| 165 | - $source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;; |
|
| 164 | + $source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; ; |
|
| 166 | 165 | |
| 167 | 166 | /** Initialize the future field. */ |
| 168 | 167 | switch ( $source ): |
| 169 | 168 | /** The Gravity Forms backend. */ |
| 170 | 169 | case \GV\Source::BACKEND_GRAVITYFORMS: |
| 171 | - if ( ! $form = \GV\GF_Form::by_id( $entry['form_id'] ) ) { |
|
| 170 | + if ( ! $form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) { |
|
| 172 | 171 | gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) ); |
| 173 | 172 | return null; |
| 174 | 173 | } |
| 175 | 174 | |
| 176 | - if ( ! $field = $form::get_field( $form, $field_settings['id'] ) ) { |
|
| 175 | + if ( ! $field = $form::get_field( $form, $field_settings[ 'id' ] ) ) { |
|
| 177 | 176 | return null; |
| 178 | 177 | } |
| 179 | 178 | |
@@ -181,7 +180,7 @@ discard block |
||
| 181 | 180 | |
| 182 | 181 | /** Our internal backend. */ |
| 183 | 182 | case \GV\Source::BACKEND_INTERNAL: |
| 184 | - if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) { |
|
| 183 | + if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) { |
|
| 185 | 184 | return null; |
| 186 | 185 | } |
| 187 | 186 | |
@@ -215,13 +214,13 @@ discard block |
||
| 215 | 214 | |
| 216 | 215 | /** A bail condition. */ |
| 217 | 216 | $bail = function( $label, $field_settings, $entry, $force_show_label, $form ) { |
| 218 | - if ( ! empty( $field_settings['show_label'] ) || $force_show_label ) { |
|
| 217 | + if ( ! empty( $field_settings[ 'show_label' ] ) || $force_show_label ) { |
|
| 219 | 218 | |
| 220 | - $label = isset( $field_settings['label'] ) ? $field_settings['label'] : ''; |
|
| 219 | + $label = isset( $field_settings[ 'label' ] ) ? $field_settings[ 'label' ] : ''; |
|
| 221 | 220 | |
| 222 | 221 | // Use Gravity Forms label by default, but if a custom label is defined in GV, use it. |
| 223 | - if ( ! empty( $field_settings['custom_label'] ) ) { |
|
| 224 | - $label = \GravityView_API::replace_variables( $field_settings['custom_label'], $form, $entry ); |
|
| 222 | + if ( ! empty( $field_settings[ 'custom_label' ] ) ) { |
|
| 223 | + $label = \GravityView_API::replace_variables( $field_settings[ 'custom_label' ], $form, $entry ); |
|
| 225 | 224 | } |
| 226 | 225 | |
| 227 | 226 | /** |
@@ -247,19 +246,19 @@ discard block |
||
| 247 | 246 | |
| 248 | 247 | $label = ''; |
| 249 | 248 | |
| 250 | - if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) { |
|
| 251 | - $entry = $entry['_multi'][ $field_settings['form_id'] ]; |
|
| 252 | - if ( $_form = \GV\GF_Form::by_id( $field_settings['form_id'] ) ) { |
|
| 249 | + if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) { |
|
| 250 | + $entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ]; |
|
| 251 | + if ( $_form = \GV\GF_Form::by_id( $field_settings[ 'form_id' ] ) ) { |
|
| 253 | 252 | $form = $_form->form; |
| 254 | 253 | } |
| 255 | 254 | } |
| 256 | 255 | |
| 257 | - if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) { |
|
| 256 | + if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) { |
|
| 258 | 257 | gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) ); |
| 259 | 258 | return $bail( $label, $field_settings, $entry, $force_show_label, $form ); |
| 260 | 259 | } |
| 261 | 260 | |
| 262 | - if ( empty( $entry['id'] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry['id'] ) ) { |
|
| 261 | + if ( empty( $entry[ 'id' ] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) { |
|
| 263 | 262 | gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) ); |
| 264 | 263 | return $bail( $label, $field_settings, $entry, $force_show_label, $form ); |
| 265 | 264 | } |
@@ -271,31 +270,31 @@ discard block |
||
| 271 | 270 | * |
| 272 | 271 | * Fields with a numeric ID are Gravity Forms ones. |
| 273 | 272 | */ |
| 274 | - $source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; |
|
| 273 | + $source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; |
|
| 275 | 274 | |
| 276 | 275 | /** Initialize the future field. */ |
| 277 | 276 | switch ( $source ): |
| 278 | 277 | /** The Gravity Forms backend. */ |
| 279 | 278 | case \GV\Source::BACKEND_GRAVITYFORMS: |
| 280 | - if ( ! $gf_form = \GV\GF_Form::by_id( $entry['form_id'] ) ) { |
|
| 279 | + if ( ! $gf_form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) { |
|
| 281 | 280 | gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) ); |
| 282 | 281 | return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form ); |
| 283 | 282 | } |
| 284 | 283 | |
| 285 | - if ( ! $field = $gf_form::get_field( $gf_form, $field_settings['id'] ) ) { |
|
| 286 | - gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings['id'], 'data' => $form ) ); |
|
| 284 | + if ( ! $field = $gf_form::get_field( $gf_form, $field_settings[ 'id' ] ) ) { |
|
| 285 | + gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings[ 'id' ], 'data' => $form ) ); |
|
| 287 | 286 | return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $gf_form->form ); |
| 288 | 287 | } |
| 289 | - if ( empty( $field_settings['show_label'] ) ) { |
|
| 288 | + if ( empty( $field_settings[ 'show_label' ] ) ) { |
|
| 290 | 289 | /** The label never wins... */ |
| 291 | - $field_settings['label'] = ''; |
|
| 290 | + $field_settings[ 'label' ] = ''; |
|
| 292 | 291 | } |
| 293 | 292 | |
| 294 | 293 | break; |
| 295 | 294 | |
| 296 | 295 | /** Our internal backend. */ |
| 297 | 296 | case \GV\Source::BACKEND_INTERNAL: |
| 298 | - if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) { |
|
| 297 | + if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) { |
|
| 299 | 298 | return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form ); |
| 300 | 299 | } |
| 301 | 300 | break; |
@@ -307,8 +306,8 @@ discard block |
||
| 307 | 306 | break; |
| 308 | 307 | endswitch; |
| 309 | 308 | |
| 310 | - if( $force_show_label ) { |
|
| 311 | - $field_settings['show_label'] = '1'; |
|
| 309 | + if ( $force_show_label ) { |
|
| 310 | + $field_settings[ 'show_label' ] = '1'; |
|
| 312 | 311 | } |
| 313 | 312 | |
| 314 | 313 | /** Add the field settings. */ |
@@ -444,7 +443,7 @@ discard block |
||
| 444 | 443 | '\GravityView_View::_current_entry' => \GravityView_View::getInstance()->getCurrentEntry(), |
| 445 | 444 | '\GravityView_View::fields' => \GravityView_View::getInstance()->getFields(), |
| 446 | 445 | '\GravityView_View::_current_field' => \GravityView_View::getInstance()->getCurrentField(), |
| 447 | - 'wp_actions[loop_start]' => empty( $wp_actions['loop_start'] ) ? 0 : $wp_actions['loop_start'], |
|
| 446 | + 'wp_actions[loop_start]' => empty( $wp_actions[ 'loop_start' ] ) ? 0 : $wp_actions[ 'loop_start' ], |
|
| 448 | 447 | 'wp_query::in_the_loop' => $wp_query->in_the_loop, |
| 449 | 448 | ); |
| 450 | 449 | } |
@@ -532,7 +531,7 @@ discard block |
||
| 532 | 531 | break; |
| 533 | 532 | case 'wp_actions[loop_start]': |
| 534 | 533 | global $wp_actions; |
| 535 | - $wp_actions['loop_start'] = $value; |
|
| 534 | + $wp_actions[ 'loop_start' ] = $value; |
|
| 536 | 535 | break; |
| 537 | 536 | case 'wp_query::in_the_loop': |
| 538 | 537 | global $wp_query; |
@@ -629,9 +628,7 @@ discard block |
||
| 629 | 628 | case 'request': |
| 630 | 629 | self::thaw( array( |
| 631 | 630 | '\GravityView_View::context' => ( |
| 632 | - $value->is_entry() ? 'single' : |
|
| 633 | - ( $value->is_edit_entry() ? 'edit' : |
|
| 634 | - ( $value->is_view() ? 'directory': null ) |
|
| 631 | + $value->is_entry() ? 'single' : ( $value->is_edit_entry() ? 'edit' : ( $value->is_view() ? 'directory' : null ) |
|
| 635 | 632 | ) |
| 636 | 633 | ), |
| 637 | 634 | '\GravityView_frontend::is_search' => $value->is_search(), |
@@ -685,14 +682,14 @@ discard block |
||
| 685 | 682 | global $wp_query, $wp_actions; |
| 686 | 683 | |
| 687 | 684 | $wp_query->in_the_loop = false; |
| 688 | - $wp_actions['loop_start'] = 0; |
|
| 685 | + $wp_actions[ 'loop_start' ] = 0; |
|
| 689 | 686 | } |
| 690 | 687 | } |
| 691 | 688 | |
| 692 | 689 | |
| 693 | 690 | /** Add some global fix for field capability discrepancies. */ |
| 694 | 691 | add_filter( 'gravityview/configuration/fields', function( $fields ) { |
| 695 | - if ( empty( $fields ) ) { |
|
| 692 | + if ( empty( $fields ) ) { |
|
| 696 | 693 | return $fields; |
| 697 | 694 | } |
| 698 | 695 | |
@@ -719,11 +716,11 @@ discard block |
||
| 719 | 716 | } |
| 720 | 717 | |
| 721 | 718 | foreach ( $_fields as $uid => &$_field ) { |
| 722 | - if ( ! isset( $_field['only_loggedin'] ) ) { |
|
| 719 | + if ( ! isset( $_field[ 'only_loggedin' ] ) ) { |
|
| 723 | 720 | continue; |
| 724 | 721 | } |
| 725 | 722 | /** If we do not require login, we don't require a cap. */ |
| 726 | - $_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' ); |
|
| 723 | + $_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' ); |
|
| 727 | 724 | } |
| 728 | 725 | } |
| 729 | 726 | return $fields; |
@@ -754,8 +751,8 @@ discard block |
||
| 754 | 751 | } |
| 755 | 752 | |
| 756 | 753 | foreach ( $_fields as $uid => &$_field ) { |
| 757 | - if ( ! empty( $_field['id'] ) && is_numeric( $_field['id'] ) && empty( $_field['form_id'] ) ) { |
|
| 758 | - $_field['form_id'] = $view->form->ID; |
|
| 754 | + if ( ! empty( $_field[ 'id' ] ) && is_numeric( $_field[ 'id' ] ) && empty( $_field[ 'form_id' ] ) ) { |
|
| 755 | + $_field[ 'form_id' ] = $view->form->ID; |
|
| 759 | 756 | } |
| 760 | 757 | } |
| 761 | 758 | } |
@@ -769,25 +766,25 @@ discard block |
||
| 769 | 766 | if ( class_exists( '\GravityView_frontend' ) ) { |
| 770 | 767 | global $wp_filter; |
| 771 | 768 | |
| 772 | - if ( empty( $wp_filter['gravityview_after'] ) ) { |
|
| 769 | + if ( empty( $wp_filter[ 'gravityview_after' ] ) ) { |
|
| 773 | 770 | return; |
| 774 | 771 | } |
| 775 | 772 | |
| 776 | 773 | /** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */ |
| 777 | - if ( is_array( $wp_filter['gravityview_after'] ) ) { |
|
| 778 | - if ( ! empty( $wp_filter['gravityview_after'][10] ) ) { |
|
| 779 | - foreach ( $wp_filter['gravityview_after'][10] as $function_key => $callback ) { |
|
| 774 | + if ( is_array( $wp_filter[ 'gravityview_after' ] ) ) { |
|
| 775 | + if ( ! empty( $wp_filter[ 'gravityview_after' ][ 10 ] ) ) { |
|
| 776 | + foreach ( $wp_filter[ 'gravityview_after' ][ 10 ] as $function_key => $callback ) { |
|
| 780 | 777 | if ( strpos( $function_key, 'context_not_configured_warning' ) ) { |
| 781 | - unset( $wp_filter['gravityview_after'][10][ $function_key ] ); |
|
| 778 | + unset( $wp_filter[ 'gravityview_after' ][ 10 ][ $function_key ] ); |
|
| 782 | 779 | } |
| 783 | 780 | } |
| 784 | 781 | } |
| 785 | 782 | return; |
| 786 | 783 | } |
| 787 | 784 | |
| 788 | - foreach ( $wp_filter['gravityview_after']->callbacks[10] as $function_key => $callback ) { |
|
| 785 | + foreach ( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ] as $function_key => $callback ) { |
|
| 789 | 786 | if ( strpos( $function_key, 'context_not_configured_warning' ) ) { |
| 790 | - unset( $wp_filter['gravityview_after']->callbacks[10][ $function_key ] ); |
|
| 787 | + unset( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ][ $function_key ] ); |
|
| 791 | 788 | } |
| 792 | 789 | } |
| 793 | 790 | } |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field). |
| 167 | 167 | */ |
| 168 | 168 | public static function from_configuration( $configuration ) { |
| 169 | - if ( empty( $configuration['id'] ) ) { |
|
| 169 | + if ( empty( $configuration[ 'id' ] ) ) { |
|
| 170 | 170 | $field = new self(); |
| 171 | 171 | gravityview()->log->error( 'Trying to get field from configuration without a field ID.', array( 'data' => $configuration ) ); |
| 172 | 172 | $field->update_configuration( $configuration ); |
@@ -179,8 +179,8 @@ discard block |
||
| 179 | 179 | } else { |
| 180 | 180 | $trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS ); |
| 181 | 181 | } |
| 182 | - $trace = $trace[1]; |
|
| 183 | - if ( $trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__ ) { |
|
| 182 | + $trace = $trace[ 1 ]; |
|
| 183 | + if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) { |
|
| 184 | 184 | $field = new self(); |
| 185 | 185 | gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' ); |
| 186 | 186 | $field->update_configuration( $configuration ); |
@@ -188,7 +188,7 @@ discard block |
||
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | /** @var \GV\GF_Field|\GV\Internal_Field $field_class Determine the field implementation to use, and try to use. */ |
| 191 | - $field_class = is_numeric( $configuration['id'] ) ? '\GV\GF_Field' : '\GV\Internal_Field'; |
|
| 191 | + $field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field'; |
|
| 192 | 192 | |
| 193 | 193 | /** |
| 194 | 194 | * @filter `gravityview/field/class` Filter the field class about to be created from the configuration. |
@@ -227,24 +227,24 @@ discard block |
||
| 227 | 227 | public function update_configuration( $configuration ) { |
| 228 | 228 | $configuration = wp_parse_args( $configuration, $this->as_configuration() ); |
| 229 | 229 | |
| 230 | - if ( $this->ID != $configuration['id'] ) { |
|
| 230 | + if ( $this->ID != $configuration[ 'id' ] ) { |
|
| 231 | 231 | /** Smelling trouble here... */ |
| 232 | 232 | gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', array( 'field_class', __CLASS__ ) ); |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - $this->ID = $configuration['id']; |
|
| 236 | - $this->label = $configuration['label']; |
|
| 237 | - $this->show_label = $configuration['show_label'] == '1'; |
|
| 238 | - $this->custom_label = $configuration['custom_label']; |
|
| 239 | - $this->custom_class = $configuration['custom_class']; |
|
| 240 | - $this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : ''; |
|
| 241 | - $this->search_filter = $configuration['search_filter'] == '1'; |
|
| 242 | - $this->show_as_link = $configuration['show_as_link'] == '1'; |
|
| 235 | + $this->ID = $configuration[ 'id' ]; |
|
| 236 | + $this->label = $configuration[ 'label' ]; |
|
| 237 | + $this->show_label = $configuration[ 'show_label' ] == '1'; |
|
| 238 | + $this->custom_label = $configuration[ 'custom_label' ]; |
|
| 239 | + $this->custom_class = $configuration[ 'custom_class' ]; |
|
| 240 | + $this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : ''; |
|
| 241 | + $this->search_filter = $configuration[ 'search_filter' ] == '1'; |
|
| 242 | + $this->show_as_link = $configuration[ 'show_as_link' ] == '1'; |
|
| 243 | 243 | |
| 244 | 244 | /** Shared among all field types (sort of). */ |
| 245 | 245 | $shared_configuration_keys = array( |
| 246 | 246 | 'id', 'label', 'show_label', 'custom_label', 'custom_class', |
| 247 | - 'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link', |
|
| 247 | + 'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link', |
|
| 248 | 248 | ); |
| 249 | 249 | |
| 250 | 250 | /** Everything else goes into the properties for now. @todo subclasses! */ |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | |
| 274 | 274 | /** A custom label is available. */ |
| 275 | 275 | if ( ! empty( $this->custom_label ) ) { |
| 276 | - return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null ); |
|
| 276 | + return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null ); |
|
| 277 | 277 | } |
| 278 | 278 | |
| 279 | 279 | return ''; |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | * @return mixed|null The value for the given configuration key, null if doesn't exist. |
| 351 | 351 | */ |
| 352 | 352 | public function __get( $key ) { |
| 353 | - switch( $key ) { |
|
| 353 | + switch ( $key ) { |
|
| 354 | 354 | default: |
| 355 | 355 | if ( isset( $this->configuration[ $key ] ) ) { |
| 356 | 356 | return $this->configuration[ $key ]; |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | * @return boolean Whether this $key is set or not. |
| 369 | 369 | */ |
| 370 | 370 | public function __isset( $key ) { |
| 371 | - switch( $key ) { |
|
| 371 | + switch ( $key ) { |
|
| 372 | 372 | default: |
| 373 | 373 | return isset( $this->configuration[ $key ] ); |
| 374 | 374 | } |
@@ -104,11 +104,11 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | /** Call all lazy callbacks. */ |
| 106 | 106 | foreach ( $this->callbacks as $callback ) { |
| 107 | - if ( $callback[0] != 'count' ) { |
|
| 107 | + if ( $callback[ 0 ] != 'count' ) { |
|
| 108 | 108 | continue; |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - $total += $callback[1]( $this->filters ); |
|
| 111 | + $total += $callback[ 1 ]( $this->filters ); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | if ( ! $total ) { |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | |
| 149 | 149 | foreach ( $this->all() as $entry ) { |
| 150 | 150 | $entry = $entry->as_entry(); |
| 151 | - $result[] = Utils::get( $entry, $key, null ); |
|
| 151 | + $result[ ] = Utils::get( $entry, $key, null ); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | return $result; |
@@ -206,11 +206,11 @@ discard block |
||
| 206 | 206 | |
| 207 | 207 | /** Call all lazy callbacks. */ |
| 208 | 208 | foreach ( $this->callbacks as $i => $callback ) { |
| 209 | - if ( $callback[0] != 'fetch' ) { |
|
| 209 | + if ( $callback[ 0 ] != 'fetch' ) { |
|
| 210 | 210 | continue; |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | - $this->merge( $callback[1]( $this->filters, $this->sorts, $offset ) ); |
|
| 213 | + $this->merge( $callback[ 1 ]( $this->filters, $this->sorts, $offset ) ); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | $this->fetched = parent::count(); |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | return; |
| 367 | 367 | } |
| 368 | 368 | |
| 369 | - $this->callbacks []= array( $type, $callback ); |
|
| 369 | + $this->callbacks [ ] = array( $type, $callback ); |
|
| 370 | 370 | } |
| 371 | 371 | |
| 372 | 372 | /** |
@@ -123,16 +123,16 @@ discard block |
||
| 123 | 123 | function load() { |
| 124 | 124 | |
| 125 | 125 | /** @define "GRAVITYVIEW_DIR" "../../../" */ |
| 126 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin-approve-entries.php' ); |
|
| 126 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin-approve-entries.php' ); |
|
| 127 | 127 | |
| 128 | 128 | // Don't display an embedded form when editing an entry |
| 129 | 129 | add_action( 'wp_head', array( $this, 'prevent_render_form' ) ); |
| 130 | 130 | add_action( 'wp_footer', array( $this, 'prevent_render_form' ) ); |
| 131 | 131 | |
| 132 | 132 | // Stop Gravity Forms processing what is ours! |
| 133 | - add_filter( 'wp', array( $this, 'prevent_maybe_process_form'), 8 ); |
|
| 133 | + add_filter( 'wp', array( $this, 'prevent_maybe_process_form' ), 8 ); |
|
| 134 | 134 | |
| 135 | - add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry') ); |
|
| 135 | + add_filter( 'gravityview_is_edit_entry', array( $this, 'is_edit_entry' ) ); |
|
| 136 | 136 | |
| 137 | 137 | add_action( 'gravityview_edit_entry', array( $this, 'init' ), 10, 4 ); |
| 138 | 138 | |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | add_filter( 'gform_plupload_settings', array( $this, 'modify_fileupload_settings' ), 10, 3 ); |
| 144 | 144 | |
| 145 | 145 | // Add fields expected by GFFormDisplay::validate() |
| 146 | - add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation') ); |
|
| 146 | + add_filter( 'gform_pre_validation', array( $this, 'gform_pre_validation' ) ); |
|
| 147 | 147 | |
| 148 | 148 | // Fix multiselect value for GF 2.2 |
| 149 | 149 | add_filter( 'gravityview/edit_entry/field_value_multiselect', array( $this, 'fix_multiselect_value_serialization' ), 10, 3 ); |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | * @return void |
| 161 | 161 | */ |
| 162 | 162 | public function prevent_render_form() { |
| 163 | - if( $this->is_edit_entry() ) { |
|
| 164 | - if( 'wp_head' === current_filter() ) { |
|
| 163 | + if ( $this->is_edit_entry() ) { |
|
| 164 | + if ( 'wp_head' === current_filter() ) { |
|
| 165 | 165 | add_filter( 'gform_shortcode_form', '__return_empty_string' ); |
| 166 | 166 | } else { |
| 167 | 167 | remove_filter( 'gform_shortcode_form', '__return_empty_string' ); |
@@ -176,14 +176,14 @@ discard block |
||
| 176 | 176 | */ |
| 177 | 177 | public function prevent_maybe_process_form() { |
| 178 | 178 | |
| 179 | - if( ! $this->is_edit_entry_submission() ) { |
|
| 179 | + if ( ! $this->is_edit_entry_submission() ) { |
|
| 180 | 180 | return; |
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | gravityview()->log->debug( 'GravityView_Edit_Entry[prevent_maybe_process_form] Removing GFForms::maybe_process_form() action.' ); |
| 184 | 184 | |
| 185 | - remove_action( 'wp', array( 'RGForms', 'maybe_process_form'), 9 ); |
|
| 186 | - remove_action( 'wp', array( 'GFForms', 'maybe_process_form'), 9 ); |
|
| 185 | + remove_action( 'wp', array( 'RGForms', 'maybe_process_form' ), 9 ); |
|
| 186 | + remove_action( 'wp', array( 'GFForms', 'maybe_process_form' ), 9 ); |
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | /** |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | */ |
| 193 | 193 | public function is_edit_entry() { |
| 194 | 194 | |
| 195 | - $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET['edit'] ); |
|
| 195 | + $is_edit_entry = GravityView_frontend::is_single_entry() && ! empty( $_GET[ 'edit' ] ); |
|
| 196 | 196 | |
| 197 | 197 | return ( $is_edit_entry || $this->is_edit_entry_submission() ); |
| 198 | 198 | } |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | * @return boolean |
| 204 | 204 | */ |
| 205 | 205 | public function is_edit_entry_submission() { |
| 206 | - return !empty( $_POST[ self::$nonce_field ] ); |
|
| 206 | + return ! empty( $_POST[ self::$nonce_field ] ); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | /** |
@@ -216,16 +216,16 @@ discard block |
||
| 216 | 216 | |
| 217 | 217 | |
| 218 | 218 | $entries = $gravityview_view->getEntries(); |
| 219 | - self::$original_entry = $entries[0]; |
|
| 220 | - $this->entry = $entries[0]; |
|
| 219 | + self::$original_entry = $entries[ 0 ]; |
|
| 220 | + $this->entry = $entries[ 0 ]; |
|
| 221 | 221 | |
| 222 | 222 | self::$original_form = $gravityview_view->getForm(); |
| 223 | 223 | $this->form = $gravityview_view->getForm(); |
| 224 | - $this->form_id = $this->entry['form_id']; |
|
| 224 | + $this->form_id = $this->entry[ 'form_id' ]; |
|
| 225 | 225 | $this->view_id = $gravityview_view->getViewId(); |
| 226 | 226 | $this->post_id = \GV\Utils::get( $post, 'ID', null ); |
| 227 | 227 | |
| 228 | - self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry['id'] ); |
|
| 228 | + self::$nonce_key = GravityView_Edit_Entry::get_nonce_key( $this->view_id, $this->form_id, $this->entry[ 'id' ] ); |
|
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | |
@@ -284,9 +284,9 @@ discard block |
||
| 284 | 284 | private function print_scripts() { |
| 285 | 285 | $gravityview_view = GravityView_View::getInstance(); |
| 286 | 286 | |
| 287 | - wp_register_script( 'gform_gravityforms', GFCommon::get_base_url().'/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 287 | + wp_register_script( 'gform_gravityforms', GFCommon::get_base_url() . '/js/gravityforms.js', array( 'jquery', 'gform_json', 'gform_placeholder', 'sack', 'plupload-all', 'gravityview-fe-view' ) ); |
|
| 288 | 288 | |
| 289 | - GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false); |
|
| 289 | + GFFormDisplay::enqueue_form_scripts( $gravityview_view->getForm(), false ); |
|
| 290 | 290 | |
| 291 | 291 | wp_localize_script( 'gravityview-fe-view', 'gvGlobals', array( 'cookiepath' => COOKIEPATH ) ); |
| 292 | 292 | |
@@ -302,19 +302,19 @@ discard block |
||
| 302 | 302 | */ |
| 303 | 303 | private function process_save( $gv_data ) { |
| 304 | 304 | |
| 305 | - if ( empty( $_POST ) || ! isset( $_POST['lid'] ) ) { |
|
| 305 | + if ( empty( $_POST ) || ! isset( $_POST[ 'lid' ] ) ) { |
|
| 306 | 306 | return; |
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | // Make sure the entry, view, and form IDs are all correct |
| 310 | 310 | $valid = $this->verify_nonce(); |
| 311 | 311 | |
| 312 | - if ( !$valid ) { |
|
| 312 | + if ( ! $valid ) { |
|
| 313 | 313 | gravityview()->log->error( 'Nonce validation failed.' ); |
| 314 | 314 | return; |
| 315 | 315 | } |
| 316 | 316 | |
| 317 | - if ( $this->entry['id'] !== $_POST['lid'] ) { |
|
| 317 | + if ( $this->entry[ 'id' ] !== $_POST[ 'lid' ] ) { |
|
| 318 | 318 | gravityview()->log->error( 'Entry ID did not match posted entry ID.' ); |
| 319 | 319 | return; |
| 320 | 320 | } |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | |
| 326 | 326 | $this->validate(); |
| 327 | 327 | |
| 328 | - if( $this->is_valid ) { |
|
| 328 | + if ( $this->is_valid ) { |
|
| 329 | 329 | |
| 330 | 330 | gravityview()->log->debug( 'Submission is valid.' ); |
| 331 | 331 | |
@@ -337,15 +337,15 @@ discard block |
||
| 337 | 337 | /** |
| 338 | 338 | * @hack to avoid the capability validation of the method save_lead for GF 1.9+ |
| 339 | 339 | */ |
| 340 | - unset( $_GET['page'] ); |
|
| 340 | + unset( $_GET[ 'page' ] ); |
|
| 341 | 341 | |
| 342 | - $date_created = $this->entry['date_created']; |
|
| 342 | + $date_created = $this->entry[ 'date_created' ]; |
|
| 343 | 343 | |
| 344 | 344 | /** |
| 345 | 345 | * @hack to force Gravity Forms to use $read_value_from_post in GFFormsModel::save_lead() |
| 346 | 346 | * @since 1.17.2 |
| 347 | 347 | */ |
| 348 | - unset( $this->entry['date_created'] ); |
|
| 348 | + unset( $this->entry[ 'date_created' ] ); |
|
| 349 | 349 | |
| 350 | 350 | /** |
| 351 | 351 | * @action `gravityview/edit_entry/before_update` Perform an action after the entry has been updated using Edit Entry |
@@ -355,14 +355,14 @@ discard block |
||
| 355 | 355 | * @param GravityView_Edit_Entry_Render $this This object |
| 356 | 356 | * @param GravityView_View_Data $gv_data The View data |
| 357 | 357 | */ |
| 358 | - do_action( 'gravityview/edit_entry/before_update', $form, $this->entry['id'], $this, $gv_data ); |
|
| 358 | + do_action( 'gravityview/edit_entry/before_update', $form, $this->entry[ 'id' ], $this, $gv_data ); |
|
| 359 | 359 | |
| 360 | 360 | GFFormsModel::save_lead( $form, $this->entry ); |
| 361 | 361 | |
| 362 | 362 | // Delete the values for hidden inputs |
| 363 | 363 | $this->unset_hidden_field_values(); |
| 364 | 364 | |
| 365 | - $this->entry['date_created'] = $date_created; |
|
| 365 | + $this->entry[ 'date_created' ] = $date_created; |
|
| 366 | 366 | |
| 367 | 367 | // Process calculation fields |
| 368 | 368 | $this->update_calculation_fields(); |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | * @param GravityView_Edit_Entry_Render $this This object |
| 385 | 385 | * @param GravityView_View_Data $gv_data The View data |
| 386 | 386 | */ |
| 387 | - do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry['id'], $this, $gv_data ); |
|
| 387 | + do_action( 'gravityview/edit_entry/after_update', $this->form, $this->entry[ 'id' ], $this, $gv_data ); |
|
| 388 | 388 | |
| 389 | 389 | } else { |
| 390 | 390 | gravityview()->log->error( 'Submission is NOT valid.', array( 'entry' => $this->entry ) ); |
@@ -412,16 +412,16 @@ discard block |
||
| 412 | 412 | */ |
| 413 | 413 | $unset_hidden_field_values = apply_filters( 'gravityview/edit_entry/unset_hidden_field_values', true, $this ); |
| 414 | 414 | |
| 415 | - if( ! $unset_hidden_field_values ) { |
|
| 415 | + if ( ! $unset_hidden_field_values ) { |
|
| 416 | 416 | return; |
| 417 | 417 | } |
| 418 | 418 | |
| 419 | 419 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
| 420 | 420 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
| 421 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry['id'] ) ); |
|
| 421 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $this->entry[ 'id' ] ) ); |
|
| 422 | 422 | } else { |
| 423 | 423 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
| 424 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry['id'] ) ); |
|
| 424 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $this->entry[ 'id' ] ) ); |
|
| 425 | 425 | } |
| 426 | 426 | |
| 427 | 427 | foreach ( $this->entry as $input_id => $field_value ) { |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | |
| 435 | 435 | $empty_value = $field->get_value_save_entry( |
| 436 | 436 | is_array( $field->get_entry_inputs() ) ? array() : '', |
| 437 | - $this->form, '', $this->entry['id'], $this->entry |
|
| 437 | + $this->form, '', $this->entry[ 'id' ], $this->entry |
|
| 438 | 438 | ); |
| 439 | 439 | |
| 440 | 440 | $lead_detail_id = GFFormsModel::get_lead_detail_id( $current_fields, $input_id ); |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | /** No file is being uploaded. */ |
| 507 | - if ( empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 507 | + if ( empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 508 | 508 | /** So return the original upload */ |
| 509 | 509 | return $entry[ $input_id ]; |
| 510 | 510 | } |
@@ -522,11 +522,11 @@ discard block |
||
| 522 | 522 | * @return mixed |
| 523 | 523 | */ |
| 524 | 524 | public function modify_fileupload_settings( $plupload_init, $form_id, $instance ) { |
| 525 | - if( ! $this->is_edit_entry() ) { |
|
| 525 | + if ( ! $this->is_edit_entry() ) { |
|
| 526 | 526 | return $plupload_init; |
| 527 | 527 | } |
| 528 | 528 | |
| 529 | - $plupload_init['gf_vars']['max_files'] = 0; |
|
| 529 | + $plupload_init[ 'gf_vars' ][ 'max_files' ] = 0; |
|
| 530 | 530 | |
| 531 | 531 | return $plupload_init; |
| 532 | 532 | } |
@@ -541,27 +541,27 @@ discard block |
||
| 541 | 541 | $form = $this->filter_conditional_logic( $this->form ); |
| 542 | 542 | |
| 543 | 543 | /** @var GF_Field $field */ |
| 544 | - foreach( $form['fields'] as $k => &$field ) { |
|
| 544 | + foreach ( $form[ 'fields' ] as $k => &$field ) { |
|
| 545 | 545 | |
| 546 | 546 | /** |
| 547 | 547 | * Remove the fields with calculation formulas before save to avoid conflicts with GF logic |
| 548 | 548 | * @since 1.16.3 |
| 549 | 549 | * @var GF_Field $field |
| 550 | 550 | */ |
| 551 | - if( $field->has_calculation() ) { |
|
| 552 | - unset( $form['fields'][ $k ] ); |
|
| 551 | + if ( $field->has_calculation() ) { |
|
| 552 | + unset( $form[ 'fields' ][ $k ] ); |
|
| 553 | 553 | } |
| 554 | 554 | |
| 555 | 555 | $field->adminOnly = false; |
| 556 | 556 | |
| 557 | - if( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 558 | - foreach( $field->inputs as $key => $input ) { |
|
| 559 | - $field->inputs[ $key ][ 'id' ] = (string)$input['id']; |
|
| 557 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) ) { |
|
| 558 | + foreach ( $field->inputs as $key => $input ) { |
|
| 559 | + $field->inputs[ $key ][ 'id' ] = (string)$input[ 'id' ]; |
|
| 560 | 560 | } |
| 561 | 561 | } |
| 562 | 562 | } |
| 563 | 563 | |
| 564 | - $form['fields'] = array_values( $form['fields'] ); |
|
| 564 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
| 565 | 565 | |
| 566 | 566 | return $form; |
| 567 | 567 | } |
@@ -573,14 +573,14 @@ discard block |
||
| 573 | 573 | $update = false; |
| 574 | 574 | |
| 575 | 575 | // get the most up to date entry values |
| 576 | - $entry = GFAPI::get_entry( $this->entry['id'] ); |
|
| 576 | + $entry = GFAPI::get_entry( $this->entry[ 'id' ] ); |
|
| 577 | 577 | |
| 578 | 578 | if ( version_compare( GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_meta_table_name' ) ) { |
| 579 | 579 | $entry_meta_table = GFFormsModel::get_entry_meta_table_name(); |
| 580 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry['id'] ) ); |
|
| 580 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $entry_meta_table WHERE entry_id=%d", $entry[ 'id' ] ) ); |
|
| 581 | 581 | } else { |
| 582 | 582 | $lead_detail_table = GFFormsModel::get_lead_details_table_name(); |
| 583 | - $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry['id'] ) ); |
|
| 583 | + $current_fields = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $lead_detail_table WHERE lead_id=%d", $entry[ 'id' ] ) ); |
|
| 584 | 584 | } |
| 585 | 585 | |
| 586 | 586 | |
@@ -592,24 +592,24 @@ discard block |
||
| 592 | 592 | $inputs = $field->get_entry_inputs(); |
| 593 | 593 | if ( is_array( $inputs ) ) { |
| 594 | 594 | foreach ( $inputs as $input ) { |
| 595 | - list( $field_id, $input_id ) = rgexplode( '.', $input['id'], 2 ); |
|
| 595 | + list( $field_id, $input_id ) = rgexplode( '.', $input[ 'id' ], 2 ); |
|
| 596 | 596 | |
| 597 | 597 | if ( 'product' === $field->type ) { |
| 598 | - $input_name = 'input_' . str_replace( '.', '_', $input['id'] ); |
|
| 598 | + $input_name = 'input_' . str_replace( '.', '_', $input[ 'id' ] ); |
|
| 599 | 599 | |
| 600 | 600 | // Only allow quantity to be set if it's allowed to be edited |
| 601 | 601 | if ( in_array( $field_id, $allowed_fields ) && $input_id == 3 ) { |
| 602 | 602 | } else { // otherwise set to what it previously was |
| 603 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
| 603 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
| 604 | 604 | } |
| 605 | 605 | } else { |
| 606 | 606 | // Set to what it previously was if it's not editable |
| 607 | 607 | if ( ! in_array( $field_id, $allowed_fields ) ) { |
| 608 | - $_POST[ $input_name ] = $entry[ $input['id'] ]; |
|
| 608 | + $_POST[ $input_name ] = $entry[ $input[ 'id' ] ]; |
|
| 609 | 609 | } |
| 610 | 610 | } |
| 611 | 611 | |
| 612 | - GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input['id'] ); |
|
| 612 | + GFFormsModel::save_input( $form, $field, $entry, $current_fields, $input[ 'id' ] ); |
|
| 613 | 613 | } |
| 614 | 614 | } else { |
| 615 | 615 | // Set to what it previously was if it's not editable |
@@ -649,19 +649,19 @@ discard block |
||
| 649 | 649 | |
| 650 | 650 | $input_name = 'input_' . $field_id; |
| 651 | 651 | |
| 652 | - if ( !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 652 | + if ( ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 653 | 653 | |
| 654 | 654 | // We have a new image |
| 655 | 655 | |
| 656 | - $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'] ); |
|
| 656 | + $value = RGFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ] ); |
|
| 657 | 657 | |
| 658 | 658 | $ary = ! empty( $value ) ? explode( '|:|', $value ) : array(); |
| 659 | 659 | $ary = stripslashes_deep( $ary ); |
| 660 | 660 | $img_url = \GV\Utils::get( $ary, 0 ); |
| 661 | 661 | |
| 662 | - $img_title = count( $ary ) > 1 ? $ary[1] : ''; |
|
| 663 | - $img_caption = count( $ary ) > 2 ? $ary[2] : ''; |
|
| 664 | - $img_description = count( $ary ) > 3 ? $ary[3] : ''; |
|
| 662 | + $img_title = count( $ary ) > 1 ? $ary[ 1 ] : ''; |
|
| 663 | + $img_caption = count( $ary ) > 2 ? $ary[ 2 ] : ''; |
|
| 664 | + $img_description = count( $ary ) > 3 ? $ary[ 3 ] : ''; |
|
| 665 | 665 | |
| 666 | 666 | $image_meta = array( |
| 667 | 667 | 'post_excerpt' => $img_caption, |
@@ -670,7 +670,7 @@ discard block |
||
| 670 | 670 | |
| 671 | 671 | //adding title only if it is not empty. It will default to the file name if it is not in the array |
| 672 | 672 | if ( ! empty( $img_title ) ) { |
| 673 | - $image_meta['post_title'] = $img_title; |
|
| 673 | + $image_meta[ 'post_title' ] = $img_title; |
|
| 674 | 674 | } |
| 675 | 675 | |
| 676 | 676 | /** |
@@ -728,15 +728,15 @@ discard block |
||
| 728 | 728 | */ |
| 729 | 729 | private function maybe_update_post_fields( $form ) { |
| 730 | 730 | |
| 731 | - if( empty( $this->entry['post_id'] ) ) { |
|
| 731 | + if ( empty( $this->entry[ 'post_id' ] ) ) { |
|
| 732 | 732 | gravityview()->log->debug( 'This entry has no post fields. Continuing...' ); |
| 733 | 733 | return; |
| 734 | 734 | } |
| 735 | 735 | |
| 736 | - $post_id = $this->entry['post_id']; |
|
| 736 | + $post_id = $this->entry[ 'post_id' ]; |
|
| 737 | 737 | |
| 738 | 738 | // Security check |
| 739 | - if( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 739 | + if ( false === GVCommon::has_cap( 'edit_post', $post_id ) ) { |
|
| 740 | 740 | gravityview()->log->error( 'The current user does not have the ability to edit Post #{post_id}', array( 'post_id' => $post_id ) ); |
| 741 | 741 | return; |
| 742 | 742 | } |
@@ -749,25 +749,25 @@ discard block |
||
| 749 | 749 | |
| 750 | 750 | $field = RGFormsModel::get_field( $form, $field_id ); |
| 751 | 751 | |
| 752 | - if( ! $field ) { |
|
| 752 | + if ( ! $field ) { |
|
| 753 | 753 | continue; |
| 754 | 754 | } |
| 755 | 755 | |
| 756 | - if( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 756 | + if ( GFCommon::is_post_field( $field ) && 'post_category' !== $field->type ) { |
|
| 757 | 757 | |
| 758 | 758 | // Get the value of the field, including $_POSTed value |
| 759 | 759 | $value = RGFormsModel::get_field_value( $field ); |
| 760 | 760 | |
| 761 | 761 | // Use temporary entry variable, to make values available to fill_post_template() and update_post_image() |
| 762 | 762 | $entry_tmp = $this->entry; |
| 763 | - $entry_tmp["{$field_id}"] = $value; |
|
| 763 | + $entry_tmp[ "{$field_id}" ] = $value; |
|
| 764 | 764 | |
| 765 | - switch( $field->type ) { |
|
| 765 | + switch ( $field->type ) { |
|
| 766 | 766 | |
| 767 | 767 | case 'post_title': |
| 768 | 768 | $post_title = $value; |
| 769 | 769 | if ( \GV\Utils::get( $form, 'postTitleTemplateEnabled' ) ) { |
| 770 | - $post_title = $this->fill_post_template( $form['postTitleTemplate'], $form, $entry_tmp ); |
|
| 770 | + $post_title = $this->fill_post_template( $form[ 'postTitleTemplate' ], $form, $entry_tmp ); |
|
| 771 | 771 | } |
| 772 | 772 | $updated_post->post_title = $post_title; |
| 773 | 773 | $updated_post->post_name = $post_title; |
@@ -777,7 +777,7 @@ discard block |
||
| 777 | 777 | case 'post_content': |
| 778 | 778 | $post_content = $value; |
| 779 | 779 | if ( \GV\Utils::get( $form, 'postContentTemplateEnabled' ) ) { |
| 780 | - $post_content = $this->fill_post_template( $form['postContentTemplate'], $form, $entry_tmp, true ); |
|
| 780 | + $post_content = $this->fill_post_template( $form[ 'postContentTemplate' ], $form, $entry_tmp, true ); |
|
| 781 | 781 | } |
| 782 | 782 | $updated_post->post_content = $post_content; |
| 783 | 783 | unset( $post_content ); |
@@ -795,11 +795,11 @@ discard block |
||
| 795 | 795 | $value = $value[ $field_id ]; |
| 796 | 796 | } |
| 797 | 797 | |
| 798 | - if( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 798 | + if ( ! empty( $field->customFieldTemplateEnabled ) ) { |
|
| 799 | 799 | $value = $this->fill_post_template( $field->customFieldTemplate, $form, $entry_tmp, true ); |
| 800 | 800 | } |
| 801 | 801 | |
| 802 | - $value = $field->get_value_save_entry( $value, $form, '', $this->entry['id'], $this->entry ); |
|
| 802 | + $value = $field->get_value_save_entry( $value, $form, '', $this->entry[ 'id' ], $this->entry ); |
|
| 803 | 803 | |
| 804 | 804 | update_post_meta( $post_id, $field->postCustomFieldName, $value ); |
| 805 | 805 | break; |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | } |
| 812 | 812 | |
| 813 | 813 | // update entry after |
| 814 | - $this->entry["{$field_id}"] = $value; |
|
| 814 | + $this->entry[ "{$field_id}" ] = $value; |
|
| 815 | 815 | |
| 816 | 816 | $update_entry = true; |
| 817 | 817 | |
@@ -820,11 +820,11 @@ discard block |
||
| 820 | 820 | |
| 821 | 821 | } |
| 822 | 822 | |
| 823 | - if( $update_entry ) { |
|
| 823 | + if ( $update_entry ) { |
|
| 824 | 824 | |
| 825 | 825 | $return_entry = GFAPI::update_entry( $this->entry ); |
| 826 | 826 | |
| 827 | - if( is_wp_error( $return_entry ) ) { |
|
| 827 | + if ( is_wp_error( $return_entry ) ) { |
|
| 828 | 828 | gravityview()->log->error( 'Updating the entry post fields failed', array( 'data' => array( '$this->entry' => $this->entry, '$return_entry' => $return_entry ) ) ); |
| 829 | 829 | } else { |
| 830 | 830 | gravityview()->log->debug( 'Updating the entry post fields for post #{post_id} succeeded', array( 'post_id' => $post_id ) ); |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | |
| 835 | 835 | $return_post = wp_update_post( $updated_post, true ); |
| 836 | 836 | |
| 837 | - if( is_wp_error( $return_post ) ) { |
|
| 837 | + if ( is_wp_error( $return_post ) ) { |
|
| 838 | 838 | $return_post->add_data( $updated_post, '$updated_post' ); |
| 839 | 839 | gravityview()->log->error( 'Updating the post content failed', array( 'data' => compact( 'updated_post', 'return_post' ) ) ); |
| 840 | 840 | } else { |
@@ -868,7 +868,7 @@ discard block |
||
| 868 | 868 | $output = GFCommon::replace_variables( $output, $form, $entry, false, false, false ); |
| 869 | 869 | |
| 870 | 870 | // replace conditional shortcodes |
| 871 | - if( $do_shortcode ) { |
|
| 871 | + if ( $do_shortcode ) { |
|
| 872 | 872 | $output = do_shortcode( $output ); |
| 873 | 873 | } |
| 874 | 874 | |
@@ -887,19 +887,19 @@ discard block |
||
| 887 | 887 | */ |
| 888 | 888 | private function after_update() { |
| 889 | 889 | |
| 890 | - do_action( 'gform_after_update_entry', $this->form, $this->entry['id'], self::$original_entry ); |
|
| 891 | - do_action( "gform_after_update_entry_{$this->form['id']}", $this->form, $this->entry['id'], self::$original_entry ); |
|
| 890 | + do_action( 'gform_after_update_entry', $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 891 | + do_action( "gform_after_update_entry_{$this->form[ 'id' ]}", $this->form, $this->entry[ 'id' ], self::$original_entry ); |
|
| 892 | 892 | |
| 893 | 893 | // Re-define the entry now that we've updated it. |
| 894 | - $entry = RGFormsModel::get_lead( $this->entry['id'] ); |
|
| 894 | + $entry = RGFormsModel::get_lead( $this->entry[ 'id' ] ); |
|
| 895 | 895 | |
| 896 | 896 | $entry = GFFormsModel::set_entry_meta( $entry, self::$original_form ); |
| 897 | 897 | |
| 898 | 898 | if ( version_compare( GFFormsModel::get_database_version(), '2.3-dev-1', '<' ) ) { |
| 899 | 899 | // We need to clear the cache because Gravity Forms caches the field values, which |
| 900 | 900 | // we have just updated. |
| 901 | - foreach ($this->form['fields'] as $key => $field) { |
|
| 902 | - GFFormsModel::refresh_lead_field_value( $entry['id'], $field->id ); |
|
| 901 | + foreach ( $this->form[ 'fields' ] as $key => $field ) { |
|
| 902 | + GFFormsModel::refresh_lead_field_value( $entry[ 'id' ], $field->id ); |
|
| 903 | 903 | } |
| 904 | 904 | } |
| 905 | 905 | |
@@ -909,11 +909,11 @@ discard block |
||
| 909 | 909 | * @since develop |
| 910 | 910 | */ |
| 911 | 911 | if ( $allowed_feeds = $this->view->settings->get( 'edit_feeds', array() ) ) { |
| 912 | - $feeds = GFAPI::get_feeds( null, $entry['form_id'] ); |
|
| 912 | + $feeds = GFAPI::get_feeds( null, $entry[ 'form_id' ] ); |
|
| 913 | 913 | if ( ! is_wp_error( $feeds ) ) { |
| 914 | 914 | $registered_feeds = array(); |
| 915 | 915 | foreach ( GFAddOn::get_registered_addons() as $registered_feed ) { |
| 916 | - if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
| 916 | + if ( is_subclass_of( $registered_feed, 'GFFeedAddOn' ) ) { |
|
| 917 | 917 | if ( method_exists( $registered_feed, 'get_instance' ) ) { |
| 918 | 918 | $registered_feed = call_user_func( array( $registered_feed, 'get_instance' ) ); |
| 919 | 919 | $registered_feeds[ $registered_feed->get_slug() ] = $registered_feed; |
@@ -921,8 +921,8 @@ discard block |
||
| 921 | 921 | } |
| 922 | 922 | } |
| 923 | 923 | foreach ( $feeds as $feed ) { |
| 924 | - if ( in_array( $feed['id'], $allowed_feeds ) ) { |
|
| 925 | - if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed['addon_slug'] ) ) { |
|
| 924 | + if ( in_array( $feed[ 'id' ], $allowed_feeds ) ) { |
|
| 925 | + if ( $feed_object = \GV\Utils::get( $registered_feeds, $feed[ 'addon_slug' ] ) ) { |
|
| 926 | 926 | $returned_entry = $feed_object->process_feed( $feed, $entry, self::$original_form ); |
| 927 | 927 | if ( is_array( $returned_entry ) && rgar( $returned_entry, 'id' ) ) { |
| 928 | 928 | $entry = $returned_entry; |
@@ -952,7 +952,7 @@ discard block |
||
| 952 | 952 | |
| 953 | 953 | <div class="gv-edit-entry-wrapper"><?php |
| 954 | 954 | |
| 955 | - $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/inline-javascript.php', $this ); |
|
| 955 | + $javascript = gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/inline-javascript.php', $this ); |
|
| 956 | 956 | |
| 957 | 957 | /** |
| 958 | 958 | * Fixes weird wpautop() issue |
@@ -968,7 +968,7 @@ discard block |
||
| 968 | 968 | * @param string $edit_entry_title Modify the "Edit Entry" title |
| 969 | 969 | * @param GravityView_Edit_Entry_Render $this This object |
| 970 | 970 | */ |
| 971 | - $edit_entry_title = apply_filters('gravityview_edit_entry_title', __('Edit Entry', 'gravityview'), $this ); |
|
| 971 | + $edit_entry_title = apply_filters( 'gravityview_edit_entry_title', __( 'Edit Entry', 'gravityview' ), $this ); |
|
| 972 | 972 | |
| 973 | 973 | echo esc_attr( $edit_entry_title ); |
| 974 | 974 | ?></span> |
@@ -1018,13 +1018,13 @@ discard block |
||
| 1018 | 1018 | |
| 1019 | 1019 | $back_link = remove_query_arg( array( 'page', 'view', 'edit' ) ); |
| 1020 | 1020 | |
| 1021 | - if( ! $this->is_valid ){ |
|
| 1021 | + if ( ! $this->is_valid ) { |
|
| 1022 | 1022 | |
| 1023 | 1023 | // Keeping this compatible with Gravity Forms. |
| 1024 | - $validation_message = "<div class='validation_error'>" . __('There was a problem with your submission.', 'gravityview') . " " . __('Errors have been highlighted below.', 'gravityview') . "</div>"; |
|
| 1025 | - $message = apply_filters("gform_validation_message_{$this->form['id']}", apply_filters("gform_validation_message", $validation_message, $this->form), $this->form); |
|
| 1024 | + $validation_message = "<div class='validation_error'>" . __( 'There was a problem with your submission.', 'gravityview' ) . " " . __( 'Errors have been highlighted below.', 'gravityview' ) . "</div>"; |
|
| 1025 | + $message = apply_filters( "gform_validation_message_{$this->form[ 'id' ]}", apply_filters( "gform_validation_message", $validation_message, $this->form ), $this->form ); |
|
| 1026 | 1026 | |
| 1027 | - echo GVCommon::generate_notice( $message , 'gv-error' ); |
|
| 1027 | + echo GVCommon::generate_notice( $message, 'gv-error' ); |
|
| 1028 | 1028 | |
| 1029 | 1029 | } else { |
| 1030 | 1030 | $view = \GV\View::by_id( $this->view_id ); |
@@ -1035,23 +1035,23 @@ discard block |
||
| 1035 | 1035 | |
| 1036 | 1036 | case '0': |
| 1037 | 1037 | $redirect_url = $back_link; |
| 1038 | - $entry_updated_message = sprintf( esc_attr_x('Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview'), '<a href="'. esc_url( $redirect_url ) .'">', '</a>' ); |
|
| 1038 | + $entry_updated_message = sprintf( esc_attr_x( 'Entry Updated. %sReturning to Entry%s', 'Replacements are HTML', 'gravityview' ), '<a href="' . esc_url( $redirect_url ) . '">', '</a>' ); |
|
| 1039 | 1039 | break; |
| 1040 | 1040 | |
| 1041 | 1041 | case '1': |
| 1042 | 1042 | $redirect_url = $directory_link = GravityView_API::directory_link(); |
| 1043 | - $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>' ); |
|
| 1043 | + $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>' ); |
|
| 1044 | 1044 | break; |
| 1045 | 1045 | |
| 1046 | 1046 | case '2': |
| 1047 | 1047 | $redirect_url = $edit_redirect_url; |
| 1048 | 1048 | $redirect_url = GFCommon::replace_variables( $redirect_url, $this->form, $this->entry, false, false, false, 'text' ); |
| 1049 | - $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>' ); |
|
| 1049 | + $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>' ); |
|
| 1050 | 1050 | break; |
| 1051 | 1051 | |
| 1052 | 1052 | case '': |
| 1053 | 1053 | default: |
| 1054 | - $entry_updated_message = sprintf( esc_attr__('Entry Updated. %sReturn to Entry%s', 'gravityview'), '<a href="'. esc_url( $back_link ) .'">', '</a>' ); |
|
| 1054 | + $entry_updated_message = sprintf( esc_attr__( 'Entry Updated. %sReturn to Entry%s', 'gravityview' ), '<a href="' . esc_url( $back_link ) . '">', '</a>' ); |
|
| 1055 | 1055 | break; |
| 1056 | 1056 | } |
| 1057 | 1057 | |
@@ -1067,7 +1067,7 @@ discard block |
||
| 1067 | 1067 | * @param array $entry Gravity Forms entry array |
| 1068 | 1068 | * @param string $back_link URL to return to the original entry. @since 1.6 |
| 1069 | 1069 | */ |
| 1070 | - $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message , $this->view_id, $this->entry, $back_link ); |
|
| 1070 | + $message = apply_filters( 'gravityview/edit_entry/success', $entry_updated_message, $this->view_id, $this->entry, $back_link ); |
|
| 1071 | 1071 | |
| 1072 | 1072 | echo GVCommon::generate_notice( $message ); |
| 1073 | 1073 | } |
@@ -1091,21 +1091,21 @@ discard block |
||
| 1091 | 1091 | */ |
| 1092 | 1092 | do_action( 'gravityview/edit-entry/render/before', $this ); |
| 1093 | 1093 | |
| 1094 | - add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields'), 5000, 3 ); |
|
| 1095 | - add_filter( 'gform_submit_button', array( $this, 'render_form_buttons') ); |
|
| 1094 | + add_filter( 'gform_pre_render', array( $this, 'filter_modify_form_fields' ), 5000, 3 ); |
|
| 1095 | + add_filter( 'gform_submit_button', array( $this, 'render_form_buttons' ) ); |
|
| 1096 | 1096 | add_filter( 'gform_disable_view_counter', '__return_true' ); |
| 1097 | 1097 | |
| 1098 | 1098 | add_filter( 'gform_field_input', array( $this, 'verify_user_can_edit_post' ), 5, 5 ); |
| 1099 | 1099 | add_filter( 'gform_field_input', array( $this, 'modify_edit_field_input' ), 10, 5 ); |
| 1100 | 1100 | |
| 1101 | 1101 | // We need to remove the fake $_GET['page'] arg to avoid rendering form as if in admin. |
| 1102 | - unset( $_GET['page'] ); |
|
| 1102 | + unset( $_GET[ 'page' ] ); |
|
| 1103 | 1103 | |
| 1104 | 1104 | // TODO: Verify multiple-page forms |
| 1105 | 1105 | |
| 1106 | 1106 | ob_start(); // Prevent PHP warnings possibly caused by prefilling list fields for conditional logic |
| 1107 | 1107 | |
| 1108 | - $html = GFFormDisplay::get_form( $this->form['id'], false, false, true, $this->entry ); |
|
| 1108 | + $html = GFFormDisplay::get_form( $this->form[ 'id' ], false, false, true, $this->entry ); |
|
| 1109 | 1109 | |
| 1110 | 1110 | ob_get_clean(); |
| 1111 | 1111 | |
@@ -1131,7 +1131,7 @@ discard block |
||
| 1131 | 1131 | * @return string |
| 1132 | 1132 | */ |
| 1133 | 1133 | public function render_form_buttons() { |
| 1134 | - return gravityview_ob_include( GravityView_Edit_Entry::$file .'/partials/form-buttons.php', $this ); |
|
| 1134 | + return gravityview_ob_include( GravityView_Edit_Entry::$file . '/partials/form-buttons.php', $this ); |
|
| 1135 | 1135 | } |
| 1136 | 1136 | |
| 1137 | 1137 | |
@@ -1151,10 +1151,10 @@ discard block |
||
| 1151 | 1151 | public function filter_modify_form_fields( $form, $ajax = false, $field_values = '' ) { |
| 1152 | 1152 | |
| 1153 | 1153 | // In case we have validated the form, use it to inject the validation results into the form render |
| 1154 | - if( isset( $this->form_after_validation ) ) { |
|
| 1154 | + if ( isset( $this->form_after_validation ) ) { |
|
| 1155 | 1155 | $form = $this->form_after_validation; |
| 1156 | 1156 | } else { |
| 1157 | - $form['fields'] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1157 | + $form[ 'fields' ] = $this->get_configured_edit_fields( $form, $this->view_id ); |
|
| 1158 | 1158 | } |
| 1159 | 1159 | |
| 1160 | 1160 | $form = $this->filter_conditional_logic( $form ); |
@@ -1162,8 +1162,8 @@ discard block |
||
| 1162 | 1162 | $form = $this->prefill_conditional_logic( $form ); |
| 1163 | 1163 | |
| 1164 | 1164 | // for now we don't support Save and Continue feature. |
| 1165 | - if( ! self::$supports_save_and_continue ) { |
|
| 1166 | - unset( $form['save'] ); |
|
| 1165 | + if ( ! self::$supports_save_and_continue ) { |
|
| 1166 | + unset( $form[ 'save' ] ); |
|
| 1167 | 1167 | } |
| 1168 | 1168 | |
| 1169 | 1169 | $form = $this->unselect_default_values( $form ); |
@@ -1186,31 +1186,31 @@ discard block |
||
| 1186 | 1186 | */ |
| 1187 | 1187 | public function verify_user_can_edit_post( $field_content = '', $field, $value, $lead_id = 0, $form_id ) { |
| 1188 | 1188 | |
| 1189 | - if( ! GFCommon::is_post_field( $field ) ) { |
|
| 1189 | + if ( ! GFCommon::is_post_field( $field ) ) { |
|
| 1190 | 1190 | return $field_content; |
| 1191 | 1191 | } |
| 1192 | 1192 | |
| 1193 | 1193 | $message = null; |
| 1194 | 1194 | |
| 1195 | 1195 | // First, make sure they have the capability to edit the post. |
| 1196 | - if( false === current_user_can( 'edit_post', $this->entry['post_id'] ) ) { |
|
| 1196 | + if ( false === current_user_can( 'edit_post', $this->entry[ 'post_id' ] ) ) { |
|
| 1197 | 1197 | |
| 1198 | 1198 | /** |
| 1199 | 1199 | * @filter `gravityview/edit_entry/unsupported_post_field_text` Modify the message when someone isn't able to edit a post |
| 1200 | 1200 | * @param string $message The existing "You don't have permission..." text |
| 1201 | 1201 | */ |
| 1202 | - $message = apply_filters('gravityview/edit_entry/unsupported_post_field_text', __('You don’t have permission to edit this post.', 'gravityview') ); |
|
| 1202 | + $message = apply_filters( 'gravityview/edit_entry/unsupported_post_field_text', __( 'You don’t have permission to edit this post.', 'gravityview' ) ); |
|
| 1203 | 1203 | |
| 1204 | - } elseif( null === get_post( $this->entry['post_id'] ) ) { |
|
| 1204 | + } elseif ( null === get_post( $this->entry[ 'post_id' ] ) ) { |
|
| 1205 | 1205 | /** |
| 1206 | 1206 | * @filter `gravityview/edit_entry/no_post_text` Modify the message when someone is editing an entry attached to a post that no longer exists |
| 1207 | 1207 | * @param string $message The existing "This field is not editable; the post no longer exists." text |
| 1208 | 1208 | */ |
| 1209 | - $message = apply_filters('gravityview/edit_entry/no_post_text', __('This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1209 | + $message = apply_filters( 'gravityview/edit_entry/no_post_text', __( 'This field is not editable; the post no longer exists.', 'gravityview' ) ); |
|
| 1210 | 1210 | } |
| 1211 | 1211 | |
| 1212 | - if( $message ) { |
|
| 1213 | - $field_content = sprintf('<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1212 | + if ( $message ) { |
|
| 1213 | + $field_content = sprintf( '<div class="ginput_container ginput_container_' . $field->type . '">%s</div>', wpautop( $message ) ); |
|
| 1214 | 1214 | } |
| 1215 | 1215 | |
| 1216 | 1216 | return $field_content; |
@@ -1234,8 +1234,8 @@ discard block |
||
| 1234 | 1234 | |
| 1235 | 1235 | // If the form has been submitted, then we don't need to pre-fill the values, |
| 1236 | 1236 | // Except for fileupload type and when a field input is overridden- run always!! |
| 1237 | - if( |
|
| 1238 | - ( $this->is_edit_entry_submission() && !in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1237 | + if ( |
|
| 1238 | + ( $this->is_edit_entry_submission() && ! in_array( $field->type, array( 'fileupload', 'post_image' ) ) ) |
|
| 1239 | 1239 | && false === ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) |
| 1240 | 1240 | && ! GFCommon::is_product_field( $field->type ) |
| 1241 | 1241 | || ! empty( $field_content ) |
@@ -1255,7 +1255,7 @@ discard block |
||
| 1255 | 1255 | $return = null; |
| 1256 | 1256 | |
| 1257 | 1257 | /** @var GravityView_Field $gv_field */ |
| 1258 | - if( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1258 | + if ( $gv_field && is_callable( array( $gv_field, 'get_field_input' ) ) ) { |
|
| 1259 | 1259 | $return = $gv_field->get_field_input( $this->form, $field_value, $this->entry, $field ); |
| 1260 | 1260 | } else { |
| 1261 | 1261 | $return = $field->get_field_input( $this->form, $field_value, $this->entry ); |
@@ -1264,7 +1264,7 @@ discard block |
||
| 1264 | 1264 | // If there was output, it's an error |
| 1265 | 1265 | $warnings = ob_get_clean(); |
| 1266 | 1266 | |
| 1267 | - if( !empty( $warnings ) ) { |
|
| 1267 | + if ( ! empty( $warnings ) ) { |
|
| 1268 | 1268 | gravityview()->log->error( '{warning}', array( 'warning' => $warnings, 'data' => $field_value ) ); |
| 1269 | 1269 | } |
| 1270 | 1270 | |
@@ -1289,7 +1289,7 @@ discard block |
||
| 1289 | 1289 | $override_saved_value = apply_filters( 'gravityview/edit_entry/pre_populate/override', false, $field ); |
| 1290 | 1290 | |
| 1291 | 1291 | // We're dealing with multiple inputs (e.g. checkbox) but not time or date (as it doesn't store data in input IDs) |
| 1292 | - if( isset( $field->inputs ) && is_array( $field->inputs ) && !in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1292 | + if ( isset( $field->inputs ) && is_array( $field->inputs ) && ! in_array( $field->type, array( 'time', 'date' ) ) ) { |
|
| 1293 | 1293 | |
| 1294 | 1294 | $field_value = array(); |
| 1295 | 1295 | |
@@ -1298,10 +1298,10 @@ discard block |
||
| 1298 | 1298 | |
| 1299 | 1299 | foreach ( (array)$field->inputs as $input ) { |
| 1300 | 1300 | |
| 1301 | - $input_id = strval( $input['id'] ); |
|
| 1301 | + $input_id = strval( $input[ 'id' ] ); |
|
| 1302 | 1302 | |
| 1303 | 1303 | if ( isset( $this->entry[ $input_id ] ) && ! gv_empty( $this->entry[ $input_id ], false, false ) ) { |
| 1304 | - $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1304 | + $field_value[ $input_id ] = 'post_category' === $field->type ? GFCommon::format_post_category( $this->entry[ $input_id ], true ) : $this->entry[ $input_id ]; |
|
| 1305 | 1305 | $allow_pre_populated = false; |
| 1306 | 1306 | } |
| 1307 | 1307 | |
@@ -1309,7 +1309,7 @@ discard block |
||
| 1309 | 1309 | |
| 1310 | 1310 | $pre_value = $field->get_value_submission( array(), false ); |
| 1311 | 1311 | |
| 1312 | - $field_value = ! $allow_pre_populated && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1312 | + $field_value = ! $allow_pre_populated && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $field_value : $pre_value; |
|
| 1313 | 1313 | |
| 1314 | 1314 | } else { |
| 1315 | 1315 | |
@@ -1320,13 +1320,13 @@ discard block |
||
| 1320 | 1320 | |
| 1321 | 1321 | // saved field entry value (if empty, fallback to the pre-populated value, if exists) |
| 1322 | 1322 | // or pre-populated value if not empty and set to override saved value |
| 1323 | - $field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && !gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
| 1323 | + $field_value = isset( $this->entry[ $id ] ) && ! gv_empty( $this->entry[ $id ], false, false ) && ! ( $override_saved_value && ! gv_empty( $pre_value, false, false ) ) ? $this->entry[ $id ] : $pre_value; |
|
| 1324 | 1324 | |
| 1325 | 1325 | // in case field is post_category but inputType is select, multi-select or radio, convert value into array of category IDs. |
| 1326 | - if ( 'post_category' === $field->type && !gv_empty( $field_value, false, false ) ) { |
|
| 1326 | + if ( 'post_category' === $field->type && ! gv_empty( $field_value, false, false ) ) { |
|
| 1327 | 1327 | $categories = array(); |
| 1328 | 1328 | foreach ( explode( ',', $field_value ) as $cat_string ) { |
| 1329 | - $categories[] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1329 | + $categories[ ] = GFCommon::format_post_category( $cat_string, true ); |
|
| 1330 | 1330 | } |
| 1331 | 1331 | $field_value = 'multiselect' === $field->get_input_type() ? $categories : implode( '', $categories ); |
| 1332 | 1332 | } |
@@ -1354,7 +1354,7 @@ discard block |
||
| 1354 | 1354 | * @param GF_Field $field Gravity Forms field object |
| 1355 | 1355 | * @param GravityView_Edit_Entry_Render $this Current object |
| 1356 | 1356 | */ |
| 1357 | - $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type , $field_value, $field, $this ); |
|
| 1357 | + $field_value = apply_filters( 'gravityview/edit_entry/field_value_' . $field->type, $field_value, $field, $this ); |
|
| 1358 | 1358 | |
| 1359 | 1359 | return $field_value; |
| 1360 | 1360 | } |
@@ -1371,12 +1371,12 @@ discard block |
||
| 1371 | 1371 | */ |
| 1372 | 1372 | public function gform_pre_validation( $form ) { |
| 1373 | 1373 | |
| 1374 | - if( ! $this->verify_nonce() ) { |
|
| 1374 | + if ( ! $this->verify_nonce() ) { |
|
| 1375 | 1375 | return $form; |
| 1376 | 1376 | } |
| 1377 | 1377 | |
| 1378 | 1378 | // Fix PHP warning regarding undefined index. |
| 1379 | - foreach ( $form['fields'] as &$field) { |
|
| 1379 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1380 | 1380 | |
| 1381 | 1381 | // This is because we're doing admin form pretending to be front-end, so Gravity Forms |
| 1382 | 1382 | // expects certain field array items to be set. |
@@ -1384,7 +1384,7 @@ discard block |
||
| 1384 | 1384 | $field->{$key} = isset( $field->{$key} ) ? $field->{$key} : NULL; |
| 1385 | 1385 | } |
| 1386 | 1386 | |
| 1387 | - switch( RGFormsModel::get_input_type( $field ) ) { |
|
| 1387 | + switch ( RGFormsModel::get_input_type( $field ) ) { |
|
| 1388 | 1388 | |
| 1389 | 1389 | /** |
| 1390 | 1390 | * this whole fileupload hack is because in the admin, Gravity Forms simply doesn't update any fileupload field if it's empty, but it DOES in the frontend. |
@@ -1398,26 +1398,26 @@ discard block |
||
| 1398 | 1398 | // Set the previous value |
| 1399 | 1399 | $entry = $this->get_entry(); |
| 1400 | 1400 | |
| 1401 | - $input_name = 'input_'.$field->id; |
|
| 1402 | - $form_id = $form['id']; |
|
| 1401 | + $input_name = 'input_' . $field->id; |
|
| 1402 | + $form_id = $form[ 'id' ]; |
|
| 1403 | 1403 | |
| 1404 | 1404 | $value = NULL; |
| 1405 | 1405 | |
| 1406 | 1406 | // Use the previous entry value as the default. |
| 1407 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1407 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1408 | 1408 | $value = $entry[ $field->id ]; |
| 1409 | 1409 | } |
| 1410 | 1410 | |
| 1411 | 1411 | // If this is a single upload file |
| 1412 | - if( !empty( $_FILES[ $input_name ] ) && !empty( $_FILES[ $input_name ]['name'] ) ) { |
|
| 1413 | - $file_path = GFFormsModel::get_file_upload_path( $form['id'], $_FILES[ $input_name ]['name'] ); |
|
| 1414 | - $value = $file_path['url']; |
|
| 1412 | + if ( ! empty( $_FILES[ $input_name ] ) && ! empty( $_FILES[ $input_name ][ 'name' ] ) ) { |
|
| 1413 | + $file_path = GFFormsModel::get_file_upload_path( $form[ 'id' ], $_FILES[ $input_name ][ 'name' ] ); |
|
| 1414 | + $value = $file_path[ 'url' ]; |
|
| 1415 | 1415 | |
| 1416 | 1416 | } else { |
| 1417 | 1417 | |
| 1418 | 1418 | // Fix PHP warning on line 1498 of form_display.php for post_image fields |
| 1419 | 1419 | // Fix PHP Notice: Undefined index: size in form_display.php on line 1511 |
| 1420 | - $_FILES[ $input_name ] = array('name' => '', 'size' => '' ); |
|
| 1420 | + $_FILES[ $input_name ] = array( 'name' => '', 'size' => '' ); |
|
| 1421 | 1421 | |
| 1422 | 1422 | } |
| 1423 | 1423 | |
@@ -1425,10 +1425,10 @@ discard block |
||
| 1425 | 1425 | |
| 1426 | 1426 | // If there are fresh uploads, process and merge them. |
| 1427 | 1427 | // Otherwise, use the passed values, which should be json-encoded array of URLs |
| 1428 | - if( isset( GFFormsModel::$uploaded_files[$form_id][$input_name] ) ) { |
|
| 1428 | + if ( isset( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
| 1429 | 1429 | $value = empty( $value ) ? '[]' : $value; |
| 1430 | 1430 | $value = stripslashes_deep( $value ); |
| 1431 | - $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry['id'], array()); |
|
| 1431 | + $value = GFFormsModel::prepare_value( $form, $field, $value, $input_name, $entry[ 'id' ], array() ); |
|
| 1432 | 1432 | } |
| 1433 | 1433 | |
| 1434 | 1434 | } else { |
@@ -1446,8 +1446,8 @@ discard block |
||
| 1446 | 1446 | |
| 1447 | 1447 | case 'number': |
| 1448 | 1448 | // Fix "undefined index" issue at line 1286 in form_display.php |
| 1449 | - if( !isset( $_POST['input_'.$field->id ] ) ) { |
|
| 1450 | - $_POST['input_'.$field->id ] = NULL; |
|
| 1449 | + if ( ! isset( $_POST[ 'input_' . $field->id ] ) ) { |
|
| 1450 | + $_POST[ 'input_' . $field->id ] = NULL; |
|
| 1451 | 1451 | } |
| 1452 | 1452 | break; |
| 1453 | 1453 | } |
@@ -1484,7 +1484,7 @@ discard block |
||
| 1484 | 1484 | * You can enter whatever you want! |
| 1485 | 1485 | * We try validating, and customize the results using `self::custom_validation()` |
| 1486 | 1486 | */ |
| 1487 | - add_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10, 4); |
|
| 1487 | + add_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10, 4 ); |
|
| 1488 | 1488 | |
| 1489 | 1489 | // Needed by the validate funtion |
| 1490 | 1490 | $failed_validation_page = NULL; |
@@ -1492,14 +1492,14 @@ discard block |
||
| 1492 | 1492 | |
| 1493 | 1493 | // Prevent entry limit from running when editing an entry, also |
| 1494 | 1494 | // prevent form scheduling from preventing editing |
| 1495 | - unset( $this->form['limitEntries'], $this->form['scheduleForm'] ); |
|
| 1495 | + unset( $this->form[ 'limitEntries' ], $this->form[ 'scheduleForm' ] ); |
|
| 1496 | 1496 | |
| 1497 | 1497 | // Hide fields depending on Edit Entry settings |
| 1498 | - $this->form['fields'] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1498 | + $this->form[ 'fields' ] = $this->get_configured_edit_fields( $this->form, $this->view_id ); |
|
| 1499 | 1499 | |
| 1500 | 1500 | $this->is_valid = GFFormDisplay::validate( $this->form, $field_values, 1, $failed_validation_page ); |
| 1501 | 1501 | |
| 1502 | - remove_filter( 'gform_validation_'. $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1502 | + remove_filter( 'gform_validation_' . $this->form_id, array( $this, 'custom_validation' ), 10 ); |
|
| 1503 | 1503 | } |
| 1504 | 1504 | |
| 1505 | 1505 | |
@@ -1522,7 +1522,7 @@ discard block |
||
| 1522 | 1522 | |
| 1523 | 1523 | $gv_valid = true; |
| 1524 | 1524 | |
| 1525 | - foreach ( $validation_results['form']['fields'] as $key => &$field ) { |
|
| 1525 | + foreach ( $validation_results[ 'form' ][ 'fields' ] as $key => &$field ) { |
|
| 1526 | 1526 | |
| 1527 | 1527 | $value = RGFormsModel::get_field_value( $field ); |
| 1528 | 1528 | $field_type = RGFormsModel::get_input_type( $field ); |
@@ -1535,22 +1535,22 @@ discard block |
||
| 1535 | 1535 | case 'post_image': |
| 1536 | 1536 | |
| 1537 | 1537 | // in case nothing is uploaded but there are already files saved |
| 1538 | - if( !empty( $field->failed_validation ) && !empty( $field->isRequired ) && !empty( $value ) ) { |
|
| 1538 | + if ( ! empty( $field->failed_validation ) && ! empty( $field->isRequired ) && ! empty( $value ) ) { |
|
| 1539 | 1539 | $field->failed_validation = false; |
| 1540 | 1540 | unset( $field->validation_message ); |
| 1541 | 1541 | } |
| 1542 | 1542 | |
| 1543 | 1543 | // validate if multi file upload reached max number of files [maxFiles] => 2 |
| 1544 | - if( \GV\Utils::get( $field, 'maxFiles') && \GV\Utils::get( $field, 'multipleFiles') ) { |
|
| 1544 | + if ( \GV\Utils::get( $field, 'maxFiles' ) && \GV\Utils::get( $field, 'multipleFiles' ) ) { |
|
| 1545 | 1545 | |
| 1546 | 1546 | $input_name = 'input_' . $field->id; |
| 1547 | 1547 | //uploaded |
| 1548 | - $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ][ $input_name ] : array(); |
|
| 1548 | + $file_names = isset( GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] ) ? GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ][ $input_name ] : array(); |
|
| 1549 | 1549 | |
| 1550 | 1550 | //existent |
| 1551 | 1551 | $entry = $this->get_entry(); |
| 1552 | 1552 | $value = NULL; |
| 1553 | - if( isset( $entry[ $field->id ] ) ) { |
|
| 1553 | + if ( isset( $entry[ $field->id ] ) ) { |
|
| 1554 | 1554 | $value = json_decode( $entry[ $field->id ], true ); |
| 1555 | 1555 | } |
| 1556 | 1556 | |
@@ -1558,13 +1558,13 @@ discard block |
||
| 1558 | 1558 | $count_files = ( is_array( $file_names ) ? count( $file_names ) : 0 ) + |
| 1559 | 1559 | ( is_array( $value ) ? count( $value ) : 0 ); |
| 1560 | 1560 | |
| 1561 | - if( $count_files > $field->maxFiles ) { |
|
| 1561 | + if ( $count_files > $field->maxFiles ) { |
|
| 1562 | 1562 | $field->validation_message = __( 'Maximum number of files reached', 'gravityview' ); |
| 1563 | 1563 | $field->failed_validation = 1; |
| 1564 | 1564 | $gv_valid = false; |
| 1565 | 1565 | |
| 1566 | 1566 | // in case of error make sure the newest upload files are removed from the upload input |
| 1567 | - GFFormsModel::$uploaded_files[ $validation_results['form']['id'] ] = null; |
|
| 1567 | + GFFormsModel::$uploaded_files[ $validation_results[ 'form' ][ 'id' ] ] = null; |
|
| 1568 | 1568 | } |
| 1569 | 1569 | |
| 1570 | 1570 | } |
@@ -1575,7 +1575,7 @@ discard block |
||
| 1575 | 1575 | } |
| 1576 | 1576 | |
| 1577 | 1577 | // This field has failed validation. |
| 1578 | - if( !empty( $field->failed_validation ) ) { |
|
| 1578 | + if ( ! empty( $field->failed_validation ) ) { |
|
| 1579 | 1579 | |
| 1580 | 1580 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Field is invalid.', array( 'data' => array( 'field' => $field, 'value' => $value ) ) ); |
| 1581 | 1581 | |
@@ -1593,19 +1593,19 @@ discard block |
||
| 1593 | 1593 | } |
| 1594 | 1594 | |
| 1595 | 1595 | // You can't continue inside a switch, so we do it after. |
| 1596 | - if( empty( $field->failed_validation ) ) { |
|
| 1596 | + if ( empty( $field->failed_validation ) ) { |
|
| 1597 | 1597 | continue; |
| 1598 | 1598 | } |
| 1599 | 1599 | |
| 1600 | 1600 | // checks if the No Duplicates option is not validating entry against itself, since |
| 1601 | 1601 | // we're editing a stored entry, it would also assume it's a duplicate. |
| 1602 | - if( !empty( $field->noDuplicates ) ) { |
|
| 1602 | + if ( ! empty( $field->noDuplicates ) ) { |
|
| 1603 | 1603 | |
| 1604 | 1604 | $entry = $this->get_entry(); |
| 1605 | 1605 | |
| 1606 | 1606 | // If the value of the entry is the same as the stored value |
| 1607 | 1607 | // Then we can assume it's not a duplicate, it's the same. |
| 1608 | - if( !empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1608 | + if ( ! empty( $entry ) && $value == $entry[ $field->id ] ) { |
|
| 1609 | 1609 | //if value submitted was not changed, then don't validate |
| 1610 | 1610 | $field->failed_validation = false; |
| 1611 | 1611 | |
@@ -1618,7 +1618,7 @@ discard block |
||
| 1618 | 1618 | } |
| 1619 | 1619 | |
| 1620 | 1620 | // if here then probably we are facing the validation 'At least one field must be filled out' |
| 1621 | - if( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1621 | + if ( GFFormDisplay::is_empty( $field, $this->form_id ) && empty( $field->isRequired ) ) { |
|
| 1622 | 1622 | unset( $field->validation_message ); |
| 1623 | 1623 | $field->validation_message = false; |
| 1624 | 1624 | continue; |
@@ -1630,12 +1630,12 @@ discard block |
||
| 1630 | 1630 | |
| 1631 | 1631 | } |
| 1632 | 1632 | |
| 1633 | - $validation_results['is_valid'] = $gv_valid; |
|
| 1633 | + $validation_results[ 'is_valid' ] = $gv_valid; |
|
| 1634 | 1634 | |
| 1635 | 1635 | gravityview()->log->debug( 'GravityView_Edit_Entry[custom_validation] Validation results.', array( 'data' => $validation_results ) ); |
| 1636 | 1636 | |
| 1637 | 1637 | // We'll need this result when rendering the form ( on GFFormDisplay::get_form ) |
| 1638 | - $this->form_after_validation = $validation_results['form']; |
|
| 1638 | + $this->form_after_validation = $validation_results[ 'form' ]; |
|
| 1639 | 1639 | |
| 1640 | 1640 | return $validation_results; |
| 1641 | 1641 | } |
@@ -1648,7 +1648,7 @@ discard block |
||
| 1648 | 1648 | */ |
| 1649 | 1649 | public function get_entry() { |
| 1650 | 1650 | |
| 1651 | - if( empty( $this->entry ) ) { |
|
| 1651 | + if ( empty( $this->entry ) ) { |
|
| 1652 | 1652 | // Get the database value of the entry that's being edited |
| 1653 | 1653 | $this->entry = gravityview_get_entry( GravityView_frontend::is_single_entry() ); |
| 1654 | 1654 | } |
@@ -1680,10 +1680,10 @@ discard block |
||
| 1680 | 1680 | } |
| 1681 | 1681 | |
| 1682 | 1682 | // If edit tab not yet configured, show all fields |
| 1683 | - $edit_fields = !empty( $properties['edit_edit-fields'] ) ? $properties['edit_edit-fields'] : NULL; |
|
| 1683 | + $edit_fields = ! empty( $properties[ 'edit_edit-fields' ] ) ? $properties[ 'edit_edit-fields' ] : NULL; |
|
| 1684 | 1684 | |
| 1685 | 1685 | // Hide fields depending on admin settings |
| 1686 | - $fields = $this->filter_fields( $form['fields'], $edit_fields ); |
|
| 1686 | + $fields = $this->filter_fields( $form[ 'fields' ], $edit_fields ); |
|
| 1687 | 1687 | |
| 1688 | 1688 | // If Edit Entry fields are configured, remove adminOnly field settings. Otherwise, don't. |
| 1689 | 1689 | $fields = $this->filter_admin_only_fields( $fields, $edit_fields, $form, $view_id ); |
@@ -1716,7 +1716,7 @@ discard block |
||
| 1716 | 1716 | */ |
| 1717 | 1717 | private function filter_fields( $fields, $configured_fields ) { |
| 1718 | 1718 | |
| 1719 | - if( empty( $fields ) || !is_array( $fields ) ) { |
|
| 1719 | + if ( empty( $fields ) || ! is_array( $fields ) ) { |
|
| 1720 | 1720 | return $fields; |
| 1721 | 1721 | } |
| 1722 | 1722 | |
@@ -1729,12 +1729,12 @@ discard block |
||
| 1729 | 1729 | |
| 1730 | 1730 | // Remove the fields that have calculation properties and keep them to be used later |
| 1731 | 1731 | // @since 1.16.2 |
| 1732 | - if( $field->has_calculation() ) { |
|
| 1733 | - $this->fields_with_calculation[] = $field; |
|
| 1732 | + if ( $field->has_calculation() ) { |
|
| 1733 | + $this->fields_with_calculation[ ] = $field; |
|
| 1734 | 1734 | // don't remove the calculation fields on form render. |
| 1735 | 1735 | } |
| 1736 | 1736 | |
| 1737 | - if( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1737 | + if ( in_array( $field->type, $field_type_blacklist ) ) { |
|
| 1738 | 1738 | unset( $fields[ $key ] ); |
| 1739 | 1739 | } |
| 1740 | 1740 | } |
@@ -1752,7 +1752,7 @@ discard block |
||
| 1752 | 1752 | continue; // Same |
| 1753 | 1753 | } |
| 1754 | 1754 | |
| 1755 | - $out_fields[] = $field; |
|
| 1755 | + $out_fields[ ] = $field; |
|
| 1756 | 1756 | } |
| 1757 | 1757 | |
| 1758 | 1758 | return array_values( $out_fields ); |
@@ -1763,8 +1763,8 @@ discard block |
||
| 1763 | 1763 | |
| 1764 | 1764 | /** @var GF_Field $field */ |
| 1765 | 1765 | foreach ( $fields as $field ) { |
| 1766 | - if( intval( $configured_field['id'] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 1767 | - $edit_fields[] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1766 | + if ( intval( $configured_field[ 'id' ] ) === intval( $field->id ) && $this->user_can_edit_field( $configured_field, false ) ) { |
|
| 1767 | + $edit_fields[ ] = $this->merge_field_properties( $field, $configured_field ); |
|
| 1768 | 1768 | break; |
| 1769 | 1769 | } |
| 1770 | 1770 | |
@@ -1787,14 +1787,14 @@ discard block |
||
| 1787 | 1787 | |
| 1788 | 1788 | $return_field = $field; |
| 1789 | 1789 | |
| 1790 | - if( empty( $field_setting['show_label'] ) ) { |
|
| 1790 | + if ( empty( $field_setting[ 'show_label' ] ) ) { |
|
| 1791 | 1791 | $return_field->label = ''; |
| 1792 | - } elseif ( !empty( $field_setting['custom_label'] ) ) { |
|
| 1793 | - $return_field->label = $field_setting['custom_label']; |
|
| 1792 | + } elseif ( ! empty( $field_setting[ 'custom_label' ] ) ) { |
|
| 1793 | + $return_field->label = $field_setting[ 'custom_label' ]; |
|
| 1794 | 1794 | } |
| 1795 | 1795 | |
| 1796 | - if( !empty( $field_setting['custom_class'] ) ) { |
|
| 1797 | - $return_field->cssClass .= ' '. gravityview_sanitize_html_class( $field_setting['custom_class'] ); |
|
| 1796 | + if ( ! empty( $field_setting[ 'custom_class' ] ) ) { |
|
| 1797 | + $return_field->cssClass .= ' ' . gravityview_sanitize_html_class( $field_setting[ 'custom_class' ] ); |
|
| 1798 | 1798 | } |
| 1799 | 1799 | |
| 1800 | 1800 | /** |
@@ -1832,16 +1832,16 @@ discard block |
||
| 1832 | 1832 | */ |
| 1833 | 1833 | $use_gf_adminonly_setting = apply_filters( 'gravityview/edit_entry/use_gf_admin_only_setting', empty( $edit_fields ), $form, $view_id ); |
| 1834 | 1834 | |
| 1835 | - if( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry['id'] ) ) { |
|
| 1836 | - foreach( $fields as $k => $field ) { |
|
| 1837 | - if( $field->adminOnly ) { |
|
| 1835 | + if ( $use_gf_adminonly_setting && false === GVCommon::has_cap( 'gravityforms_edit_entries', $this->entry[ 'id' ] ) ) { |
|
| 1836 | + foreach ( $fields as $k => $field ) { |
|
| 1837 | + if ( $field->adminOnly ) { |
|
| 1838 | 1838 | unset( $fields[ $k ] ); |
| 1839 | 1839 | } |
| 1840 | 1840 | } |
| 1841 | 1841 | return array_values( $fields ); |
| 1842 | 1842 | } |
| 1843 | 1843 | |
| 1844 | - foreach( $fields as &$field ) { |
|
| 1844 | + foreach ( $fields as &$field ) { |
|
| 1845 | 1845 | $field->adminOnly = false; |
| 1846 | 1846 | } |
| 1847 | 1847 | |
@@ -1862,7 +1862,7 @@ discard block |
||
| 1862 | 1862 | */ |
| 1863 | 1863 | private function unselect_default_values( $form ) { |
| 1864 | 1864 | |
| 1865 | - foreach ( $form['fields'] as &$field ) { |
|
| 1865 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1866 | 1866 | |
| 1867 | 1867 | if ( empty( $field->choices ) ) { |
| 1868 | 1868 | continue; |
@@ -1870,7 +1870,7 @@ discard block |
||
| 1870 | 1870 | |
| 1871 | 1871 | foreach ( $field->choices as &$choice ) { |
| 1872 | 1872 | if ( \GV\Utils::get( $choice, 'isSelected' ) ) { |
| 1873 | - $choice['isSelected'] = false; |
|
| 1873 | + $choice[ 'isSelected' ] = false; |
|
| 1874 | 1874 | } |
| 1875 | 1875 | } |
| 1876 | 1876 | } |
@@ -1895,22 +1895,22 @@ discard block |
||
| 1895 | 1895 | */ |
| 1896 | 1896 | function prefill_conditional_logic( $form ) { |
| 1897 | 1897 | |
| 1898 | - if( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 1898 | + if ( ! GFFormDisplay::has_conditional_logic( $form ) ) { |
|
| 1899 | 1899 | return $form; |
| 1900 | 1900 | } |
| 1901 | 1901 | |
| 1902 | 1902 | // Have Conditional Logic pre-fill fields as if the data were default values |
| 1903 | 1903 | /** @var GF_Field $field */ |
| 1904 | - foreach ( $form['fields'] as &$field ) { |
|
| 1904 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1905 | 1905 | |
| 1906 | - if( 'checkbox' === $field->type ) { |
|
| 1906 | + if ( 'checkbox' === $field->type ) { |
|
| 1907 | 1907 | foreach ( $field->get_entry_inputs() as $key => $input ) { |
| 1908 | - $input_id = $input['id']; |
|
| 1908 | + $input_id = $input[ 'id' ]; |
|
| 1909 | 1909 | $choice = $field->choices[ $key ]; |
| 1910 | 1910 | $value = \GV\Utils::get( $this->entry, $input_id ); |
| 1911 | 1911 | $match = RGFormsModel::choice_value_match( $field, $choice, $value ); |
| 1912 | - if( $match ) { |
|
| 1913 | - $field->choices[ $key ]['isSelected'] = true; |
|
| 1912 | + if ( $match ) { |
|
| 1913 | + $field->choices[ $key ][ 'isSelected' ] = true; |
|
| 1914 | 1914 | } |
| 1915 | 1915 | } |
| 1916 | 1916 | } else { |
@@ -1918,15 +1918,15 @@ discard block |
||
| 1918 | 1918 | // We need to run through each field to set the default values |
| 1919 | 1919 | foreach ( $this->entry as $field_id => $field_value ) { |
| 1920 | 1920 | |
| 1921 | - if( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1921 | + if ( floatval( $field_id ) === floatval( $field->id ) ) { |
|
| 1922 | 1922 | |
| 1923 | - if( 'list' === $field->type ) { |
|
| 1923 | + if ( 'list' === $field->type ) { |
|
| 1924 | 1924 | $list_rows = maybe_unserialize( $field_value ); |
| 1925 | 1925 | |
| 1926 | 1926 | $list_field_value = array(); |
| 1927 | - foreach ( (array) $list_rows as $row ) { |
|
| 1928 | - foreach ( (array) $row as $column ) { |
|
| 1929 | - $list_field_value[] = $column; |
|
| 1927 | + foreach ( (array)$list_rows as $row ) { |
|
| 1928 | + foreach ( (array)$row as $column ) { |
|
| 1929 | + $list_field_value[ ] = $column; |
|
| 1930 | 1930 | } |
| 1931 | 1931 | } |
| 1932 | 1932 | |
@@ -1959,32 +1959,32 @@ discard block |
||
| 1959 | 1959 | * @see https://github.com/gravityview/GravityView/issues/840 |
| 1960 | 1960 | * @since develop |
| 1961 | 1961 | */ |
| 1962 | - $the_form = GFAPI::get_form( $form['id'] ); |
|
| 1962 | + $the_form = GFAPI::get_form( $form[ 'id' ] ); |
|
| 1963 | 1963 | $editable_ids = array(); |
| 1964 | - foreach ( $form['fields'] as $field ) { |
|
| 1965 | - $editable_ids[] = $field['id']; // wp_list_pluck is destructive in this context |
|
| 1964 | + foreach ( $form[ 'fields' ] as $field ) { |
|
| 1965 | + $editable_ids[ ] = $field[ 'id' ]; // wp_list_pluck is destructive in this context |
|
| 1966 | 1966 | } |
| 1967 | 1967 | $remove_conditions_rule = array(); |
| 1968 | - foreach ( $the_form['fields'] as $field ) { |
|
| 1969 | - if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic['rules'] ) ) { |
|
| 1970 | - foreach ( $field->conditionalLogic['rules'] as $i => $rule ) { |
|
| 1971 | - if ( ! in_array( $rule['fieldId'], $editable_ids ) ) { |
|
| 1968 | + foreach ( $the_form[ 'fields' ] as $field ) { |
|
| 1969 | + if ( ! empty( $field->conditionalLogic ) && ! empty( $field->conditionalLogic[ 'rules' ] ) ) { |
|
| 1970 | + foreach ( $field->conditionalLogic[ 'rules' ] as $i => $rule ) { |
|
| 1971 | + if ( ! in_array( $rule[ 'fieldId' ], $editable_ids ) ) { |
|
| 1972 | 1972 | /** |
| 1973 | 1973 | * This conditional field is not editable in this View. |
| 1974 | 1974 | * We need to remove the rule, but only if it matches. |
| 1975 | 1975 | */ |
| 1976 | - if ( $_field = GFAPI::get_field( $the_form, $rule['fieldId'] ) ) { |
|
| 1976 | + if ( $_field = GFAPI::get_field( $the_form, $rule[ 'fieldId' ] ) ) { |
|
| 1977 | 1977 | $value = $_field->get_value_export( $this->entry ); |
| 1978 | - } elseif ( isset( $this->entry[ $rule['fieldId'] ] ) ) { |
|
| 1979 | - $value = $this->entry[ $rule['fieldId'] ]; |
|
| 1978 | + } elseif ( isset( $this->entry[ $rule[ 'fieldId' ] ] ) ) { |
|
| 1979 | + $value = $this->entry[ $rule[ 'fieldId' ] ]; |
|
| 1980 | 1980 | } else { |
| 1981 | - $value = gform_get_meta( $this->entry['id'], $rule['fieldId'] ); |
|
| 1981 | + $value = gform_get_meta( $this->entry[ 'id' ], $rule[ 'fieldId' ] ); |
|
| 1982 | 1982 | } |
| 1983 | 1983 | |
| 1984 | - $match = GFFormsModel::matches_operation( $value, $rule['value'], $rule['operator'] ); |
|
| 1984 | + $match = GFFormsModel::matches_operation( $value, $rule[ 'value' ], $rule[ 'operator' ] ); |
|
| 1985 | 1985 | |
| 1986 | 1986 | if ( $match ) { |
| 1987 | - $remove_conditions_rule[] = array( $field['id'], $i ); |
|
| 1987 | + $remove_conditions_rule[ ] = array( $field[ 'id' ], $i ); |
|
| 1988 | 1988 | } |
| 1989 | 1989 | } |
| 1990 | 1990 | } |
@@ -1992,21 +1992,21 @@ discard block |
||
| 1992 | 1992 | } |
| 1993 | 1993 | |
| 1994 | 1994 | if ( $remove_conditions_rule ) { |
| 1995 | - foreach ( $form['fields'] as &$field ) { |
|
| 1995 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 1996 | 1996 | foreach ( $remove_conditions_rule as $_remove_conditions_r ) { |
| 1997 | 1997 | |
| 1998 | 1998 | list( $rule_field_id, $rule_i ) = $_remove_conditions_r; |
| 1999 | 1999 | |
| 2000 | - if ( $field['id'] == $rule_field_id ) { |
|
| 2001 | - unset( $field->conditionalLogic['rules'][ $rule_i ] ); |
|
| 2002 | - gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field['id'] ) ); |
|
| 2000 | + if ( $field[ 'id' ] == $rule_field_id ) { |
|
| 2001 | + unset( $field->conditionalLogic[ 'rules' ][ $rule_i ] ); |
|
| 2002 | + gravityview()->log->debug( 'Removed conditional rule #{rule} for field {field_id}', array( 'rule' => $rule_i, 'field_id' => $field[ 'id' ] ) ); |
|
| 2003 | 2003 | } |
| 2004 | 2004 | } |
| 2005 | 2005 | } |
| 2006 | 2006 | } |
| 2007 | 2007 | |
| 2008 | 2008 | /** Normalize the indices... */ |
| 2009 | - $form['fields'] = array_values( $form['fields'] ); |
|
| 2009 | + $form[ 'fields' ] = array_values( $form[ 'fields' ] ); |
|
| 2010 | 2010 | |
| 2011 | 2011 | /** |
| 2012 | 2012 | * @filter `gravityview/edit_entry/conditional_logic` Should the Edit Entry form use Gravity Forms conditional logic showing/hiding of fields? |
@@ -2016,16 +2016,16 @@ discard block |
||
| 2016 | 2016 | */ |
| 2017 | 2017 | $use_conditional_logic = apply_filters( 'gravityview/edit_entry/conditional_logic', true, $form ); |
| 2018 | 2018 | |
| 2019 | - if( $use_conditional_logic ) { |
|
| 2019 | + if ( $use_conditional_logic ) { |
|
| 2020 | 2020 | return $form; |
| 2021 | 2021 | } |
| 2022 | 2022 | |
| 2023 | - foreach( $form['fields'] as &$field ) { |
|
| 2023 | + foreach ( $form[ 'fields' ] as &$field ) { |
|
| 2024 | 2024 | /* @var GF_Field $field */ |
| 2025 | 2025 | $field->conditionalLogic = null; |
| 2026 | 2026 | } |
| 2027 | 2027 | |
| 2028 | - unset( $form['button']['conditionalLogic'] ); |
|
| 2028 | + unset( $form[ 'button' ][ 'conditionalLogic' ] ); |
|
| 2029 | 2029 | |
| 2030 | 2030 | return $form; |
| 2031 | 2031 | |
@@ -2042,7 +2042,7 @@ discard block |
||
| 2042 | 2042 | */ |
| 2043 | 2043 | public function manage_conditional_logic( $has_conditional_logic, $form ) { |
| 2044 | 2044 | |
| 2045 | - if( ! $this->is_edit_entry() ) { |
|
| 2045 | + if ( ! $this->is_edit_entry() ) { |
|
| 2046 | 2046 | return $has_conditional_logic; |
| 2047 | 2047 | } |
| 2048 | 2048 | |
@@ -2074,44 +2074,44 @@ discard block |
||
| 2074 | 2074 | * 2. There are two entries embedded using oEmbed |
| 2075 | 2075 | * 3. One of the entries has just been saved |
| 2076 | 2076 | */ |
| 2077 | - if( !empty( $_POST['lid'] ) && !empty( $_GET['entry'] ) && ( $_POST['lid'] !== $_GET['entry'] ) ) { |
|
| 2077 | + if ( ! empty( $_POST[ 'lid' ] ) && ! empty( $_GET[ 'entry' ] ) && ( $_POST[ 'lid' ] !== $_GET[ 'entry' ] ) ) { |
|
| 2078 | 2078 | |
| 2079 | 2079 | $error = true; |
| 2080 | 2080 | |
| 2081 | 2081 | } |
| 2082 | 2082 | |
| 2083 | - if( !empty( $_GET['entry'] ) && (string)$this->entry['id'] !== $_GET['entry'] ) { |
|
| 2083 | + if ( ! empty( $_GET[ 'entry' ] ) && (string)$this->entry[ 'id' ] !== $_GET[ 'entry' ] ) { |
|
| 2084 | 2084 | |
| 2085 | 2085 | $error = true; |
| 2086 | 2086 | |
| 2087 | - } elseif( ! $this->verify_nonce() ) { |
|
| 2087 | + } elseif ( ! $this->verify_nonce() ) { |
|
| 2088 | 2088 | |
| 2089 | 2089 | /** |
| 2090 | 2090 | * If the Entry is embedded, there may be two entries on the same page. |
| 2091 | 2091 | * If that's the case, and one is being edited, the other should fail gracefully and not display an error. |
| 2092 | 2092 | */ |
| 2093 | - if( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 2093 | + if ( GravityView_oEmbed::getInstance()->get_entry_id() ) { |
|
| 2094 | 2094 | $error = true; |
| 2095 | 2095 | } else { |
| 2096 | - $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview'); |
|
| 2096 | + $error = __( 'The link to edit this entry is not valid; it may have expired.', 'gravityview' ); |
|
| 2097 | 2097 | } |
| 2098 | 2098 | |
| 2099 | 2099 | } |
| 2100 | 2100 | |
| 2101 | - if( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 2102 | - $error = __( 'You do not have permission to edit this entry.', 'gravityview'); |
|
| 2101 | + if ( ! GravityView_Edit_Entry::check_user_cap_edit_entry( $this->entry ) ) { |
|
| 2102 | + $error = __( 'You do not have permission to edit this entry.', 'gravityview' ); |
|
| 2103 | 2103 | } |
| 2104 | 2104 | |
| 2105 | - if( $this->entry['status'] === 'trash' ) { |
|
| 2106 | - $error = __('You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 2105 | + if ( $this->entry[ 'status' ] === 'trash' ) { |
|
| 2106 | + $error = __( 'You cannot edit the entry; it is in the trash.', 'gravityview' ); |
|
| 2107 | 2107 | } |
| 2108 | 2108 | |
| 2109 | 2109 | // No errors; everything's fine here! |
| 2110 | - if( empty( $error ) ) { |
|
| 2110 | + if ( empty( $error ) ) { |
|
| 2111 | 2111 | return true; |
| 2112 | 2112 | } |
| 2113 | 2113 | |
| 2114 | - if( $echo && $error !== true ) { |
|
| 2114 | + if ( $echo && $error !== true ) { |
|
| 2115 | 2115 | |
| 2116 | 2116 | $error = esc_html( $error ); |
| 2117 | 2117 | |
@@ -2119,10 +2119,10 @@ discard block |
||
| 2119 | 2119 | * @since 1.9 |
| 2120 | 2120 | */ |
| 2121 | 2121 | if ( ! empty( $this->entry ) ) { |
| 2122 | - $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;" ) ); |
|
| 2122 | + $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;" ) ); |
|
| 2123 | 2123 | } |
| 2124 | 2124 | |
| 2125 | - echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error'); |
|
| 2125 | + echo GVCommon::generate_notice( wpautop( $error ), 'gv-error error' ); |
|
| 2126 | 2126 | } |
| 2127 | 2127 | |
| 2128 | 2128 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2142,17 +2142,17 @@ discard block |
||
| 2142 | 2142 | |
| 2143 | 2143 | $error = NULL; |
| 2144 | 2144 | |
| 2145 | - if( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 2146 | - $error = __( 'You do not have permission to edit this field.', 'gravityview'); |
|
| 2145 | + if ( ! $this->check_user_cap_edit_field( $field ) ) { |
|
| 2146 | + $error = __( 'You do not have permission to edit this field.', 'gravityview' ); |
|
| 2147 | 2147 | } |
| 2148 | 2148 | |
| 2149 | 2149 | // No errors; everything's fine here! |
| 2150 | - if( empty( $error ) ) { |
|
| 2150 | + if ( empty( $error ) ) { |
|
| 2151 | 2151 | return true; |
| 2152 | 2152 | } |
| 2153 | 2153 | |
| 2154 | - if( $echo ) { |
|
| 2155 | - echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error'); |
|
| 2154 | + if ( $echo ) { |
|
| 2155 | + echo GVCommon::generate_notice( wpautop( esc_html( $error ) ), 'gv-error error' ); |
|
| 2156 | 2156 | } |
| 2157 | 2157 | |
| 2158 | 2158 | gravityview()->log->error( '{error}', array( 'error' => $error ) ); |
@@ -2173,14 +2173,14 @@ discard block |
||
| 2173 | 2173 | private function check_user_cap_edit_field( $field ) { |
| 2174 | 2174 | |
| 2175 | 2175 | // If they can edit any entries (as defined in Gravity Forms), we're good. |
| 2176 | - if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 2176 | + if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ) ) ) { |
|
| 2177 | 2177 | return true; |
| 2178 | 2178 | } |
| 2179 | 2179 | |
| 2180 | - $field_cap = isset( $field['allow_edit_cap'] ) ? $field['allow_edit_cap'] : false; |
|
| 2180 | + $field_cap = isset( $field[ 'allow_edit_cap' ] ) ? $field[ 'allow_edit_cap' ] : false; |
|
| 2181 | 2181 | |
| 2182 | - if( $field_cap ) { |
|
| 2183 | - return GVCommon::has_cap( $field['allow_edit_cap'] ); |
|
| 2182 | + if ( $field_cap ) { |
|
| 2183 | + return GVCommon::has_cap( $field[ 'allow_edit_cap' ] ); |
|
| 2184 | 2184 | } |
| 2185 | 2185 | |
| 2186 | 2186 | return false; |
@@ -2194,17 +2194,17 @@ discard block |
||
| 2194 | 2194 | public function verify_nonce() { |
| 2195 | 2195 | |
| 2196 | 2196 | // Verify form submitted for editing single |
| 2197 | - if( $this->is_edit_entry_submission() ) { |
|
| 2197 | + if ( $this->is_edit_entry_submission() ) { |
|
| 2198 | 2198 | $valid = wp_verify_nonce( $_POST[ self::$nonce_field ], self::$nonce_field ); |
| 2199 | 2199 | } |
| 2200 | 2200 | |
| 2201 | 2201 | // Verify |
| 2202 | - else if( ! $this->is_edit_entry() ) { |
|
| 2202 | + else if ( ! $this->is_edit_entry() ) { |
|
| 2203 | 2203 | $valid = false; |
| 2204 | 2204 | } |
| 2205 | 2205 | |
| 2206 | 2206 | else { |
| 2207 | - $valid = wp_verify_nonce( $_GET['edit'], self::$nonce_key ); |
|
| 2207 | + $valid = wp_verify_nonce( $_GET[ 'edit' ], self::$nonce_key ); |
|
| 2208 | 2208 | } |
| 2209 | 2209 | |
| 2210 | 2210 | /** |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | $supports = array( 'title', 'revisions' ); |
| 126 | 126 | |
| 127 | 127 | if ( $is_hierarchical ) { |
| 128 | - $supports[] = 'page-attributes'; |
|
| 128 | + $supports[ ] = 'page-attributes'; |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -227,11 +227,11 @@ discard block |
||
| 227 | 227 | $rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' ); |
| 228 | 228 | |
| 229 | 229 | add_filter( 'query_vars', function( $query_vars ) { |
| 230 | - $query_vars[] = 'csv'; |
|
| 230 | + $query_vars[ ] = 'csv'; |
|
| 231 | 231 | return $query_vars; |
| 232 | 232 | } ); |
| 233 | 233 | |
| 234 | - if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) { |
|
| 234 | + if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) { |
|
| 235 | 235 | call_user_func_array( 'add_rewrite_rule', $rule ); |
| 236 | 236 | } |
| 237 | 237 | } |
@@ -300,13 +300,13 @@ discard block |
||
| 300 | 300 | return $content; |
| 301 | 301 | } |
| 302 | 302 | |
| 303 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
| 303 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
| 304 | 304 | |
| 305 | 305 | /** |
| 306 | 306 | * Editing a single entry. |
| 307 | 307 | */ |
| 308 | 308 | if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) { |
| 309 | - if ( $entry['status'] != 'active' ) { |
|
| 309 | + if ( $entry[ 'status' ] != 'active' ) { |
|
| 310 | 310 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 311 | 311 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 312 | 312 | } |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 320 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 320 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 321 | 321 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 322 | 322 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 323 | 323 | } |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | |
| 341 | 341 | foreach ( $entryset as $e ) { |
| 342 | 342 | |
| 343 | - if ( 'active' !== $e['status'] ) { |
|
| 343 | + if ( 'active' !== $e[ 'status' ] ) { |
|
| 344 | 344 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); |
| 345 | 345 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 346 | 346 | } |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | } |
| 352 | 352 | |
| 353 | 353 | if ( $show_only_approved && ! $is_admin_and_can_view ) { |
| 354 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 354 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 355 | 355 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); |
| 356 | 356 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 357 | 357 | } |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | $join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column ); |
| 527 | 527 | $join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column ); |
| 528 | 528 | |
| 529 | - $joins [] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
| 529 | + $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
| 530 | 530 | } |
| 531 | 531 | |
| 532 | 532 | return $joins; |
@@ -621,13 +621,13 @@ discard block |
||
| 621 | 621 | } |
| 622 | 622 | |
| 623 | 623 | foreach ( $_fields as $field ) { |
| 624 | - if ( ! empty( $field['unions'] ) ) { |
|
| 625 | - foreach ( $field['unions'] as $form_id => $field_id ) { |
|
| 624 | + if ( ! empty( $field[ 'unions' ] ) ) { |
|
| 625 | + foreach ( $field[ 'unions' ] as $form_id => $field_id ) { |
|
| 626 | 626 | if ( ! isset( $unions[ $form_id ] ) ) { |
| 627 | 627 | $unions[ $form_id ] = array(); |
| 628 | 628 | } |
| 629 | 629 | |
| 630 | - $unions[ $form_id ][ $field['id'] ] = |
|
| 630 | + $unions[ $form_id ][ $field[ 'id' ] ] = |
|
| 631 | 631 | is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
| 632 | 632 | } |
| 633 | 633 | } |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | if ( ! $view->form ) { |
| 677 | 677 | gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( |
| 678 | 678 | 'view_id' => $view->ID, |
| 679 | - 'form_id' => $view->_gravityview_form_id ? : 0, |
|
| 679 | + 'form_id' => $view->_gravityview_form_id ?: 0, |
|
| 680 | 680 | ) ); |
| 681 | 681 | } |
| 682 | 682 | |
@@ -915,11 +915,11 @@ discard block |
||
| 915 | 915 | * Remove multiple sorting before calling legacy filters. |
| 916 | 916 | * This allows us to fake it till we make it. |
| 917 | 917 | */ |
| 918 | - if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { |
|
| 918 | + if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { |
|
| 919 | 919 | $has_multisort = true; |
| 920 | - $parameters['sort_field'] = reset( $parameters['sort_field'] ); |
|
| 921 | - if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { |
|
| 922 | - $parameters['sort_direction'] = reset( $parameters['sort_direction'] ); |
|
| 920 | + $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] ); |
|
| 921 | + if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { |
|
| 922 | + $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] ); |
|
| 923 | 923 | } |
| 924 | 924 | } |
| 925 | 925 | |
@@ -927,34 +927,33 @@ discard block |
||
| 927 | 927 | * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead |
| 928 | 928 | */ |
| 929 | 929 | $parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID ); |
| 930 | - $parameters['context_view_id'] = $this->ID; |
|
| 930 | + $parameters[ 'context_view_id' ] = $this->ID; |
|
| 931 | 931 | $parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID ); |
| 932 | 932 | |
| 933 | 933 | if ( $request instanceof REST\Request ) { |
| 934 | 934 | $atts = $this->settings->as_atts(); |
| 935 | 935 | $paging_parameters = wp_parse_args( $request->get_paging(), array( |
| 936 | - 'paging' => array( 'page_size' => $atts['page_size'] ), |
|
| 936 | + 'paging' => array( 'page_size' => $atts[ 'page_size' ] ), |
|
| 937 | 937 | ) ); |
| 938 | - $parameters['paging'] = $paging_parameters['paging']; |
|
| 938 | + $parameters[ 'paging' ] = $paging_parameters[ 'paging' ]; |
|
| 939 | 939 | } |
| 940 | 940 | |
| 941 | - $page = Utils::get( $parameters['paging'], 'current_page' ) ? |
|
| 942 | - : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 ); |
|
| 941 | + $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 ); |
|
| 943 | 942 | |
| 944 | 943 | /** |
| 945 | 944 | * Cleanup duplicate field_filter parameters to simplify the query. |
| 946 | 945 | */ |
| 947 | 946 | $unique_field_filters = array(); |
| 948 | - foreach ( $parameters['search_criteria']['field_filters'] as $key => $filter ) { |
|
| 947 | + foreach ( $parameters[ 'search_criteria' ][ 'field_filters' ] as $key => $filter ) { |
|
| 949 | 948 | if ( 'mode' === $key ) { |
| 950 | - $unique_field_filters['mode'] = $filter; |
|
| 949 | + $unique_field_filters[ 'mode' ] = $filter; |
|
| 951 | 950 | } else if ( ! in_array( $filter, $unique_field_filters ) ) { |
| 952 | - $unique_field_filters[] = $filter; |
|
| 951 | + $unique_field_filters[ ] = $filter; |
|
| 953 | 952 | } |
| 954 | 953 | } |
| 955 | - $parameters['search_criteria']['field_filters'] = $unique_field_filters; |
|
| 954 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters; |
|
| 956 | 955 | |
| 957 | - if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) { |
|
| 956 | + if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
| 958 | 957 | gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' ); |
| 959 | 958 | } |
| 960 | 959 | |
@@ -963,7 +962,7 @@ discard block |
||
| 963 | 962 | $query_class = $this->get_query_class(); |
| 964 | 963 | |
| 965 | 964 | /** @var \GF_Query $query */ |
| 966 | - $query = new $query_class( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] ); |
|
| 965 | + $query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] ); |
|
| 967 | 966 | |
| 968 | 967 | /** |
| 969 | 968 | * Apply multisort. |
@@ -974,15 +973,15 @@ discard block |
||
| 974 | 973 | $view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() ); |
| 975 | 974 | $view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() ); |
| 976 | 975 | |
| 977 | - $has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] ); |
|
| 976 | + $has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] ); |
|
| 978 | 977 | |
| 979 | - if( $has_sort_query_param ) { |
|
| 980 | - $has_sort_query_param = array_filter( array_values( $_GET['sort'] ) ); |
|
| 978 | + if ( $has_sort_query_param ) { |
|
| 979 | + $has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) ); |
|
| 981 | 980 | } |
| 982 | 981 | |
| 983 | 982 | if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) { |
| 984 | - $sort_field_ids = array_keys( $_GET['sort'] ); |
|
| 985 | - $sort_directions = array_values( $_GET['sort'] ); |
|
| 983 | + $sort_field_ids = array_keys( $_GET[ 'sort' ] ); |
|
| 984 | + $sort_directions = array_values( $_GET[ 'sort' ] ); |
|
| 986 | 985 | } else { |
| 987 | 986 | $sort_field_ids = $view_setting_sort_field_ids; |
| 988 | 987 | $sort_directions = $view_setting_sort_directions; |
@@ -990,7 +989,7 @@ discard block |
||
| 990 | 989 | |
| 991 | 990 | $skip_first = false; |
| 992 | 991 | |
| 993 | - foreach ( (array) $sort_field_ids as $key => $sort_field_id ) { |
|
| 992 | + foreach ( (array)$sort_field_ids as $key => $sort_field_id ) { |
|
| 994 | 993 | |
| 995 | 994 | if ( ! $skip_first && ! $has_sort_query_param ) { |
| 996 | 995 | $skip_first = true; // Skip the first one, it's already in the query |
@@ -1020,15 +1019,15 @@ discard block |
||
| 1020 | 1019 | |
| 1021 | 1020 | $merged_time = false; |
| 1022 | 1021 | |
| 1023 | - foreach ( $q['order'] as $oid => $order ) { |
|
| 1024 | - if ( $order[0] instanceof \GF_Query_Column ) { |
|
| 1025 | - $column = $order[0]; |
|
| 1026 | - } else if ( $order[0] instanceof \GF_Query_Call ) { |
|
| 1027 | - if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) { |
|
| 1022 | + foreach ( $q[ 'order' ] as $oid => $order ) { |
|
| 1023 | + if ( $order[ 0 ] instanceof \GF_Query_Column ) { |
|
| 1024 | + $column = $order[ 0 ]; |
|
| 1025 | + } else if ( $order[ 0 ] instanceof \GF_Query_Call ) { |
|
| 1026 | + if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) { |
|
| 1028 | 1027 | $orders[ $oid ] = $order; |
| 1029 | 1028 | continue; // Need something that resembles a single sort |
| 1030 | 1029 | } |
| 1031 | - $column = $order[0]->columns[0]; |
|
| 1030 | + $column = $order[ 0 ]->columns[ 0 ]; |
|
| 1032 | 1031 | } |
| 1033 | 1032 | |
| 1034 | 1033 | if ( ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) { |
@@ -1042,7 +1041,7 @@ discard block |
||
| 1042 | 1041 | |
| 1043 | 1042 | $orders[ $oid ] = array( |
| 1044 | 1043 | new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ), |
| 1045 | - $order[1] // Mock it! |
|
| 1044 | + $order[ 1 ] // Mock it! |
|
| 1046 | 1045 | ); |
| 1047 | 1046 | |
| 1048 | 1047 | $merged_time = true; |
@@ -1053,15 +1052,15 @@ discard block |
||
| 1053 | 1052 | * ORDER again. |
| 1054 | 1053 | */ |
| 1055 | 1054 | if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) { |
| 1056 | - $sql['order'] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
| 1055 | + $sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
| 1057 | 1056 | } |
| 1058 | 1057 | } |
| 1059 | 1058 | |
| 1060 | 1059 | return $sql; |
| 1061 | 1060 | } ); |
| 1062 | 1061 | |
| 1063 | - $query->limit( $parameters['paging']['page_size'] ) |
|
| 1064 | - ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) ); |
|
| 1062 | + $query->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
| 1063 | + ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) ); |
|
| 1065 | 1064 | |
| 1066 | 1065 | /** |
| 1067 | 1066 | * Any joins? |
@@ -1084,7 +1083,7 @@ discard block |
||
| 1084 | 1083 | |
| 1085 | 1084 | $query_parameters = $query->_introspect(); |
| 1086 | 1085 | |
| 1087 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
| 1086 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
| 1088 | 1087 | } |
| 1089 | 1088 | |
| 1090 | 1089 | /** |
@@ -1118,7 +1117,7 @@ discard block |
||
| 1118 | 1117 | } |
| 1119 | 1118 | |
| 1120 | 1119 | $q = $query->_introspect(); |
| 1121 | - $query->where( \GF_Query_Condition::_and( $q['where'], $condition ) ); |
|
| 1120 | + $query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) ); |
|
| 1122 | 1121 | |
| 1123 | 1122 | if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
| 1124 | 1123 | |
@@ -1143,7 +1142,7 @@ discard block |
||
| 1143 | 1142 | |
| 1144 | 1143 | $query_parameters = $query->_introspect(); |
| 1145 | 1144 | |
| 1146 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
| 1145 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
| 1147 | 1146 | } |
| 1148 | 1147 | } |
| 1149 | 1148 | |
@@ -1167,7 +1166,7 @@ discard block |
||
| 1167 | 1166 | $conditions = array(); |
| 1168 | 1167 | |
| 1169 | 1168 | foreach ( $condition->expressions as $_condition ) { |
| 1170 | - $conditions[] = $recurse( $_condition, $fields, $recurse ); |
|
| 1169 | + $conditions[ ] = $recurse( $_condition, $fields, $recurse ); |
|
| 1171 | 1170 | } |
| 1172 | 1171 | |
| 1173 | 1172 | return call_user_func_array( |
@@ -1196,10 +1195,10 @@ discard block |
||
| 1196 | 1195 | $q = new $query_class( $form_id ); |
| 1197 | 1196 | |
| 1198 | 1197 | // Copy the WHERE clauses but substitute the field_ids to the respective ones |
| 1199 | - $q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) ); |
|
| 1198 | + $q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) ); |
|
| 1200 | 1199 | |
| 1201 | 1200 | // Copy the ORDER clause and substitute the field_ids to the respective ones |
| 1202 | - foreach ( $query_parameters['order'] as $order ) { |
|
| 1201 | + foreach ( $query_parameters[ 'order' ] as $order ) { |
|
| 1203 | 1202 | list( $column, $_order ) = $order; |
| 1204 | 1203 | |
| 1205 | 1204 | if ( $column && $column instanceof \GF_Query_Column ) { |
@@ -1213,15 +1212,15 @@ discard block |
||
| 1213 | 1212 | |
| 1214 | 1213 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) { |
| 1215 | 1214 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
| 1216 | - $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
| 1215 | + $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
| 1217 | 1216 | |
| 1218 | 1217 | // Record the SQL |
| 1219 | - $unions_sql[] = array( |
|
| 1218 | + $unions_sql[ ] = array( |
|
| 1220 | 1219 | // Remove columns, we'll rebuild them |
| 1221 | 1220 | 'select' => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ), |
| 1222 | - 'from' => $sql['from'], |
|
| 1223 | - 'join' => $sql['join'], |
|
| 1224 | - 'where' => $sql['where'], |
|
| 1221 | + 'from' => $sql[ 'from' ], |
|
| 1222 | + 'join' => $sql[ 'join' ], |
|
| 1223 | + 'where' => $sql[ 'where' ], |
|
| 1225 | 1224 | // Remove order and limit |
| 1226 | 1225 | ); |
| 1227 | 1226 | |
@@ -1238,11 +1237,11 @@ discard block |
||
| 1238 | 1237 | |
| 1239 | 1238 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) { |
| 1240 | 1239 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
| 1241 | - $sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
| 1240 | + $sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
| 1242 | 1241 | |
| 1243 | 1242 | // Remove columns, we'll rebuild them |
| 1244 | - preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match ); |
|
| 1245 | - $sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] ); |
|
| 1243 | + preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match ); |
|
| 1244 | + $sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] ); |
|
| 1246 | 1245 | |
| 1247 | 1246 | $unions = array(); |
| 1248 | 1247 | |
@@ -1253,30 +1252,30 @@ discard block |
||
| 1253 | 1252 | }; |
| 1254 | 1253 | |
| 1255 | 1254 | // Add all the order columns into the selects, so we can order by the whole union group |
| 1256 | - preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches ); |
|
| 1255 | + preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches ); |
|
| 1257 | 1256 | |
| 1258 | 1257 | $columns = array( |
| 1259 | - sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) ) |
|
| 1258 | + sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) ) |
|
| 1260 | 1259 | ); |
| 1261 | 1260 | |
| 1262 | 1261 | foreach ( array_slice( $order_matches, 1 ) as $match ) { |
| 1263 | - $columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) ); |
|
| 1262 | + $columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) ); |
|
| 1264 | 1263 | |
| 1265 | 1264 | // Rewrite the order columns to the shared aliases |
| 1266 | - $sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] ); |
|
| 1265 | + $sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] ); |
|
| 1267 | 1266 | } |
| 1268 | 1267 | |
| 1269 | 1268 | $columns = array_unique( $columns ); |
| 1270 | 1269 | |
| 1271 | 1270 | // Add the columns to every UNION |
| 1272 | 1271 | foreach ( $unions_sql as $union_sql ) { |
| 1273 | - $union_sql['select'] .= implode( ', ', $columns ); |
|
| 1274 | - $unions []= implode( ' ', $union_sql ); |
|
| 1272 | + $union_sql[ 'select' ] .= implode( ', ', $columns ); |
|
| 1273 | + $unions [ ] = implode( ' ', $union_sql ); |
|
| 1275 | 1274 | } |
| 1276 | 1275 | |
| 1277 | 1276 | // Add the columns to the main SELECT, but only grab the entry id column |
| 1278 | - $sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns ); |
|
| 1279 | - $sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order']; |
|
| 1277 | + $sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns ); |
|
| 1278 | + $sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ]; |
|
| 1280 | 1279 | |
| 1281 | 1280 | return $sql; |
| 1282 | 1281 | } ); |
@@ -1321,20 +1320,20 @@ discard block |
||
| 1321 | 1320 | } ); |
| 1322 | 1321 | } else { |
| 1323 | 1322 | $entries = $this->form->entries |
| 1324 | - ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) |
|
| 1323 | + ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) |
|
| 1325 | 1324 | ->offset( $this->settings->get( 'offset' ) ) |
| 1326 | - ->limit( $parameters['paging']['page_size'] ) |
|
| 1325 | + ->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
| 1327 | 1326 | ->page( $page ); |
| 1328 | 1327 | |
| 1329 | - if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) { |
|
| 1328 | + if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) { |
|
| 1330 | 1329 | // Pluck off multisort arrays |
| 1331 | - $parameters['sorting'] = $parameters['sorting'][0]; |
|
| 1330 | + $parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ]; |
|
| 1332 | 1331 | } |
| 1333 | 1332 | |
| 1334 | - if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { |
|
| 1333 | + if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { |
|
| 1335 | 1334 | $field = new \GV\Field(); |
| 1336 | - $field->ID = $parameters['sorting']['key']; |
|
| 1337 | - $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 1335 | + $field->ID = $parameters[ 'sorting' ][ 'key' ]; |
|
| 1336 | + $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
| 1338 | 1337 | $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
| 1339 | 1338 | } |
| 1340 | 1339 | } |
@@ -1409,7 +1408,7 @@ discard block |
||
| 1409 | 1408 | $allowed = $headers = array(); |
| 1410 | 1409 | |
| 1411 | 1410 | foreach ( $view->fields->by_position( "directory_*" )->by_visible()->all() as $id => $field ) { |
| 1412 | - $allowed[] = $field; |
|
| 1411 | + $allowed[ ] = $field; |
|
| 1413 | 1412 | } |
| 1414 | 1413 | |
| 1415 | 1414 | $renderer = new Field_Renderer(); |
@@ -1431,17 +1430,17 @@ discard block |
||
| 1431 | 1430 | } ); |
| 1432 | 1431 | |
| 1433 | 1432 | foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) { |
| 1434 | - $allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
| 1433 | + $allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
| 1435 | 1434 | } |
| 1436 | 1435 | |
| 1437 | 1436 | foreach ( $allowed as $field ) { |
| 1438 | 1437 | $source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source(); |
| 1439 | 1438 | |
| 1440 | - $return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
| 1439 | + $return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
| 1441 | 1440 | |
| 1442 | 1441 | if ( ! $headers_done ) { |
| 1443 | 1442 | $label = $field->get_label( $view, $source, $entry ); |
| 1444 | - $headers[] = $label ? $label : $field->ID; |
|
| 1443 | + $headers[ ] = $label ? $label : $field->ID; |
|
| 1445 | 1444 | } |
| 1446 | 1445 | } |
| 1447 | 1446 | |
@@ -32,19 +32,19 @@ discard block |
||
| 32 | 32 | // If there's an overriding CSS file in the current template folder, use it. |
| 33 | 33 | $template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file; |
| 34 | 34 | |
| 35 | - if( file_exists( $template_css_path ) ) { |
|
| 35 | + if ( file_exists( $template_css_path ) ) { |
|
| 36 | 36 | $path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file; |
| 37 | 37 | gravityview()->log->debug( 'Stylesheet override ({css_file})', array( 'css_file' => esc_attr( $css_file ) ) ); |
| 38 | 38 | } else { |
| 39 | 39 | // Default: use GravityView CSS file |
| 40 | 40 | |
| 41 | 41 | // If no path is provided, assume default plugin templates CSS folder |
| 42 | - if( '' === $dir_path ) { |
|
| 42 | + if ( '' === $dir_path ) { |
|
| 43 | 43 | $dir_path = GRAVITYVIEW_DIR . 'templates/css/'; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | // plugins_url() expects a path to a file, not directory. We append a file to be stripped. |
| 47 | - $path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' ); |
|
| 47 | + $path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' ); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | return $path; |
@@ -82,9 +82,9 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | $parsed_permalink = parse_url( get_permalink( $id ) ); |
| 84 | 84 | |
| 85 | - $permalink_args = isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false; |
|
| 85 | + $permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false; |
|
| 86 | 86 | |
| 87 | - if( empty( $permalink_args ) ) { |
|
| 87 | + if ( empty( $permalink_args ) ) { |
|
| 88 | 88 | return array(); |
| 89 | 89 | } |
| 90 | 90 | |
@@ -109,15 +109,15 @@ discard block |
||
| 109 | 109 | function gv_selected( $value, $current, $echo = true, $type = 'selected' ) { |
| 110 | 110 | |
| 111 | 111 | $output = ''; |
| 112 | - if( is_array( $current ) ) { |
|
| 113 | - if( in_array( $value, $current ) ) { |
|
| 112 | + if ( is_array( $current ) ) { |
|
| 113 | + if ( in_array( $value, $current ) ) { |
|
| 114 | 114 | $output = __checked_selected_helper( true, true, false, $type ); |
| 115 | 115 | } |
| 116 | 116 | } else { |
| 117 | 117 | $output = __checked_selected_helper( $value, $current, false, $type ); |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - if( $echo ) { |
|
| 120 | + if ( $echo ) { |
|
| 121 | 121 | echo $output; |
| 122 | 122 | } |
| 123 | 123 | |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | |
| 128 | -if( ! function_exists( 'gravityview_sanitize_html_class' ) ) { |
|
| 128 | +if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) { |
|
| 129 | 129 | |
| 130 | 130 | /** |
| 131 | 131 | * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that. |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | */ |
| 172 | 172 | function gravityview_strip_whitespace( $string ) { |
| 173 | 173 | $string = normalize_whitespace( $string ); |
| 174 | - return preg_replace('/[\r\n\t ]+/', ' ', $string ); |
|
| 174 | + return preg_replace( '/[\r\n\t ]+/', ' ', $string ); |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | /** |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | * @return string Included file contents |
| 186 | 186 | */ |
| 187 | 187 | function gravityview_ob_include( $file_path, $object = NULL ) { |
| 188 | - if( ! file_exists( $file_path ) ) { |
|
| 188 | + if ( ! file_exists( $file_path ) ) { |
|
| 189 | 189 | gravityview()->log->error( 'File path does not exist. {path}', array( 'path' => $file_path ) ); |
| 190 | 190 | return ''; |
| 191 | 191 | } |
@@ -209,15 +209,15 @@ discard block |
||
| 209 | 209 | |
| 210 | 210 | $width = $height * 0.7586206897; |
| 211 | 211 | |
| 212 | - if( function_exists('is_rtl') && is_rtl() ) { |
|
| 213 | - $style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;'; |
|
| 212 | + if ( function_exists( 'is_rtl' ) && is_rtl() ) { |
|
| 213 | + $style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;'; |
|
| 214 | 214 | $css_class = is_string( $css_class ) ? $css_class : 'alignright'; |
| 215 | 215 | } else { |
| 216 | - $style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;'; |
|
| 216 | + $style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;'; |
|
| 217 | 217 | $css_class = is_string( $css_class ) ? $css_class : 'alignleft'; |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | - return '<img src="'. esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) .'" class="'. gravityview_sanitize_html_class( $css_class ).'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />'; |
|
| 220 | + return '<img src="' . esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) . '" class="' . gravityview_sanitize_html_class( $css_class ) . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />'; |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | /** |
@@ -241,9 +241,9 @@ discard block |
||
| 241 | 241 | function gravityview_number_format( $number, $decimals = '', $separator = true ) { |
| 242 | 242 | global $wp_locale; |
| 243 | 243 | |
| 244 | - if( '' === $decimals ) { |
|
| 244 | + if ( '' === $decimals ) { |
|
| 245 | 245 | |
| 246 | - $decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.'; |
|
| 246 | + $decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.'; |
|
| 247 | 247 | |
| 248 | 248 | /** |
| 249 | 249 | * Calculate the position of the decimal point in the number |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | $parts = parse_url( $value ); |
| 277 | 277 | |
| 278 | 278 | // No domain? Strange...show the original text. |
| 279 | - if( empty( $parts['host'] ) ) { |
|
| 279 | + if ( empty( $parts[ 'host' ] ) ) { |
|
| 280 | 280 | return $value; |
| 281 | 281 | } |
| 282 | 282 | |
@@ -289,16 +289,16 @@ discard block |
||
| 289 | 289 | * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n |
| 290 | 290 | * If true: `http://example.com => example.com` |
| 291 | 291 | */ |
| 292 | - if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) { |
|
| 292 | + if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) { |
|
| 293 | 293 | |
| 294 | - if( isset( $parts['scheme'] ) ) { |
|
| 295 | - $return .= $parts['scheme']; |
|
| 294 | + if ( isset( $parts[ 'scheme' ] ) ) { |
|
| 295 | + $return .= $parts[ 'scheme' ]; |
|
| 296 | 296 | } |
| 297 | 297 | |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | // The domain, which may contain a subdomain |
| 301 | - $domain = $parts['host']; |
|
| 301 | + $domain = $parts[ 'host' ]; |
|
| 302 | 302 | |
| 303 | 303 | /** |
| 304 | 304 | * @filter `gravityview_anchor_text_stripwww` Strip www from the domain? |
@@ -306,10 +306,10 @@ discard block |
||
| 306 | 306 | * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n |
| 307 | 307 | * If true: `www.example.com => example.com` |
| 308 | 308 | */ |
| 309 | - $strip_www = apply_filters('gravityview_anchor_text_stripwww', true ); |
|
| 309 | + $strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true ); |
|
| 310 | 310 | |
| 311 | - if( $strip_www ) { |
|
| 312 | - $domain = str_replace('www.', '', $domain ); |
|
| 311 | + if ( $strip_www ) { |
|
| 312 | + $domain = str_replace( 'www.', '', $domain ); |
|
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | /** |
@@ -319,11 +319,11 @@ discard block |
||
| 319 | 319 | * If true: `http://demo.example.com => example.com` \n |
| 320 | 320 | * If false: `http://demo.example.com => demo.example.com` |
| 321 | 321 | */ |
| 322 | - $strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true); |
|
| 322 | + $strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true ); |
|
| 323 | 323 | |
| 324 | - if( $strip_subdomains ) { |
|
| 324 | + if ( $strip_subdomains ) { |
|
| 325 | 325 | |
| 326 | - $domain = _gravityview_strip_subdomain( $parts['host'] ); |
|
| 326 | + $domain = _gravityview_strip_subdomain( $parts[ 'host' ] ); |
|
| 327 | 327 | |
| 328 | 328 | } |
| 329 | 329 | |
@@ -337,12 +337,12 @@ discard block |
||
| 337 | 337 | * If true: `http://example.com/sub/directory/page.html => example.com` \n |
| 338 | 338 | * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html` |
| 339 | 339 | */ |
| 340 | - $root_only = apply_filters('gravityview_anchor_text_rootonly', true); |
|
| 340 | + $root_only = apply_filters( 'gravityview_anchor_text_rootonly', true ); |
|
| 341 | 341 | |
| 342 | - if( empty( $root_only ) ) { |
|
| 342 | + if ( empty( $root_only ) ) { |
|
| 343 | 343 | |
| 344 | - if( isset( $parts['path'] ) ) { |
|
| 345 | - $return .= $parts['path']; |
|
| 344 | + if ( isset( $parts[ 'path' ] ) ) { |
|
| 345 | + $return .= $parts[ 'path' ]; |
|
| 346 | 346 | } |
| 347 | 347 | } |
| 348 | 348 | |
@@ -352,12 +352,12 @@ discard block |
||
| 352 | 352 | * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n |
| 353 | 353 | * If true: `http://example.com/?query=example => example.com` |
| 354 | 354 | */ |
| 355 | - $strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true ); |
|
| 355 | + $strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true ); |
|
| 356 | 356 | |
| 357 | - if( empty( $strip_query_string ) ) { |
|
| 357 | + if ( empty( $strip_query_string ) ) { |
|
| 358 | 358 | |
| 359 | - if( isset( $parts['query'] ) ) { |
|
| 360 | - $return .= '?'.$parts['query']; |
|
| 359 | + if ( isset( $parts[ 'query' ] ) ) { |
|
| 360 | + $return .= '?' . $parts[ 'query' ]; |
|
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | } |
@@ -374,8 +374,8 @@ discard block |
||
| 374 | 374 | */ |
| 375 | 375 | function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) { |
| 376 | 376 | |
| 377 | - if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) { |
|
| 378 | - return $matches['domain']; |
|
| 377 | + if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) { |
|
| 378 | + return $matches[ 'domain' ]; |
|
| 379 | 379 | } else { |
| 380 | 380 | return $string_maybe_has_subdomain; |
| 381 | 381 | } |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | |
| 445 | 445 | if ( in_array( $value, array( 'yes', 'true' ), true ) ) { |
| 446 | 446 | $value = true; |
| 447 | - } else if( in_array( $value, array( 'no', 'false' ), true ) ) { |
|
| 447 | + } else if ( in_array( $value, array( 'no', 'false' ), true ) ) { |
|
| 448 | 448 | $value = false; |
| 449 | 449 | } |
| 450 | 450 | } |
@@ -473,7 +473,7 @@ discard block |
||
| 473 | 473 | */ |
| 474 | 474 | function gv_maybe_json_decode( $value, $assoc = false, $depth = 512, $options = 0 ) { |
| 475 | 475 | |
| 476 | - if( ! is_string( $value ) ) { |
|
| 476 | + if ( ! is_string( $value ) ) { |
|
| 477 | 477 | return $value; |
| 478 | 478 | } |
| 479 | 479 | |
@@ -484,12 +484,12 @@ discard block |
||
| 484 | 484 | } |
| 485 | 485 | |
| 486 | 486 | // There was a JSON error (PHP 5.3+) |
| 487 | - if( function_exists('json_last_error') && JSON_ERROR_NONE !== json_last_error() ) { |
|
| 487 | + if ( function_exists( 'json_last_error' ) && JSON_ERROR_NONE !== json_last_error() ) { |
|
| 488 | 488 | return $value; |
| 489 | 489 | } |
| 490 | 490 | |
| 491 | 491 | // It wasn't JSON (PHP < 5.3 fallback) |
| 492 | - if( is_null( $decoded ) ) { |
|
| 492 | + if ( is_null( $decoded ) ) { |
|
| 493 | 493 | return $value; |
| 494 | 494 | } |
| 495 | 495 | |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | |
| 513 | 513 | // Use the original function, if exists. |
| 514 | 514 | // Requires WP 4.4+ |
| 515 | - if( function_exists( 'map_deep') ) { |
|
| 515 | + if ( function_exists( 'map_deep' ) ) { |
|
| 516 | 516 | return map_deep( $value, $callback ); |
| 517 | 517 | } |
| 518 | 518 | |
@@ -577,7 +577,7 @@ discard block |
||
| 577 | 577 | |
| 578 | 578 | $exploded = explode( '.', "{$field_id}" ); |
| 579 | 579 | |
| 580 | - return isset( $exploded[1] ) ? intval( $exploded[1] ) : false; |
|
| 580 | + return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false; |
|
| 581 | 581 | } |
| 582 | 582 | |
| 583 | 583 | /** |
@@ -618,13 +618,13 @@ discard block |
||
| 618 | 618 | */ |
| 619 | 619 | $args = apply_filters( 'gravityview_get_terms_choices_args', $args ); |
| 620 | 620 | |
| 621 | - $terms = get_terms( $args['taxonomy'], $args ); |
|
| 621 | + $terms = get_terms( $args[ 'taxonomy' ], $args ); |
|
| 622 | 622 | |
| 623 | 623 | $choices = array(); |
| 624 | 624 | |
| 625 | 625 | if ( is_array( $terms ) ) { |
| 626 | 626 | foreach ( $terms as $term_id => $term_name ) { |
| 627 | - $choices[] = array( |
|
| 627 | + $choices[ ] = array( |
|
| 628 | 628 | 'text' => $term_name, |
| 629 | 629 | 'value' => $term_id |
| 630 | 630 | ); |
@@ -648,21 +648,21 @@ discard block |
||
| 648 | 648 | function _gravityview_process_posted_fields() { |
| 649 | 649 | $fields = array(); |
| 650 | 650 | |
| 651 | - if( !empty( $_POST['gv_fields'] ) ) { |
|
| 652 | - if ( ! is_array( $_POST['gv_fields'] ) ) { |
|
| 651 | + if ( ! empty( $_POST[ 'gv_fields' ] ) ) { |
|
| 652 | + if ( ! is_array( $_POST[ 'gv_fields' ] ) ) { |
|
| 653 | 653 | |
| 654 | 654 | // We are not using parse_str() due to max_input_vars limitation with large View configurations |
| 655 | 655 | $fields_holder = array(); |
| 656 | - GVCommon::gv_parse_str( stripslashes( $_POST['gv_fields'] ), $fields_holder ); |
|
| 656 | + GVCommon::gv_parse_str( stripslashes( $_POST[ 'gv_fields' ] ), $fields_holder ); |
|
| 657 | 657 | |
| 658 | - if ( isset( $fields_holder['fields'] ) ) { |
|
| 659 | - $fields = $fields_holder['fields']; |
|
| 658 | + if ( isset( $fields_holder[ 'fields' ] ) ) { |
|
| 659 | + $fields = $fields_holder[ 'fields' ]; |
|
| 660 | 660 | } else { |
| 661 | 661 | gravityview()->log->error( 'No `fields` key was found after parsing $fields string', array( 'data' => $fields_holder ) ); |
| 662 | 662 | } |
| 663 | 663 | |
| 664 | 664 | } else { |
| 665 | - $fields = $_POST['gv_fields']; |
|
| 665 | + $fields = $_POST[ 'gv_fields' ]; |
|
| 666 | 666 | } |
| 667 | 667 | } |
| 668 | 668 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | $default_size = 25; |
| 48 | 48 | |
| 49 | 49 | if ( $context instanceof \GV\Template_Context ) { |
| 50 | - $default_size = (int) $context->view->settings->get( 'page_size' ); |
|
| 50 | + $default_size = (int)$context->view->settings->get( 'page_size' ); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | $sizes = array( 10, 25, $default_size, 50, 100 ); |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | |
| 59 | 59 | $page_sizes = array(); |
| 60 | 60 | foreach ( $sizes as $size ) { |
| 61 | - $page_sizes [] = array( |
|
| 61 | + $page_sizes [ ] = array( |
|
| 62 | 62 | 'value' => $size, |
| 63 | 63 | 'text' => $size |
| 64 | 64 | ); |
@@ -83,11 +83,11 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | public function render_frontend( $widget_args, $content = '', $context = null ) { |
| 85 | 85 | |
| 86 | - if( ! $this->pre_render_frontend() ) { |
|
| 86 | + if ( ! $this->pre_render_frontend() ) { |
|
| 87 | 87 | return; |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - $page_size = (int) \GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) ); |
|
| 90 | + $page_size = (int)\GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) ); |
|
| 91 | 91 | |
| 92 | 92 | $settings = shortcode_atts( array( |
| 93 | 93 | 'label' => __( 'Page Size', 'gravityview' ), |
@@ -106,20 +106,20 @@ discard block |
||
| 106 | 106 | <div class="gv-widget-page-size"> |
| 107 | 107 | <form method="get" action="<?php echo esc_url( add_query_arg( array() ) ); ?>" onchange="this.submit();"> |
| 108 | 108 | <div> |
| 109 | - <?php if( ! empty( $settings['label'] ) ) { ?> |
|
| 110 | - <label for="gv-page_size"><?php echo esc_html( $settings['label'] ); ?></label> |
|
| 109 | + <?php if ( ! empty( $settings[ 'label' ] ) ) { ?> |
|
| 110 | + <label for="gv-page_size"><?php echo esc_html( $settings[ 'label' ] ); ?></label> |
|
| 111 | 111 | <?php } ?> |
| 112 | 112 | <select name="page_size" id="gv-page_size"> |
| 113 | - <option value=""><?php echo esc_html( $settings['default_choice_text'] ); ?></option> |
|
| 113 | + <option value=""><?php echo esc_html( $settings[ 'default_choice_text' ] ); ?></option> |
|
| 114 | 114 | <?php |
| 115 | - foreach ( $settings['choices'] as $choice ) { ?> |
|
| 116 | - <option value='<?php echo esc_attr( $choice['value'] ); ?>'<?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option> |
|
| 115 | + foreach ( $settings[ 'choices' ] as $choice ) { ?> |
|
| 116 | + <option value='<?php echo esc_attr( $choice[ 'value' ] ); ?>'<?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option> |
|
| 117 | 117 | <?php } ?> |
| 118 | 118 | </select> |
| 119 | 119 | <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php |
| 120 | - if( ! empty( $_GET ) ) { |
|
| 120 | + if ( ! empty( $_GET ) ) { |
|
| 121 | 121 | $get = $_GET; |
| 122 | - unset( $get['page_size'] ); |
|
| 122 | + unset( $get[ 'page_size' ] ); |
|
| 123 | 123 | foreach ( $get as $key => $value ) { |
| 124 | 124 | if ( is_array( $value ) ) { |
| 125 | 125 | foreach ( $value as $_key => $_value ) { |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | // Already overridden |
| 161 | - if ( (int) $page_size === (int) $view->settings->get( 'page_size' ) ) { |
|
| 161 | + if ( (int)$page_size === (int)$view->settings->get( 'page_size' ) ) { |
|
| 162 | 162 | return; |
| 163 | 163 | } |
| 164 | 164 | |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | 'view' => $view, |
| 167 | 167 | ) ); |
| 168 | 168 | |
| 169 | - if ( ! in_array( (int) $page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) { |
|
| 169 | + if ( ! in_array( (int)$page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) { |
|
| 170 | 170 | gravityview()->log->warning( 'The passed page size is not allowed: {page_size}. Not modifying result.', array( 'page_size' => $page_size ) ); |
| 171 | 171 | return; |
| 172 | 172 | } |