| @@ -10,107 +10,107 @@ discard block | ||
| 10 | 10 | * | 
| 11 | 11 | * @var string | 
| 12 | 12 | */ | 
| 13 | - protected $name; | |
| 13 | + protected $name; | |
| 14 | 14 | |
| 15 | 15 | /** | 
| 16 | 16 | * Field settings | 
| 17 | 17 | * | 
| 18 | 18 | * @var array | 
| 19 | 19 | */ | 
| 20 | - protected $field; | |
| 20 | + protected $field; | |
| 21 | 21 | |
| 22 | 22 | /** | 
| 23 | 23 | * Field current value | 
| 24 | 24 | * | 
| 25 | 25 | * @var mixed | 
| 26 | 26 | */ | 
| 27 | - protected $value; | |
| 28 | - | |
| 29 | -    function __construct( $name = '', $field = array(), $curr_value = NULL ) { | |
| 30 | - | |
| 31 | - $this->name = $name; | |
| 32 | - | |
| 33 | - $defaults = self::get_field_defaults(); | |
| 34 | - | |
| 35 | - // Backward compatibility | |
| 36 | -        if( !empty( $field['choices'] ) ) { | |
| 37 | - $field['options'] = $field['choices']; | |
| 38 | - unset( $field['choices'] ); | |
| 39 | - } | |
| 40 | - | |
| 41 | - $this->field = wp_parse_args( $field, $defaults ); | |
| 42 | - | |
| 43 | - $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value; | |
| 44 | - | |
| 45 | - } | |
| 46 | - | |
| 47 | - /** | |
| 48 | - * Returns the default details for a field option | |
| 49 | - * | |
| 50 | - * - default // default option value, in case nothing is defined (@deprecated) | |
| 51 | - * - desc // option description | |
| 52 | - * - value // the option default value | |
| 53 | - * - label // the option label | |
| 54 | - * - left_label // In case of checkboxes, left label will appear on the left of the checkbox | |
| 55 | - * - id // the field id | |
| 56 | - * - type // the option type ( text, checkbox, select, ... ) | |
| 57 | -     * - options    // when type is select, define the select options ('choices' is @deprecated) | |
| 58 | - * - merge_tags // if the option supports merge tags feature | |
| 59 | - * - class // (new) define extra classes for the field | |
| 60 | - * - tooltip // | |
| 61 | - * | |
| 62 | - * @return array | |
| 63 | - */ | |
| 64 | -    public static function get_field_defaults() { | |
| 65 | - return array( | |
| 66 | - 'desc' => '', | |
| 67 | - 'value' => null, | |
| 68 | - 'label' => '', | |
| 69 | - 'left_label' => null, | |
| 70 | - 'id' => null, | |
| 71 | - 'type' => 'text', | |
| 72 | - 'options' => null, | |
| 73 | - 'merge_tags' => true, | |
| 74 | - 'class' => '', | |
| 75 | - 'tooltip' => null, | |
| 76 | - 'requires' => null | |
| 77 | - ); | |
| 78 | - } | |
| 79 | - | |
| 80 | - | |
| 81 | -    function get_tooltip() { | |
| 82 | -        if( ! function_exists('gform_tooltip') ) { | |
| 83 | - return null; | |
| 84 | - } | |
| 85 | - | |
| 86 | - $article = wp_parse_args( \GV\Utils::get( $this->field, 'article', array() ), array( | |
| 87 | - 'id' => '', | |
| 88 | - 'type' => 'modal', | |
| 89 | - 'url' => '#', | |
| 90 | - ) ); | |
| 91 | - | |
| 92 | - return !empty( $this->field['tooltip'] ) ? ' '. $this->tooltip( $this->field['tooltip'], false, true, $article ) : null; | |
| 93 | - } | |
| 94 | - | |
| 95 | - /** | |
| 96 | - * Displays the tooltip | |
| 97 | - * | |
| 98 | - * @since 2.8.1 | |
| 99 | - * | |
| 100 | - * @global $__gf_tooltips | |
| 101 | - * | |
| 102 | - * @param string $name The name of the tooltip to be displayed | |
| 103 | - * @param string $css_class Optional. The CSS class to apply toi the element. Defaults to empty string. | |
| 104 | - * @param bool $return Optional. If the tooltip should be returned instead of output. Defaults to false (output) | |
| 105 | -     * @param array  $article   Optional. Details about support doc article connected to the tooltip. { | |
| 106 | - * @type string $id Unique ID of article for Beacon API | |
| 107 | - * @type string $url URL of support doc article | |
| 108 | -     *   @type string $type Type of Beacon element to open. {@see https://developer.helpscout.com/beacon-2/web/javascript-api/#beaconarticle} | |
| 109 | - * } | |
| 110 | - * | |
| 111 | - * @return string | |
| 112 | - */ | |
| 113 | -    function tooltip( $name, $css_class = '', $return = false, $article = array() ) { | |
| 27 | + protected $value; | |
| 28 | + | |
| 29 | +	function __construct( $name = '', $field = array(), $curr_value = NULL ) { | |
| 30 | + | |
| 31 | + $this->name = $name; | |
| 32 | + | |
| 33 | + $defaults = self::get_field_defaults(); | |
| 34 | + | |
| 35 | + // Backward compatibility | |
| 36 | +		if( !empty( $field['choices'] ) ) { | |
| 37 | + $field['options'] = $field['choices']; | |
| 38 | + unset( $field['choices'] ); | |
| 39 | + } | |
| 40 | + | |
| 41 | + $this->field = wp_parse_args( $field, $defaults ); | |
| 42 | + | |
| 43 | + $this->value = is_null( $curr_value ) ? $this->field['value'] : $curr_value; | |
| 44 | + | |
| 45 | + } | |
| 46 | + | |
| 47 | + /** | |
| 48 | + * Returns the default details for a field option | |
| 49 | + * | |
| 50 | + * - default // default option value, in case nothing is defined (@deprecated) | |
| 51 | + * - desc // option description | |
| 52 | + * - value // the option default value | |
| 53 | + * - label // the option label | |
| 54 | + * - left_label // In case of checkboxes, left label will appear on the left of the checkbox | |
| 55 | + * - id // the field id | |
| 56 | + * - type // the option type ( text, checkbox, select, ... ) | |
| 57 | +	 * - options    // when type is select, define the select options ('choices' is @deprecated) | |
| 58 | + * - merge_tags // if the option supports merge tags feature | |
| 59 | + * - class // (new) define extra classes for the field | |
| 60 | + * - tooltip // | |
| 61 | + * | |
| 62 | + * @return array | |
| 63 | + */ | |
| 64 | +	public static function get_field_defaults() { | |
| 65 | + return array( | |
| 66 | + 'desc' => '', | |
| 67 | + 'value' => null, | |
| 68 | + 'label' => '', | |
| 69 | + 'left_label' => null, | |
| 70 | + 'id' => null, | |
| 71 | + 'type' => 'text', | |
| 72 | + 'options' => null, | |
| 73 | + 'merge_tags' => true, | |
| 74 | + 'class' => '', | |
| 75 | + 'tooltip' => null, | |
| 76 | + 'requires' => null | |
| 77 | + ); | |
| 78 | + } | |
| 79 | + | |
| 80 | + | |
| 81 | +	function get_tooltip() { | |
| 82 | +		if( ! function_exists('gform_tooltip') ) { | |
| 83 | + return null; | |
| 84 | + } | |
| 85 | + | |
| 86 | + $article = wp_parse_args( \GV\Utils::get( $this->field, 'article', array() ), array( | |
| 87 | + 'id' => '', | |
| 88 | + 'type' => 'modal', | |
| 89 | + 'url' => '#', | |
| 90 | + ) ); | |
| 91 | + | |
| 92 | + return !empty( $this->field['tooltip'] ) ? ' '. $this->tooltip( $this->field['tooltip'], false, true, $article ) : null; | |
| 93 | + } | |
| 94 | + | |
| 95 | + /** | |
| 96 | + * Displays the tooltip | |
| 97 | + * | |
| 98 | + * @since 2.8.1 | |
| 99 | + * | |
| 100 | + * @global $__gf_tooltips | |
| 101 | + * | |
| 102 | + * @param string $name The name of the tooltip to be displayed | |
| 103 | + * @param string $css_class Optional. The CSS class to apply toi the element. Defaults to empty string. | |
| 104 | + * @param bool $return Optional. If the tooltip should be returned instead of output. Defaults to false (output) | |
| 105 | +	 * @param array  $article   Optional. Details about support doc article connected to the tooltip. { | |
| 106 | + * @type string $id Unique ID of article for Beacon API | |
| 107 | + * @type string $url URL of support doc article | |
| 108 | +	 *   @type string $type Type of Beacon element to open. {@see https://developer.helpscout.com/beacon-2/web/javascript-api/#beaconarticle} | |
| 109 | + * } | |
| 110 | + * | |
| 111 | + * @return string | |
| 112 | + */ | |
| 113 | +	function tooltip( $name, $css_class = '', $return = false, $article = array() ) { | |
| 114 | 114 | global $__gf_tooltips; //declared as global to improve WPML performance | 
| 115 | 115 | |
| 116 | 116 | $css_class = empty( $css_class ) ? 'tooltip' : $css_class; | 
| @@ -128,17 +128,17 @@ discard block | ||
| 128 | 128 |  		$tooltip_class = isset( $__gf_tooltips[ $name ] ) ? "tooltip_{$name}" : ''; | 
| 129 | 129 | $tooltip_class = esc_attr( $tooltip_class ); | 
| 130 | 130 | |
| 131 | - /** | |
| 132 | - * Below this line has been modified by GravityView. | |
| 133 | - */ | |
| 131 | + /** | |
| 132 | + * Below this line has been modified by GravityView. | |
| 133 | + */ | |
| 134 | 134 | |
| 135 | 135 |  		if ( empty( $tooltip_text ) && empty( $article['id'] ) ) { | 
| 136 | 136 | return ''; | 
| 137 | 137 | } | 
| 138 | 138 | |
| 139 | 139 | $url = '#'; | 
| 140 | - $atts = 'onclick="return false;" onkeypress="return false;"'; | |
| 141 | - $anchor_text = '<i class=\'fa fa-question-circle\'></i>'; | |
| 140 | + $atts = 'onclick="return false;" onkeypress="return false;"'; | |
| 141 | + $anchor_text = '<i class=\'fa fa-question-circle\'></i>'; | |
| 142 | 142 | $css_class = gravityview_sanitize_html_class( 'gf_tooltip ' . $css_class . ' ' . $tooltip_class ); | 
| 143 | 143 | |
| 144 | 144 | $tooltip = sprintf( '<a href="%s" %s class="%s" title="%s" role="button">%s</a>', | 
| @@ -149,11 +149,11 @@ discard block | ||
| 149 | 149 | $anchor_text | 
| 150 | 150 | ); | 
| 151 | 151 | |
| 152 | - /** | |
| 153 | - * Modify the tooltip HTML before outputting | |
| 154 | - * @internal | |
| 155 | - * @see GravityView_Support_Port::maybe_add_article_to_tooltip() | |
| 156 | - */ | |
| 152 | + /** | |
| 153 | + * Modify the tooltip HTML before outputting | |
| 154 | + * @internal | |
| 155 | + * @see GravityView_Support_Port::maybe_add_article_to_tooltip() | |
| 156 | + */ | |
| 157 | 157 | $tooltip = apply_filters( 'gravityview/tooltips/tooltip', $tooltip, $article, $url, $atts, $css_class, $tooltip_text, $anchor_text ); | 
| 158 | 158 | |
| 159 | 159 |  		if ( ! $return ) { | 
| @@ -163,84 +163,84 @@ discard block | ||
| 163 | 163 | return $tooltip; | 
| 164 | 164 | } | 
| 165 | 165 | |
| 166 | - /** | |
| 167 | - * Build input id based on the name | |
| 168 | - * @return string | |
| 169 | - */ | |
| 170 | -    function get_field_id() { | |
| 171 | -        if( isset( $this->field['id'] ) ) { | |
| 172 | - return esc_attr( $this->field['id'] ); | |
| 173 | - } | |
| 174 | - return esc_attr( sanitize_html_class( $this->name ) ); | |
| 175 | - } | |
| 176 | - | |
| 177 | - /** | |
| 178 | - * Retrieve field label | |
| 179 | - * @return string | |
| 180 | - */ | |
| 181 | -    function get_field_label() { | |
| 182 | - return esc_html( trim( $this->field['label'] ) ); | |
| 183 | - } | |
| 166 | + /** | |
| 167 | + * Build input id based on the name | |
| 168 | + * @return string | |
| 169 | + */ | |
| 170 | +	function get_field_id() { | |
| 171 | +		if( isset( $this->field['id'] ) ) { | |
| 172 | + return esc_attr( $this->field['id'] ); | |
| 173 | + } | |
| 174 | + return esc_attr( sanitize_html_class( $this->name ) ); | |
| 175 | + } | |
| 176 | + | |
| 177 | + /** | |
| 178 | + * Retrieve field label | |
| 179 | + * @return string | |
| 180 | + */ | |
| 181 | +	function get_field_label() { | |
| 182 | + return esc_html( trim( $this->field['label'] ) ); | |
| 183 | + } | |
| 184 | 184 | |
| 185 | 185 | /** | 
| 186 | 186 | * Retrieve field left label | 
| 187 | - * | |
| 188 | - * @since 1.7 | |
| 189 | - * | |
| 187 | + * | |
| 188 | + * @since 1.7 | |
| 189 | + * | |
| 190 | 190 | * @return string | 
| 191 | 191 | */ | 
| 192 | 192 |  	function get_field_left_label() { | 
| 193 | 193 | return ! empty( $this->field['left_label'] ) ? esc_html( trim( $this->field['left_label'] ) ) : NULL; | 
| 194 | 194 | } | 
| 195 | 195 | |
| 196 | - /** | |
| 197 | - * Retrieve field label class | |
| 198 | - * @return string | |
| 199 | - */ | |
| 200 | -    function get_label_class() { | |
| 201 | - return 'gv-label-'. sanitize_html_class( $this->field['type'] ); | |
| 202 | - } | |
| 203 | - | |
| 204 | - | |
| 205 | - /** | |
| 206 | - * Retrieve field description | |
| 207 | - * @return string | |
| 208 | - */ | |
| 209 | -    function get_field_desc() { | |
| 210 | - return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : ''; | |
| 211 | - } | |
| 212 | - | |
| 213 | - | |
| 214 | - /** | |
| 215 | - * Verify if field should have merge tags | |
| 216 | - * @return boolean | |
| 217 | - */ | |
| 218 | -    function show_merge_tags() { | |
| 219 | - // Show the merge tags if the field is a list view | |
| 220 | - $is_list = preg_match( '/_list-/ism', $this->name ); | |
| 221 | - // Or is a single entry view | |
| 222 | - $is_single = preg_match( '/single_/ism', $this->name ); | |
| 223 | - | |
| 224 | - return ( $is_single || $is_list ); | |
| 225 | - } | |
| 226 | - | |
| 227 | - | |
| 228 | - | |
| 229 | - /** | |
| 230 | - * important! Override this class | |
| 231 | - * outputs the field option html | |
| 232 | - */ | |
| 233 | -    function render_option() { | |
| 234 | - // to replace on each field | |
| 235 | - } | |
| 236 | - | |
| 237 | - /** | |
| 238 | - * important! Override this class if needed | |
| 239 | - * outputs the field setting html | |
| 240 | - */ | |
| 241 | -    function render_setting( $override_input = NULL ) { | |
| 242 | - | |
| 243 | -        if( !empty( $this->field['full_width'] ) ) { ?> | |
| 196 | + /** | |
| 197 | + * Retrieve field label class | |
| 198 | + * @return string | |
| 199 | + */ | |
| 200 | +	function get_label_class() { | |
| 201 | + return 'gv-label-'. sanitize_html_class( $this->field['type'] ); | |
| 202 | + } | |
| 203 | + | |
| 204 | + | |
| 205 | + /** | |
| 206 | + * Retrieve field description | |
| 207 | + * @return string | |
| 208 | + */ | |
| 209 | +	function get_field_desc() { | |
| 210 | + return !empty( $this->field['desc'] ) ? '<span class="howto">'. $this->field['desc'] .'</span>' : ''; | |
| 211 | + } | |
| 212 | + | |
| 213 | + | |
| 214 | + /** | |
| 215 | + * Verify if field should have merge tags | |
| 216 | + * @return boolean | |
| 217 | + */ | |
| 218 | +	function show_merge_tags() { | |
| 219 | + // Show the merge tags if the field is a list view | |
| 220 | + $is_list = preg_match( '/_list-/ism', $this->name ); | |
| 221 | + // Or is a single entry view | |
| 222 | + $is_single = preg_match( '/single_/ism', $this->name ); | |
| 223 | + | |
| 224 | + return ( $is_single || $is_list ); | |
| 225 | + } | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + /** | |
| 230 | + * important! Override this class | |
| 231 | + * outputs the field option html | |
| 232 | + */ | |
| 233 | +	function render_option() { | |
| 234 | + // to replace on each field | |
| 235 | + } | |
| 236 | + | |
| 237 | + /** | |
| 238 | + * important! Override this class if needed | |
| 239 | + * outputs the field setting html | |
| 240 | + */ | |
| 241 | +	function render_setting( $override_input = NULL ) { | |
| 242 | + | |
| 243 | +		if( !empty( $this->field['full_width'] ) ) { ?> | |
| 244 | 244 | <th scope="row" colspan="2"> | 
| 245 | 245 | <div> | 
| 246 | 246 | <label for="<?php echo $this->get_field_id(); ?>"> | 
| @@ -260,14 +260,14 @@ discard block | ||
| 260 | 260 | </td> | 
| 261 | 261 | <?php } | 
| 262 | 262 | |
| 263 | - } | |
| 263 | + } | |
| 264 | 264 | |
| 265 | - /** | |
| 266 | - * important! Override this class | |
| 267 | - * outputs the input html part | |
| 268 | - */ | |
| 269 | -    function render_input( $override_input ) { | |
| 270 | - echo ''; | |
| 271 | - } | |
| 265 | + /** | |
| 266 | + * important! Override this class | |
| 267 | + * outputs the input html part | |
| 268 | + */ | |
| 269 | +	function render_input( $override_input ) { | |
| 270 | + echo ''; | |
| 271 | + } | |
| 272 | 272 | |
| 273 | 273 | } | 
| @@ -27,32 +27,32 @@ discard block | ||
| 27 | 27 | add_filter( 'gravityview_blacklist_field_types', array( $this, 'default_field_blacklist' ), 10, 2 ); | 
| 28 | 28 | |
| 29 | 29 | // Tooltips | 
| 30 | - add_filter( 'gform_tooltips', array( $this, 'tooltips') ); | |
| 30 | + add_filter( 'gform_tooltips', array( $this, 'tooltips' ) ); | |
| 31 | 31 | |
| 32 | 32 | // adding styles and scripts | 
| 33 | - add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles'), 999 ); | |
| 34 | - add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict') ); | |
| 35 | - add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict') ); | |
| 36 | - add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict') ); | |
| 37 | - add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict') ); | |
| 38 | - | |
| 39 | - add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas'), 10, 4 ); | |
| 40 | - add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas'), 10, 3 ); | |
| 41 | - add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers'), 10, 2 ); | |
| 42 | - add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields'), 10, 2 ); | |
| 43 | - add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets') ); | |
| 44 | - add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas'), 10, 5 ); | |
| 33 | + add_action( 'admin_enqueue_scripts', array( 'GravityView_Admin_Views', 'add_scripts_and_styles' ), 999 ); | |
| 34 | + add_filter( 'gform_noconflict_styles', array( $this, 'register_no_conflict' ) ); | |
| 35 | + add_filter( 'gform_noconflict_scripts', array( $this, 'register_no_conflict' ) ); | |
| 36 | + add_filter( 'gravityview_noconflict_styles', array( $this, 'register_no_conflict' ) ); | |
| 37 | + add_filter( 'gravityview_noconflict_scripts', array( $this, 'register_no_conflict' ) ); | |
| 38 | + | |
| 39 | + add_action( 'gravityview_render_directory_active_areas', array( $this, 'render_directory_active_areas' ), 10, 4 ); | |
| 40 | + add_action( 'gravityview_render_widgets_active_areas', array( $this, 'render_widgets_active_areas' ), 10, 3 ); | |
| 41 | + add_action( 'gravityview_render_field_pickers', array( $this, 'render_field_pickers' ), 10, 2 ); | |
| 42 | + add_action( 'gravityview_render_available_fields', array( $this, 'render_available_fields' ), 10, 2 ); | |
| 43 | + add_action( 'gravityview_render_available_widgets', array( $this, 'render_available_widgets' ) ); | |
| 44 | + add_action( 'gravityview_render_active_areas', array( $this, 'render_active_areas' ), 10, 5 ); | |
| 45 | 45 | |
| 46 | 46 | // @todo check if this hook is needed.. | 
| 47 | 47 | //add_action( 'gravityview_render_field_options', array( $this, 'render_field_options'), 10, 9 ); | 
| 48 | 48 | |
| 49 | 49 | // Add Connected Form column | 
| 50 | -		add_filter('manage_gravityview_posts_columns' , array( $this, 'add_post_type_columns' ) ); | |
| 50 | + add_filter( 'manage_gravityview_posts_columns', array( $this, 'add_post_type_columns' ) ); | |
| 51 | 51 | |
| 52 | 52 | add_filter( 'gform_toolbar_menu', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 ); | 
| 53 | 53 | add_action( 'gform_form_actions', array( 'GravityView_Admin_Views', 'gform_toolbar_menu' ), 10, 2 ); | 
| 54 | 54 | |
| 55 | - add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content'), 10, 2 ); | |
| 55 | + add_action( 'manage_gravityview_posts_custom_column', array( $this, 'add_custom_column_content' ), 10, 2 ); | |
| 56 | 56 | |
| 57 | 57 | add_action( 'restrict_manage_posts', array( $this, 'add_view_dropdown' ) ); | 
| 58 | 58 | |
| @@ -71,11 +71,11 @@ discard block | ||
| 71 | 71 | */ | 
| 72 | 72 |  	function suggest_support_articles( $localization_data = array() ) { | 
| 73 | 73 | |
| 74 | -	    if( ! gravityview()->request->is_view() ) { | |
| 74 | +	    if ( ! gravityview()->request->is_view() ) { | |
| 75 | 75 | return $localization_data; | 
| 76 | 76 | } | 
| 77 | 77 | |
| 78 | - $localization_data['suggest'] = array( | |
| 78 | + $localization_data[ 'suggest' ] = array( | |
| 79 | 79 | '57ef23539033602e61d4a560', | 
| 80 | 80 | '54c67bb9e4b0512429885513', | 
| 81 | 81 | '54c67bb9e4b0512429885512', | 
| @@ -96,13 +96,13 @@ discard block | ||
| 96 | 96 |  	public function filter_pre_get_posts_by_gravityview_form_id( &$query ) { | 
| 97 | 97 | global $pagenow; | 
| 98 | 98 | |
| 99 | -		if ( !is_admin() ) { | |
| 99 | +		if ( ! is_admin() ) { | |
| 100 | 100 | return; | 
| 101 | 101 | } | 
| 102 | 102 | |
| 103 | - $form_id = isset( $_GET['gravityview_form_id'] ) ? (int) $_GET['gravityview_form_id'] : false; | |
| 103 | + $form_id = isset( $_GET[ 'gravityview_form_id' ] ) ? (int)$_GET[ 'gravityview_form_id' ] : false; | |
| 104 | 104 | |
| 105 | -		if( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) { | |
| 105 | +		if ( 'edit.php' !== $pagenow || ! $form_id || ! isset( $query->query_vars[ 'post_type' ] ) ) { | |
| 106 | 106 | return; | 
| 107 | 107 | } | 
| 108 | 108 | |
| @@ -119,18 +119,18 @@ discard block | ||
| 119 | 119 |  	function add_view_dropdown() { | 
| 120 | 120 | $current_screen = get_current_screen(); | 
| 121 | 121 | |
| 122 | -		if( 'gravityview' !== $current_screen->post_type ) { | |
| 122 | +		if ( 'gravityview' !== $current_screen->post_type ) { | |
| 123 | 123 | return; | 
| 124 | 124 | } | 
| 125 | 125 | |
| 126 | 126 | $forms = gravityview_get_forms(); | 
| 127 | 127 | $current_form = \GV\Utils::_GET( 'gravityview_form_id' ); | 
| 128 | 128 | // If there are no forms to select, show no forms. | 
| 129 | -		if( !empty( $forms ) ) { ?> | |
| 129 | +		if ( ! empty( $forms ) ) { ?> | |
| 130 | 130 | <select name="gravityview_form_id" id="gravityview_form_id"> | 
| 131 | 131 | <option value="" <?php selected( '', $current_form, true ); ?>><?php esc_html_e( 'All forms', 'gravityview' ); ?></option> | 
| 132 | -				<?php foreach( $forms as $form ) { ?> | |
| 133 | - <option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option> | |
| 132 | +				<?php foreach ( $forms as $form ) { ?> | |
| 133 | + <option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option> | |
| 134 | 134 | <?php } ?> | 
| 135 | 135 | </select> | 
| 136 | 136 | <?php } | 
| @@ -143,7 +143,7 @@ discard block | ||
| 143 | 143 | */ | 
| 144 | 144 |  	public static function render_setting_row( $key = '', $current_settings = array(), $override_input = null, $name = 'template_settings[%s]', $id = 'gravityview_se_%s' ) { | 
| 145 | 145 | _deprecated_function( 'GravityView_Admin_Views::render_setting_row', '1.1.7', 'GravityView_Render_Settings::render_setting_row' ); | 
| 146 | - GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name , $id ); | |
| 146 | + GravityView_Render_Settings::render_setting_row( $key, $current_settings, $override_input, $name, $id ); | |
| 147 | 147 | } | 
| 148 | 148 | |
| 149 | 149 | /** | 
| @@ -165,7 +165,7 @@ discard block | ||
| 165 | 165 |  	public static function gform_toolbar_menu( $menu_items = array(), $id = NULL ) { | 
| 166 | 166 | |
| 167 | 167 | // Don't show on Trashed forms | 
| 168 | -		if( 'trash' === rgget( 'filter') ) { | |
| 168 | +		if ( 'trash' === rgget( 'filter' ) ) { | |
| 169 | 169 | return $menu_items; | 
| 170 | 170 | } | 
| 171 | 171 | |
| @@ -173,13 +173,13 @@ discard block | ||
| 173 | 173 | |
| 174 | 174 | $priority = 0; | 
| 175 | 175 | |
| 176 | -		if( 'form_list' === GFForms::get_page() ) { | |
| 176 | +		if ( 'form_list' === GFForms::get_page() ) { | |
| 177 | 177 | $priority = 790; | 
| 178 | 178 | } | 
| 179 | 179 | |
| 180 | -		if( empty( $connected_views ) ) { | |
| 180 | +		if ( empty( $connected_views ) ) { | |
| 181 | 181 | |
| 182 | - $menu_items['gravityview'] = array( | |
| 182 | + $menu_items[ 'gravityview' ] = array( | |
| 183 | 183 | 'label' => esc_attr__( 'Create a View', 'gravityview' ), | 
| 184 | 184 | 'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', | 
| 185 | 185 | 'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ), | 
| @@ -195,22 +195,22 @@ discard block | ||
| 195 | 195 | $sub_menu_items = array(); | 
| 196 | 196 |  		foreach ( (array)$connected_views as $view ) { | 
| 197 | 197 | |
| 198 | -			if( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) { | |
| 198 | +			if ( ! GVCommon::has_cap( 'edit_gravityview', $view->ID ) ) { | |
| 199 | 199 | continue; | 
| 200 | 200 | } | 
| 201 | 201 | |
| 202 | -			$label = empty( $view->post_title ) ? sprintf( __('No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title; | |
| 202 | + $label = empty( $view->post_title ) ? sprintf( __( 'No Title (View #%d)', 'gravityview' ), $view->ID ) : $view->post_title; | |
| 203 | 203 | |
| 204 | - $sub_menu_items[] = array( | |
| 204 | + $sub_menu_items[ ] = array( | |
| 205 | 205 | 'label' => esc_attr( $label ), | 
| 206 | - 'url' => admin_url( 'post.php?action=edit&post='.$view->ID ), | |
| 206 | + 'url' => admin_url( 'post.php?action=edit&post=' . $view->ID ), | |
| 207 | 207 | ); | 
| 208 | 208 | } | 
| 209 | 209 | |
| 210 | 210 | // If there were no items added, then let's create the parent menu | 
| 211 | -		if( $sub_menu_items ) { | |
| 211 | +		if ( $sub_menu_items ) { | |
| 212 | 212 | |
| 213 | - $sub_menu_items[] = array( | |
| 213 | + $sub_menu_items[ ] = array( | |
| 214 | 214 | 'label' => esc_attr__( 'Create a View', 'gravityview' ), | 
| 215 | 215 | 'link_class' => 'gv-create-view', | 
| 216 | 216 | 'title' => esc_attr__( 'Create a View using this form as a data source', 'gravityview' ), | 
| @@ -219,14 +219,14 @@ discard block | ||
| 219 | 219 | ); | 
| 220 | 220 | |
| 221 | 221 | // Make sure Gravity Forms uses the submenu; if there's only one item, it uses a link instead of a dropdown | 
| 222 | - $sub_menu_items[] = array( | |
| 222 | + $sub_menu_items[ ] = array( | |
| 223 | 223 | 'url' => '#', | 
| 224 | 224 | 'label' => '', | 
| 225 | 225 | 'menu_class' => 'hidden', | 
| 226 | 226 | 'capabilities' => '', | 
| 227 | 227 | ); | 
| 228 | 228 | |
| 229 | - $menu_items['gravityview'] = array( | |
| 229 | + $menu_items[ 'gravityview' ] = array( | |
| 230 | 230 | 'label' => __( 'Connected Views', 'gravityview' ), | 
| 231 | 231 | 'icon' => '<i class="fa fa-lg gv-icon-astronaut-head gv-icon"></i>', | 
| 232 | 232 | 'title' => __( 'GravityView Views using this form as a data source', 'gravityview' ), | 
| @@ -254,8 +254,8 @@ discard block | ||
| 254 | 254 | $add = array( 'captcha', 'page' ); | 
| 255 | 255 | |
| 256 | 256 | // Don't allowing editing the following values: | 
| 257 | -		if( $context === 'edit' ) { | |
| 258 | - $add[] = 'post_id'; | |
| 257 | +		if ( $context === 'edit' ) { | |
| 258 | + $add[ ] = 'post_id'; | |
| 259 | 259 | } | 
| 260 | 260 | |
| 261 | 261 | $return = array_merge( $array, $add ); | 
| @@ -278,27 +278,27 @@ discard block | ||
| 278 | 278 |  		foreach ( $default_args as $key => $arg ) { | 
| 279 | 279 | |
| 280 | 280 | // If an arg has `tooltip` defined, but it's false, don't display a tooltip | 
| 281 | -			if( isset( $arg['tooltip'] ) && empty( $arg['tooltip'] ) ) { continue; } | |
| 281 | +			if ( isset( $arg[ 'tooltip' ] ) && empty( $arg[ 'tooltip' ] ) ) { continue; } | |
| 282 | 282 | |
| 283 | 283 | // By default, use `tooltip` if defined. | 
| 284 | - $tooltip = empty( $arg['tooltip'] ) ? NULL : $arg['tooltip']; | |
| 284 | + $tooltip = empty( $arg[ 'tooltip' ] ) ? NULL : $arg[ 'tooltip' ]; | |
| 285 | 285 | |
| 286 | 286 | // If there's no tooltip set, continue | 
| 287 | -			if( empty( $tooltip ) ) { | |
| 287 | +			if ( empty( $tooltip ) ) { | |
| 288 | 288 | continue; | 
| 289 | 289 | } | 
| 290 | 290 | |
| 291 | 291 | // Add the tooltip | 
| 292 | - $gv_tooltips[ 'gv_'.$key ] = array( | |
| 293 | - 'title' => $arg['label'], | |
| 292 | + $gv_tooltips[ 'gv_' . $key ] = array( | |
| 293 | + 'title' => $arg[ 'label' ], | |
| 294 | 294 | 'value' => $tooltip, | 
| 295 | 295 | ); | 
| 296 | 296 | |
| 297 | 297 | } | 
| 298 | 298 | |
| 299 | - $gv_tooltips['gv_css_merge_tags'] = array( | |
| 300 | -			'title' => __('CSS Merge Tags', 'gravityview'), | |
| 301 | - 'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview'), '<code>', '</code>' ) | |
| 299 | + $gv_tooltips[ 'gv_css_merge_tags' ] = array( | |
| 300 | + 'title' => __( 'CSS Merge Tags', 'gravityview' ), | |
| 301 | + 'value' => sprintf( __( 'Developers: The CSS classes will be sanitized using the %ssanitize_title_with_dashes()%s function.', 'gravityview' ), '<code>', '</code>' ) | |
| 302 | 302 | ); | 
| 303 | 303 | |
| 304 | 304 | /** | 
| @@ -316,9 +316,9 @@ discard block | ||
| 316 | 316 | |
| 317 | 317 |  		foreach ( $gv_tooltips as $key => $tooltip ) { | 
| 318 | 318 | |
| 319 | - $title = empty( $tooltip['title'] ) ? '' : '<h6>'.esc_html( $tooltip['title'] ) .'</h6>'; | |
| 319 | + $title = empty( $tooltip[ 'title' ] ) ? '' : '<h6>' . esc_html( $tooltip[ 'title' ] ) . '</h6>'; | |
| 320 | 320 | |
| 321 | - $tooltips[ $key ] = $title . wpautop( esc_html( $tooltip['value'] ) ); | |
| 321 | + $tooltips[ $key ] = $title . wpautop( esc_html( $tooltip[ 'value' ] ) ); | |
| 322 | 322 | } | 
| 323 | 323 | |
| 324 | 324 | return $tooltips; | 
| @@ -332,7 +332,7 @@ discard block | ||
| 332 | 332 | * | 
| 333 | 333 | * @return void | 
| 334 | 334 | */ | 
| 335 | -	public function add_custom_column_content( $column_name = NULL, $post_id )	{ | |
| 335 | +	public function add_custom_column_content( $column_name = NULL, $post_id ) { | |
| 336 | 336 | |
| 337 | 337 | $output = ''; | 
| 338 | 338 | |
| @@ -354,7 +354,7 @@ discard block | ||
| 354 | 354 | // Generate backup if label doesn't exist: `example_name` => `Example Name` | 
| 355 | 355 | $template_id_pretty = ucwords( implode( ' ', explode( '_', $template_id ) ) ); | 
| 356 | 356 | |
| 357 | - $output = $template ? $template['label'] : $template_id_pretty; | |
| 357 | + $output = $template ? $template[ 'label' ] : $template_id_pretty; | |
| 358 | 358 | |
| 359 | 359 | break; | 
| 360 | 360 | |
| @@ -395,44 +395,44 @@ discard block | ||
| 395 | 395 |  	static public function get_connected_form_links( $form, $include_form_link = true ) { | 
| 396 | 396 | |
| 397 | 397 | // Either the form is empty or the form ID is 0, not yet set. | 
| 398 | -		if( empty( $form ) ) { | |
| 398 | +		if ( empty( $form ) ) { | |
| 399 | 399 | return ''; | 
| 400 | 400 | } | 
| 401 | 401 | |
| 402 | 402 | // The $form is passed as the form ID | 
| 403 | -		if( !is_array( $form ) ) { | |
| 403 | +		if ( ! is_array( $form ) ) { | |
| 404 | 404 | $form = gravityview_get_form( $form ); | 
| 405 | 405 | } | 
| 406 | 406 | |
| 407 | - $form_id = $form['id']; | |
| 407 | + $form_id = $form[ 'id' ]; | |
| 408 | 408 | $links = array(); | 
| 409 | 409 | |
| 410 | -		if( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) { | |
| 410 | +		if ( GVCommon::has_cap( 'gravityforms_edit_forms' ) ) { | |
| 411 | 411 | $form_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&id=%d', $form_id ) ); | 
| 412 | - $form_link = '<strong class="gv-form-title">'.gravityview_get_link( $form_url, $form['title'], 'class=row-title' ).'</strong>'; | |
| 413 | -			$links[] = '<span>'.gravityview_get_link( $form_url, __('Edit Form', 'gravityview') ).'</span>'; | |
| 412 | + $form_link = '<strong class="gv-form-title">' . gravityview_get_link( $form_url, $form[ 'title' ], 'class=row-title' ) . '</strong>'; | |
| 413 | + $links[ ] = '<span>' . gravityview_get_link( $form_url, __( 'Edit Form', 'gravityview' ) ) . '</span>'; | |
| 414 | 414 |  		} else { | 
| 415 | - $form_link = '<strong class="gv-form-title">'. esc_html( $form['title'] ). '</strong>'; | |
| 415 | + $form_link = '<strong class="gv-form-title">' . esc_html( $form[ 'title' ] ) . '</strong>'; | |
| 416 | 416 | } | 
| 417 | 417 | |
| 418 | -		if( GVCommon::has_cap( 'gravityforms_view_entries' ) ) { | |
| 418 | +		if ( GVCommon::has_cap( 'gravityforms_view_entries' ) ) { | |
| 419 | 419 | $entries_url = admin_url( sprintf( 'admin.php?page=gf_entries&id=%d', $form_id ) ); | 
| 420 | -			$links[] = '<span>'.gravityview_get_link( $entries_url, __('Entries', 'gravityview') ).'</span>'; | |
| 420 | + $links[ ] = '<span>' . gravityview_get_link( $entries_url, __( 'Entries', 'gravityview' ) ) . '</span>'; | |
| 421 | 421 | } | 
| 422 | 422 | |
| 423 | -		if( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) { | |
| 423 | +		if ( GVCommon::has_cap( array( 'gravityforms_edit_settings', 'gravityview_view_settings' ) ) ) { | |
| 424 | 424 | $settings_url = admin_url( sprintf( 'admin.php?page=gf_edit_forms&view=settings&id=%d', $form_id ) ); | 
| 425 | -			$links[] = '<span>'.gravityview_get_link( $settings_url, __('Settings', 'gravityview'), 'title='.__('Edit settings for this form', 'gravityview') ).'</span>'; | |
| 425 | + $links[ ] = '<span>' . gravityview_get_link( $settings_url, __( 'Settings', 'gravityview' ), 'title=' . __( 'Edit settings for this form', 'gravityview' ) ) . '</span>'; | |
| 426 | 426 | } | 
| 427 | 427 | |
| 428 | -		if( GVCommon::has_cap( array("gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms") ) ) { | |
| 428 | +		if ( GVCommon::has_cap( array( "gravityforms_edit_forms", "gravityforms_create_form", "gravityforms_preview_forms" ) ) ) { | |
| 429 | 429 | $preview_url = site_url( sprintf( '?gf_page=preview&id=%d', $form_id ) ); | 
| 430 | -			$links[] = '<span>'.gravityview_get_link( $preview_url, __('Preview Form', 'gravityview'), 'title='.__('Preview this form', 'gravityview') ).'</span>'; | |
| 430 | + $links[ ] = '<span>' . gravityview_get_link( $preview_url, __( 'Preview Form', 'gravityview' ), 'title=' . __( 'Preview this form', 'gravityview' ) ) . '</span>'; | |
| 431 | 431 | } | 
| 432 | 432 | |
| 433 | 433 | $output = ''; | 
| 434 | 434 | |
| 435 | -		if( !empty( $include_form_link ) ) { | |
| 435 | +		if ( ! empty( $include_form_link ) ) { | |
| 436 | 436 | $output .= $form_link; | 
| 437 | 437 | } | 
| 438 | 438 | |
| @@ -444,7 +444,7 @@ discard block | ||
| 444 | 444 | */ | 
| 445 | 445 | $links = apply_filters( 'gravityview_connected_form_links', $links, $form ); | 
| 446 | 446 | |
| 447 | - $output .= '<div class="row-actions">'. implode( ' | ', $links ) .'</div>'; | |
| 447 | + $output .= '<div class="row-actions">' . implode( ' | ', $links ) . '</div>'; | |
| 448 | 448 | |
| 449 | 449 | return $output; | 
| 450 | 450 | } | 
| @@ -458,8 +458,8 @@ discard block | ||
| 458 | 458 | // Get the date column and save it for later to add back in. | 
| 459 | 459 | // This adds it after the Data Source column. | 
| 460 | 460 | // This way, we don't need to do array_slice, array_merge, etc. | 
| 461 | - $date = $columns['date']; | |
| 462 | - unset( $columns['date'] ); | |
| 461 | + $date = $columns[ 'date' ]; | |
| 462 | + unset( $columns[ 'date' ] ); | |
| 463 | 463 | |
| 464 | 464 | $data_source_required_caps = array( | 
| 465 | 465 | 'gravityforms_edit_forms', | 
| @@ -470,14 +470,14 @@ discard block | ||
| 470 | 470 | 'gravityforms_preview_forms', | 
| 471 | 471 | ); | 
| 472 | 472 | |
| 473 | -		if( GVCommon::has_cap( $data_source_required_caps ) ) { | |
| 474 | - $columns['gv_connected_form'] = __( 'Data Source', 'gravityview' ); | |
| 473 | +		if ( GVCommon::has_cap( $data_source_required_caps ) ) { | |
| 474 | + $columns[ 'gv_connected_form' ] = __( 'Data Source', 'gravityview' ); | |
| 475 | 475 | } | 
| 476 | 476 | |
| 477 | - $columns['gv_template'] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' ); | |
| 477 | + $columns[ 'gv_template' ] = _x( 'Template', 'Column title that shows what template is being used for Views', 'gravityview' ); | |
| 478 | 478 | |
| 479 | 479 | // Add the date back in. | 
| 480 | - $columns['date'] = $date; | |
| 480 | + $columns[ 'date' ] = $date; | |
| 481 | 481 | |
| 482 | 482 | return $columns; | 
| 483 | 483 | } | 
| @@ -490,12 +490,12 @@ discard block | ||
| 490 | 490 | */ | 
| 491 | 491 |  	function save_postdata( $post_id ) { | 
| 492 | 492 | |
| 493 | -		if( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ){ | |
| 493 | +		if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) { | |
| 494 | 494 | return; | 
| 495 | 495 | } | 
| 496 | 496 | |
| 497 | 497 | // validate post_type | 
| 498 | -		if ( ! isset( $_POST['post_type'] ) || 'gravityview' != $_POST['post_type'] ) { | |
| 498 | +		if ( ! isset( $_POST[ 'post_type' ] ) || 'gravityview' != $_POST[ 'post_type' ] ) { | |
| 499 | 499 | return; | 
| 500 | 500 | } | 
| 501 | 501 | |
| @@ -510,63 +510,63 @@ discard block | ||
| 510 | 510 | $statii = array(); | 
| 511 | 511 | |
| 512 | 512 | // check if this is a start fresh View | 
| 513 | -		if ( isset( $_POST['gravityview_select_form_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_form_nonce'], 'gravityview_select_form' ) ) { | |
| 513 | +		if ( isset( $_POST[ 'gravityview_select_form_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_form_nonce' ], 'gravityview_select_form' ) ) { | |
| 514 | 514 | |
| 515 | - $form_id = !empty( $_POST['gravityview_form_id'] ) ? $_POST['gravityview_form_id'] : ''; | |
| 515 | + $form_id = ! empty( $_POST[ 'gravityview_form_id' ] ) ? $_POST[ 'gravityview_form_id' ] : ''; | |
| 516 | 516 | // save form id | 
| 517 | - $statii['form_id'] = update_post_meta( $post_id, '_gravityview_form_id', $form_id ); | |
| 517 | + $statii[ 'form_id' ] = update_post_meta( $post_id, '_gravityview_form_id', $form_id ); | |
| 518 | 518 | |
| 519 | 519 | } | 
| 520 | 520 | |
| 521 | -		if( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii['form_id'] ) ) { | |
| 521 | +		if ( false === GVCommon::has_cap( 'gravityforms_create_form' ) && empty( $statii[ 'form_id' ] ) ) { | |
| 522 | 522 | gravityview()->log->error( 'Current user does not have the capability to create a new Form.', array( 'data' => wp_get_current_user() ) ); | 
| 523 | 523 | return; | 
| 524 | 524 | } | 
| 525 | 525 | |
| 526 | 526 | // Was this a start fresh? | 
| 527 | -		if ( ! empty( $_POST['gravityview_form_id_start_fresh'] ) ) { | |
| 528 | - $statii['start_fresh'] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 ); | |
| 527 | +		if ( ! empty( $_POST[ 'gravityview_form_id_start_fresh' ] ) ) { | |
| 528 | + $statii[ 'start_fresh' ] = add_post_meta( $post_id, '_gravityview_start_fresh', 1 ); | |
| 529 | 529 |  		} else { | 
| 530 | - $statii['start_fresh'] = delete_post_meta( $post_id, '_gravityview_start_fresh' ); | |
| 530 | + $statii[ 'start_fresh' ] = delete_post_meta( $post_id, '_gravityview_start_fresh' ); | |
| 531 | 531 | } | 
| 532 | 532 | |
| 533 | 533 | // Check if we have a template id | 
| 534 | -		if ( isset( $_POST['gravityview_select_template_nonce'] ) && wp_verify_nonce( $_POST['gravityview_select_template_nonce'], 'gravityview_select_template' ) ) { | |
| 534 | +		if ( isset( $_POST[ 'gravityview_select_template_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_select_template_nonce' ], 'gravityview_select_template' ) ) { | |
| 535 | 535 | |
| 536 | - $template_id = !empty( $_POST['gravityview_directory_template'] ) ? $_POST['gravityview_directory_template'] : ''; | |
| 536 | + $template_id = ! empty( $_POST[ 'gravityview_directory_template' ] ) ? $_POST[ 'gravityview_directory_template' ] : ''; | |
| 537 | 537 | |
| 538 | 538 | // now save template id | 
| 539 | - $statii['directory_template'] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id ); | |
| 539 | + $statii[ 'directory_template' ] = update_post_meta( $post_id, '_gravityview_directory_template', $template_id ); | |
| 540 | 540 | } | 
| 541 | 541 | |
| 542 | 542 | |
| 543 | 543 | // save View Configuration metabox | 
| 544 | -		if ( isset( $_POST['gravityview_view_configuration_nonce'] ) && wp_verify_nonce( $_POST['gravityview_view_configuration_nonce'], 'gravityview_view_configuration' ) ) { | |
| 544 | +		if ( isset( $_POST[ 'gravityview_view_configuration_nonce' ] ) && wp_verify_nonce( $_POST[ 'gravityview_view_configuration_nonce' ], 'gravityview_view_configuration' ) ) { | |
| 545 | 545 | |
| 546 | 546 | // template settings | 
| 547 | -			if( empty( $_POST['template_settings'] ) ) { | |
| 548 | - $_POST['template_settings'] = array(); | |
| 547 | +			if ( empty( $_POST[ 'template_settings' ] ) ) { | |
| 548 | + $_POST[ 'template_settings' ] = array(); | |
| 549 | 549 | } | 
| 550 | - $statii['template_settings'] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST['template_settings'] ); | |
| 550 | + $statii[ 'template_settings' ] = update_post_meta( $post_id, '_gravityview_template_settings', $_POST[ 'template_settings' ] ); | |
| 551 | 551 | |
| 552 | 552 | // guard against unloaded View configuration page | 
| 553 | -			if ( isset( $_POST['gv_fields'] ) && isset( $_POST['gv_fields_done'] ) ) { | |
| 553 | +			if ( isset( $_POST[ 'gv_fields' ] ) && isset( $_POST[ 'gv_fields_done' ] ) ) { | |
| 554 | 554 | $fields = array(); | 
| 555 | 555 | |
| 556 | -				if ( ! empty( $_POST['gv_fields'] ) ) { | |
| 556 | +				if ( ! empty( $_POST[ 'gv_fields' ] ) ) { | |
| 557 | 557 | $fields = _gravityview_process_posted_fields(); | 
| 558 | 558 | } | 
| 559 | 559 | |
| 560 | 560 | $fields = wp_slash( $fields ); | 
| 561 | 561 | |
| 562 | - $statii['directory_fields'] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields ); | |
| 562 | + $statii[ 'directory_fields' ] = update_post_meta( $post_id, '_gravityview_directory_fields', $fields ); | |
| 563 | 563 | } | 
| 564 | 564 | |
| 565 | 565 | // Directory Visible Widgets | 
| 566 | -			if( empty( $_POST['widgets'] ) ) { | |
| 567 | - $_POST['widgets'] = array(); | |
| 566 | +			if ( empty( $_POST[ 'widgets' ] ) ) { | |
| 567 | + $_POST[ 'widgets' ] = array(); | |
| 568 | 568 | } | 
| 569 | - $statii['directory_widgets'] = gravityview_set_directory_widgets( $post_id, $_POST['widgets'] ); | |
| 569 | + $statii[ 'directory_widgets' ] = gravityview_set_directory_widgets( $post_id, $_POST[ 'widgets' ] ); | |
| 570 | 570 | |
| 571 | 571 | } // end save view configuration | 
| 572 | 572 | |
| @@ -576,7 +576,7 @@ discard block | ||
| 576 | 576 | * @param array $statii Array of statuses of the post meta saving processes. If saving worked, each key should be mapped to a value of the post ID (`directory_widgets` => `124`). If failed (or didn't change), the value will be false. | 
| 577 | 577 | * @since 1.17.2 | 
| 578 | 578 | */ | 
| 579 | -		do_action('gravityview_view_saved', $post_id, $statii ); | |
| 579 | + do_action( 'gravityview_view_saved', $post_id, $statii ); | |
| 580 | 580 | |
| 581 | 581 | gravityview()->log->debug( '[save_postdata] Update Post Meta Statuses (also returns false if nothing changed)', array( 'data' => array_map( 'intval', $statii ) ) ); | 
| 582 | 582 | } | 
| @@ -621,20 +621,20 @@ discard block | ||
| 621 | 621 | |
| 622 | 622 | $output = ''; | 
| 623 | 623 | |
| 624 | -		if( !empty( $fields ) ) { | |
| 624 | +		if ( ! empty( $fields ) ) { | |
| 625 | 625 | |
| 626 | -			foreach( $fields as $id => $details ) { | |
| 626 | +			foreach ( $fields as $id => $details ) { | |
| 627 | 627 | |
| 628 | -				if( in_array( $details['type'], (array) $blacklist_field_types ) ) { | |
| 628 | +				if ( in_array( $details[ 'type' ], (array)$blacklist_field_types ) ) { | |
| 629 | 629 | continue; | 
| 630 | 630 | } | 
| 631 | 631 | |
| 632 | 632 | // Edit mode only allows editing the parent fields, not single inputs. | 
| 633 | -				if( $context === 'edit' && ! empty( $details['parent'] ) ) { | |
| 633 | +				if ( $context === 'edit' && ! empty( $details[ 'parent' ] ) ) { | |
| 634 | 634 | continue; | 
| 635 | 635 | } | 
| 636 | 636 | |
| 637 | - $output .= new GravityView_Admin_View_Field( $details['label'], $id, $details, array(), $form ); | |
| 637 | + $output .= new GravityView_Admin_View_Field( $details[ 'label' ], $id, $details, array(), $form ); | |
| 638 | 638 | |
| 639 | 639 | } // End foreach | 
| 640 | 640 | } | 
| @@ -642,7 +642,7 @@ discard block | ||
| 642 | 642 | echo $output; | 
| 643 | 643 | |
| 644 | 644 | // For the EDIT view we only want to allow the form fields. | 
| 645 | -		if( $context === 'edit' ) { | |
| 645 | +		if ( $context === 'edit' ) { | |
| 646 | 646 | return; | 
| 647 | 647 | } | 
| 648 | 648 | |
| @@ -661,7 +661,7 @@ discard block | ||
| 661 | 661 | $additional_fields = array( | 
| 662 | 662 | array( | 
| 663 | 663 | 'label_text' => '+ ' . __( 'Add All Form Fields', 'gravityview' ), | 
| 664 | -				'desc' => __('Insert all the form fields at once.', 'gravityview'), | |
| 664 | + 'desc' => __( 'Insert all the form fields at once.', 'gravityview' ), | |
| 665 | 665 | 'field_id' => 'all-fields', | 
| 666 | 666 | 'label_type' => 'field', | 
| 667 | 667 | 'input_type' => null, | 
| @@ -676,7 +676,7 @@ discard block | ||
| 676 | 676 | */ | 
| 677 | 677 | $additional_fields = apply_filters( 'gravityview_additional_fields', $additional_fields ); | 
| 678 | 678 | |
| 679 | -		foreach ( (array) $additional_fields as $item ) { | |
| 679 | +		foreach ( (array)$additional_fields as $item ) { | |
| 680 | 680 | |
| 681 | 681 | // Prevent items from not having index set | 
| 682 | 682 | $item = wp_parse_args( $item, array( | 
| @@ -686,16 +686,16 @@ discard block | ||
| 686 | 686 | 'input_type' => null, | 
| 687 | 687 | 'field_options' => null, | 
| 688 | 688 | 'settings_html' => null, | 
| 689 | - )); | |
| 689 | + ) ); | |
| 690 | 690 | |
| 691 | 691 | // Backward compat. | 
| 692 | -			if( !empty( $item['field_options'] ) ) { | |
| 692 | +			if ( ! empty( $item[ 'field_options' ] ) ) { | |
| 693 | 693 | // Use settings_html from now on. | 
| 694 | - $item['settings_html'] = $item['field_options']; | |
| 694 | + $item[ 'settings_html' ] = $item[ 'field_options' ]; | |
| 695 | 695 | } | 
| 696 | 696 | |
| 697 | 697 | // Render a label for each of them | 
| 698 | - echo new GravityView_Admin_View_Field( $item['label_text'], $item['field_id'], $item, $settings = array(), $form ); | |
| 698 | + echo new GravityView_Admin_View_Field( $item[ 'label_text' ], $item[ 'field_id' ], $item, $settings = array(), $form ); | |
| 699 | 699 | |
| 700 | 700 | } | 
| 701 | 701 | |
| @@ -707,59 +707,59 @@ discard block | ||
| 707 | 707 | * @param string $zone Either 'single', 'directory', 'header', 'footer' | 
| 708 | 708 | * @return array | 
| 709 | 709 | */ | 
| 710 | -	function get_entry_default_fields($form, $zone) { | |
| 710 | +	function get_entry_default_fields( $form, $zone ) { | |
| 711 | 711 | |
| 712 | 712 | $entry_default_fields = array(); | 
| 713 | 713 | |
| 714 | -		if( in_array( $zone, array( 'directory', 'single' ) ) ) { | |
| 714 | +		if ( in_array( $zone, array( 'directory', 'single' ) ) ) { | |
| 715 | 715 | |
| 716 | 716 | $entry_default_fields = array( | 
| 717 | 717 | 'id' => array( | 
| 718 | -					'label' => __('Entry ID', 'gravityview'), | |
| 718 | + 'label' => __( 'Entry ID', 'gravityview' ), | |
| 719 | 719 | 'type' => 'id', | 
| 720 | -					'desc'	=> __('The unique ID of the entry.', 'gravityview'), | |
| 720 | + 'desc' => __( 'The unique ID of the entry.', 'gravityview' ), | |
| 721 | 721 | ), | 
| 722 | 722 | 'date_created' => array( | 
| 723 | -					'label' => __('Entry Date', 'gravityview'), | |
| 724 | -					'desc'	=> __('The date the entry was created.', 'gravityview'), | |
| 723 | + 'label' => __( 'Entry Date', 'gravityview' ), | |
| 724 | + 'desc' => __( 'The date the entry was created.', 'gravityview' ), | |
| 725 | 725 | 'type' => 'date_created', | 
| 726 | 726 | ), | 
| 727 | 727 | 'date_updated' => array( | 
| 728 | - 'label' => __( 'Date Updated', 'gravityview'), | |
| 729 | -						'desc'	=> __('The date the entry was last updated.', 'gravityview'), | |
| 728 | + 'label' => __( 'Date Updated', 'gravityview' ), | |
| 729 | + 'desc' => __( 'The date the entry was last updated.', 'gravityview' ), | |
| 730 | 730 | 'type' => 'date_updated', | 
| 731 | 731 | ), | 
| 732 | 732 | 'source_url' => array( | 
| 733 | -					'label' => __('Source URL', 'gravityview'), | |
| 733 | + 'label' => __( 'Source URL', 'gravityview' ), | |
| 734 | 734 | 'type' => 'source_url', | 
| 735 | -					'desc'	=> __('The URL of the page where the form was submitted.', 'gravityview'), | |
| 735 | + 'desc' => __( 'The URL of the page where the form was submitted.', 'gravityview' ), | |
| 736 | 736 | ), | 
| 737 | 737 | 'ip' => array( | 
| 738 | -					'label' => __('User IP', 'gravityview'), | |
| 738 | + 'label' => __( 'User IP', 'gravityview' ), | |
| 739 | 739 | 'type' => 'ip', | 
| 740 | -					'desc'	=> __('The IP Address of the user who created the entry.', 'gravityview'), | |
| 740 | + 'desc' => __( 'The IP Address of the user who created the entry.', 'gravityview' ), | |
| 741 | 741 | ), | 
| 742 | 742 | 'created_by' => array( | 
| 743 | -					'label' => __('User', 'gravityview'), | |
| 743 | + 'label' => __( 'User', 'gravityview' ), | |
| 744 | 744 | 'type' => 'created_by', | 
| 745 | -					'desc'	=> __('Details of the logged-in user who created the entry (if any).', 'gravityview'), | |
| 745 | + 'desc' => __( 'Details of the logged-in user who created the entry (if any).', 'gravityview' ), | |
| 746 | 746 | ), | 
| 747 | 747 | |
| 748 | 748 | /** | 
| 749 | 749 | * @since 1.7.2 | 
| 750 | 750 | */ | 
| 751 | 751 | 'other_entries' => array( | 
| 752 | -				    'label'	=> __('Other Entries', 'gravityview'), | |
| 752 | + 'label' => __( 'Other Entries', 'gravityview' ), | |
| 753 | 753 | 'type' => 'other_entries', | 
| 754 | -				    'desc'	=> __('Display other entries created by the entry creator.', 'gravityview'), | |
| 754 | + 'desc' => __( 'Display other entries created by the entry creator.', 'gravityview' ), | |
| 755 | 755 | ), | 
| 756 | 756 | ); | 
| 757 | 757 | |
| 758 | -			if( 'single' !== $zone) { | |
| 758 | +			if ( 'single' !== $zone ) { | |
| 759 | 759 | |
| 760 | - $entry_default_fields['entry_link'] = array( | |
| 761 | -					'label' => __('Link to Entry', 'gravityview'), | |
| 762 | -					'desc'	=> __('A dedicated link to the single entry with customizable text.', 'gravityview'), | |
| 760 | + $entry_default_fields[ 'entry_link' ] = array( | |
| 761 | + 'label' => __( 'Link to Entry', 'gravityview' ), | |
| 762 | + 'desc' => __( 'A dedicated link to the single entry with customizable text.', 'gravityview' ), | |
| 763 | 763 | 'type' => 'entry_link', | 
| 764 | 764 | ); | 
| 765 | 765 | } | 
| @@ -769,19 +769,19 @@ discard block | ||
| 769 | 769 | /** | 
| 770 | 770 | * @since 1.2 | 
| 771 | 771 | */ | 
| 772 | - $entry_default_fields['custom'] = array( | |
| 773 | -			'label'	=> __('Custom Content', 'gravityview'), | |
| 772 | + $entry_default_fields[ 'custom' ] = array( | |
| 773 | + 'label' => __( 'Custom Content', 'gravityview' ), | |
| 774 | 774 | 'type' => 'custom', | 
| 775 | -			'desc'	=> __('Insert custom text or HTML.', 'gravityview'), | |
| 775 | + 'desc' => __( 'Insert custom text or HTML.', 'gravityview' ), | |
| 776 | 776 | ); | 
| 777 | 777 | |
| 778 | 778 | /** | 
| 779 | 779 | * @since develop | 
| 780 | 780 | */ | 
| 781 | - $entry_default_fields['sequence'] = array( | |
| 782 | -			'label'	=> __('Result Number', 'gravityview'), | |
| 781 | + $entry_default_fields[ 'sequence' ] = array( | |
| 782 | + 'label' => __( 'Result Number', 'gravityview' ), | |
| 783 | 783 | 'type' => 'sequence', | 
| 784 | -			'desc'	=> __('Display a sequential result number for each entry.', 'gravityview'), | |
| 784 | + 'desc' => __( 'Display a sequential result number for each entry.', 'gravityview' ), | |
| 785 | 785 | ); | 
| 786 | 786 | |
| 787 | 787 | /** | 
| @@ -790,7 +790,7 @@ discard block | ||
| 790 | 790 | * @param string|array $form form_ID or form object | 
| 791 | 791 | * @param string $zone Either 'single', 'directory', 'header', 'footer' | 
| 792 | 792 | */ | 
| 793 | - return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone); | |
| 793 | + return apply_filters( 'gravityview_entry_default_fields', $entry_default_fields, $form, $zone ); | |
| 794 | 794 | } | 
| 795 | 795 | |
| 796 | 796 | /** | 
| @@ -801,7 +801,7 @@ discard block | ||
| 801 | 801 | */ | 
| 802 | 802 |  	function get_available_fields( $form = '', $zone = NULL ) { | 
| 803 | 803 | |
| 804 | -		if( empty( $form ) ) { | |
| 804 | +		if ( empty( $form ) ) { | |
| 805 | 805 | gravityview()->log->error( '$form is empty' ); | 
| 806 | 806 | return array(); | 
| 807 | 807 | } | 
| @@ -810,7 +810,7 @@ discard block | ||
| 810 | 810 | $fields = gravityview_get_form_fields( $form, true ); | 
| 811 | 811 | |
| 812 | 812 | // get meta fields ( only if form was already created ) | 
| 813 | -		if( !is_array( $form ) ) { | |
| 813 | +		if ( ! is_array( $form ) ) { | |
| 814 | 814 | $meta_fields = gravityview_get_entry_meta( $form ); | 
| 815 | 815 |  		} else { | 
| 816 | 816 | $meta_fields = array(); | 
| @@ -823,7 +823,7 @@ discard block | ||
| 823 | 823 | $fields = $fields + $meta_fields + $default_fields; | 
| 824 | 824 | |
| 825 | 825 | // Move Custom Content to top | 
| 826 | - $fields = array( 'custom' => $fields['custom'] ) + $fields; | |
| 826 | + $fields = array( 'custom' => $fields[ 'custom' ] ) + $fields; | |
| 827 | 827 | |
| 828 | 828 | /** | 
| 829 | 829 | * @filter `gravityview/admin/available_fields` Modify the available fields that can be used in a View. | 
| @@ -843,11 +843,11 @@ discard block | ||
| 843 | 843 | |
| 844 | 844 | $widgets = $this->get_registered_widgets(); | 
| 845 | 845 | |
| 846 | -		if( !empty( $widgets ) ) { | |
| 846 | +		if ( ! empty( $widgets ) ) { | |
| 847 | 847 | |
| 848 | -			foreach( $widgets as $id => $details ) { | |
| 848 | +			foreach ( $widgets as $id => $details ) { | |
| 849 | 849 | |
| 850 | - echo new GravityView_Admin_View_Widget( $details['label'], $id, $details ); | |
| 850 | + echo new GravityView_Admin_View_Widget( $details[ 'label' ], $id, $details ); | |
| 851 | 851 | |
| 852 | 852 | } | 
| 853 | 853 | } | 
| @@ -876,7 +876,7 @@ discard block | ||
| 876 | 876 |  	function render_active_areas( $template_id, $type, $zone, $rows, $values ) { | 
| 877 | 877 | global $post; | 
| 878 | 878 | |
| 879 | -		if( $type === 'widget' ) { | |
| 879 | +		if ( $type === 'widget' ) { | |
| 880 | 880 | $button_label = __( 'Add Widget', 'gravityview' ); | 
| 881 | 881 |  		} else { | 
| 882 | 882 | $button_label = __( 'Add Field', 'gravityview' ); | 
| @@ -902,10 +902,10 @@ discard block | ||
| 902 | 902 | $form_id = null; | 
| 903 | 903 | |
| 904 | 904 | // if saved values, get available fields to label everyone | 
| 905 | -		if( !empty( $values ) && ( !empty( $post->ID ) || !empty( $_POST['template_id'] ) ) ) { | |
| 905 | +		if ( ! empty( $values ) && ( ! empty( $post->ID ) || ! empty( $_POST[ 'template_id' ] ) ) ) { | |
| 906 | 906 | |
| 907 | -			if( !empty( $_POST['template_id'] ) ) { | |
| 908 | - $form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] ); | |
| 907 | +			if ( ! empty( $_POST[ 'template_id' ] ) ) { | |
| 908 | + $form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] ); | |
| 909 | 909 |  			} else { | 
| 910 | 910 | $form_id = $form = gravityview_get_form_id( $post->ID ); | 
| 911 | 911 | } | 
| @@ -923,42 +923,42 @@ discard block | ||
| 923 | 923 | } | 
| 924 | 924 | } | 
| 925 | 925 | |
| 926 | - foreach( $rows as $row ) : | |
| 927 | - foreach( $row as $col => $areas ) : | |
| 928 | - $column = ($col == '2-2') ? '1-2' : $col; ?> | |
| 926 | + foreach ( $rows as $row ) : | |
| 927 | + foreach ( $row as $col => $areas ) : | |
| 928 | + $column = ( $col == '2-2' ) ? '1-2' : $col; ?> | |
| 929 | 929 | |
| 930 | 930 | <div class="gv-grid-col-<?php echo esc_attr( $column ); ?>"> | 
| 931 | 931 | |
| 932 | - <?php foreach( $areas as $area ) : ?> | |
| 932 | + <?php foreach ( $areas as $area ) : ?> | |
| 933 | 933 | |
| 934 | - <div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"> | |
| 935 | - <div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>"> | |
| 934 | + <div class="gv-droppable-area" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>"> | |
| 935 | + <div class="active-drop active-drop-<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>"> | |
| 936 | 936 | <?php // render saved fields | 
| 937 | -								if( ! empty( $values[ $zone .'_'. $area['areaid'] ] ) ) { | |
| 937 | +								if ( ! empty( $values[ $zone . '_' . $area[ 'areaid' ] ] ) ) { | |
| 938 | 938 | |
| 939 | -									foreach( $values[ $zone .'_'. $area['areaid'] ] as $uniqid => $field ) { | |
| 939 | +									foreach ( $values[ $zone . '_' . $area[ 'areaid' ] ] as $uniqid => $field ) { | |
| 940 | 940 | |
| 941 | 941 | // Maybe has a form ID | 
| 942 | - $form_id = empty( $field['form_id'] ) ? $form_id : $field['form_id']; | |
| 942 | + $form_id = empty( $field[ 'form_id' ] ) ? $form_id : $field[ 'form_id' ]; | |
| 943 | 943 | |
| 944 | 944 | $input_type = NULL; | 
| 945 | 945 | |
| 946 | 946 |  										if ( $form_id ) { | 
| 947 | - $original_item = isset( $available_items[ $form_id ] [ $field['id'] ] ) ? $available_items[ $form_id ] [ $field['id'] ] : false ; | |
| 947 | + $original_item = isset( $available_items[ $form_id ] [ $field[ 'id' ] ] ) ? $available_items[ $form_id ] [ $field[ 'id' ] ] : false; | |
| 948 | 948 |                                          } else { | 
| 949 | - $original_item = isset( $available_items[ $field['id'] ] ) ? $available_items[ $field['id'] ] : false ; | |
| 949 | + $original_item = isset( $available_items[ $field[ 'id' ] ] ) ? $available_items[ $field[ 'id' ] ] : false; | |
| 950 | 950 | } | 
| 951 | 951 | |
| 952 | -										if ( !$original_item ) { | |
| 953 | -											gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array(' data' => array('available_items' => $available_items, 'field' => $field ) ) ); | |
| 952 | +										if ( ! $original_item ) { | |
| 953 | + gravityview()->log->error( 'An item was not available when rendering the output; maybe it was added by a plugin that is now de-activated.', array( ' data' => array( 'available_items' => $available_items, 'field' => $field ) ) ); | |
| 954 | 954 | |
| 955 | 955 | $original_item = $field; | 
| 956 | 956 |  										} else { | 
| 957 | - $input_type = isset( $original_item['type'] ) ? $original_item['type'] : NULL; | |
| 957 | + $input_type = isset( $original_item[ 'type' ] ) ? $original_item[ 'type' ] : NULL; | |
| 958 | 958 | } | 
| 959 | 959 | |
| 960 | 960 | // Field options dialog box | 
| 961 | - $field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field['id'], $original_item['label'], $zone .'_'. $area['areaid'], $input_type, $uniqid, $field, $zone, $original_item ); | |
| 961 | + $field_options = GravityView_Render_Settings::render_field_options( $form_id, $type, $template_id, $field[ 'id' ], $original_item[ 'label' ], $zone . '_' . $area[ 'areaid' ], $input_type, $uniqid, $field, $zone, $original_item ); | |
| 962 | 962 | |
| 963 | 963 | $item = array( | 
| 964 | 964 | 'input_type' => $input_type, | 
| @@ -971,22 +971,22 @@ discard block | ||
| 971 | 971 | $item = wp_parse_args( $item, $original_item ); | 
| 972 | 972 | } | 
| 973 | 973 | |
| 974 | -										switch( $type ) { | |
| 974 | +										switch ( $type ) { | |
| 975 | 975 | case 'widget': | 
| 976 | - echo new GravityView_Admin_View_Widget( $item['label'], $field['id'], $item, $field ); | |
| 976 | + echo new GravityView_Admin_View_Widget( $item[ 'label' ], $field[ 'id' ], $item, $field ); | |
| 977 | 977 | break; | 
| 978 | 978 | default: | 
| 979 | - echo new GravityView_Admin_View_Field( $field['label'], $field['id'], $item, $field, $form_id ); | |
| 979 | + echo new GravityView_Admin_View_Field( $field[ 'label' ], $field[ 'id' ], $item, $field, $form_id ); | |
| 980 | 980 | } | 
| 981 | 981 | } | 
| 982 | 982 | |
| 983 | 983 | } // End if zone is not empty ?> | 
| 984 | 984 | |
| 985 | -								<span class="drop-message"><?php echo sprintf( esc_html__('"+ %s" or drag existing %ss here.', 'gravityview'), esc_html( $button_label ), esc_html( $type ) ); ?></span> | |
| 985 | + <span class="drop-message"><?php echo sprintf( esc_html__( '"+ %s" or drag existing %ss here.', 'gravityview' ), esc_html( $button_label ), esc_html( $type ) ); ?></span> | |
| 986 | 986 | </div> | 
| 987 | 987 | <div class="gv-droppable-area-action"> | 
| 988 | - <button class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone .'_'. $area['areaid'] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ '.esc_html( $button_label ); ?></button> | |
| 989 | -								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area['title'] ); ?></strong><?php if( !empty( $area['subtitle'] ) ) { ?><span class="gv-droppable-area-subtitle"> – <?php echo esc_html( $area['subtitle'] ); ?></span><?php } ?></p> | |
| 988 | + <button class="gv-add-field button-secondary" title="" data-objecttype="<?php echo esc_attr( $type ); ?>" data-areaid="<?php echo esc_attr( $zone . '_' . $area[ 'areaid' ] ); ?>" data-context="<?php echo esc_attr( $zone ); ?>" data-formid="<?php echo $view ? esc_attr( $view->form ? $view->form->ID : '' ) : ''; ?>"><?php echo '+ ' . esc_html( $button_label ); ?></button> | |
| 989 | +								<p class="gv-droppable-area-title"><strong><?php echo esc_html( $area[ 'title' ] ); ?></strong><?php if ( ! empty( $area[ 'subtitle' ] ) ) { ?><span class="gv-droppable-area-subtitle"> – <?php echo esc_html( $area[ 'subtitle' ] ); ?></span><?php } ?></p> | |
| 990 | 990 | </div> | 
| 991 | 991 | </div> | 
| 992 | 992 | |
| @@ -1014,7 +1014,7 @@ discard block | ||
| 1014 | 1014 | // This is a new View, prefill the widgets | 
| 1015 | 1015 | $widgets = array( | 
| 1016 | 1016 | 'header_top' => array( | 
| 1017 | - substr( md5( microtime( true ) ), 0, 13 ) => array ( | |
| 1017 | + substr( md5( microtime( true ) ), 0, 13 ) => array( | |
| 1018 | 1018 | 'id' => 'search_bar', | 
| 1019 | 1019 | 'label' => __( 'Search Bar', 'gravityview' ), | 
| 1020 | 1020 | 'search_layout' => 'horizontal', | 
| @@ -1089,12 +1089,12 @@ discard block | ||
| 1089 | 1089 |  		if ( $post ) { | 
| 1090 | 1090 | $source_form_id = gravityview_get_form_id( $post->ID ); | 
| 1091 | 1091 |  			if ( $source_form_id ) { | 
| 1092 | - $form_ids[] = $source_form_id; | |
| 1092 | + $form_ids[ ] = $source_form_id; | |
| 1093 | 1093 | } | 
| 1094 | 1094 | |
| 1095 | 1095 | $joined_forms = \GV\View::get_joined_forms( $post->ID ); | 
| 1096 | 1096 |  			foreach ( $joined_forms as $joined_form ) { | 
| 1097 | - $form_ids[] = $joined_form->ID; | |
| 1097 | + $form_ids[ ] = $joined_form->ID; | |
| 1098 | 1098 | } | 
| 1099 | 1099 | } | 
| 1100 | 1100 |  		foreach ( array_unique( $form_ids ) as $form_id ) { | 
| @@ -1128,7 +1128,7 @@ discard block | ||
| 1128 | 1128 | * @return string HTML of the active areas | 
| 1129 | 1129 | */ | 
| 1130 | 1130 |  	function render_directory_active_areas( $template_id = '', $context = 'single', $post_id = '', $echo = false ) { | 
| 1131 | -		if( empty( $template_id ) ) { | |
| 1131 | +		if ( empty( $template_id ) ) { | |
| 1132 | 1132 |  			gravityview()->log->debug( '[render_directory_active_areas] {template_id} is empty', array( 'template_id' => $template_id ) ); | 
| 1133 | 1133 | return ''; | 
| 1134 | 1134 | } | 
| @@ -1142,12 +1142,12 @@ discard block | ||
| 1142 | 1142 | */ | 
| 1143 | 1143 | $template_areas = apply_filters( 'gravityview_template_active_areas', array(), $template_id, $context ); | 
| 1144 | 1144 | |
| 1145 | -		if( empty( $template_areas ) ) { | |
| 1145 | +		if ( empty( $template_areas ) ) { | |
| 1146 | 1146 | |
| 1147 | 1147 |  			gravityview()->log->debug( '[render_directory_active_areas] No areas defined. Maybe template {template_id} is disabled.', array( 'data' => $template_id ) ); | 
| 1148 | 1148 | $output = '<div>'; | 
| 1149 | - $output .= '<h2 class="description" style="font-size: 16px; margin:0">'. sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>'.$template_id.'</em>' ) .'</h2>'; | |
| 1150 | -			$output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">'.esc_html__('The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview').'</p>'; | |
| 1149 | + $output .= '<h2 class="description" style="font-size: 16px; margin:0">' . sprintf( esc_html__( 'This View is configured using the %s View type, which is disabled.', 'gravityview' ), '<em>' . $template_id . '</em>' ) . '</h2>'; | |
| 1150 | + $output .= '<p class="description" style="font-size: 14px; margin:0 0 1em 0;padding:0">' . esc_html__( 'The data is not lost; re-activate the associated plugin and the configuration will re-appear.', 'gravityview' ) . '</p>'; | |
| 1151 | 1151 | $output .= '</div>'; | 
| 1152 | 1152 |  		} else { | 
| 1153 | 1153 | |
| @@ -1162,7 +1162,7 @@ discard block | ||
| 1162 | 1162 | |
| 1163 | 1163 | } | 
| 1164 | 1164 | |
| 1165 | -		if( $echo ) { | |
| 1165 | +		if ( $echo ) { | |
| 1166 | 1166 | echo $output; | 
| 1167 | 1167 | } | 
| 1168 | 1168 | |
| @@ -1181,32 +1181,32 @@ discard block | ||
| 1181 | 1181 | $is_widgets_page = ( $pagenow === 'widgets.php' ); | 
| 1182 | 1182 | |
| 1183 | 1183 | // Add the GV font (with the Astronaut) | 
| 1184 | -        wp_enqueue_style( 'gravityview_global', plugins_url('assets/css/admin-global.css', GRAVITYVIEW_FILE), array(), \GV\Plugin::$version ); | |
| 1184 | + wp_enqueue_style( 'gravityview_global', plugins_url( 'assets/css/admin-global.css', GRAVITYVIEW_FILE ), array(), \GV\Plugin::$version ); | |
| 1185 | 1185 | wp_register_style( 'gravityview_views_styles', plugins_url( 'assets/css/admin-views.css', GRAVITYVIEW_FILE ), array( 'dashicons', 'wp-jquery-ui-dialog' ), \GV\Plugin::$version ); | 
| 1186 | 1186 | |
| 1187 | -		wp_register_script( 'gravityview-jquery-cookie', plugins_url('assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE), array( 'jquery' ), \GV\Plugin::$version, true ); | |
| 1187 | + wp_register_script( 'gravityview-jquery-cookie', plugins_url( 'assets/lib/jquery.cookie/jquery.cookie.min.js', GRAVITYVIEW_FILE ), array( 'jquery' ), \GV\Plugin::$version, true ); | |
| 1188 | 1188 | |
| 1189 | -		if( GFForms::get_page() === 'form_list' ) { | |
| 1189 | +		if ( GFForms::get_page() === 'form_list' ) { | |
| 1190 | 1190 | wp_enqueue_style( 'gravityview_views_styles' ); | 
| 1191 | 1191 | return; | 
| 1192 | 1192 | } | 
| 1193 | 1193 | |
| 1194 | 1194 | // Don't process any scripts below here if it's not a GravityView page. | 
| 1195 | -		if( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) { | |
| 1195 | +		if ( ! gravityview()->request->is_admin( $hook, 'single' ) && ! $is_widgets_page ) { | |
| 1196 | 1196 | return; | 
| 1197 | 1197 | } | 
| 1198 | 1198 | |
| 1199 | 1199 | wp_enqueue_script( 'jquery-ui-datepicker' ); | 
| 1200 | -        wp_enqueue_style( 'gravityview_views_datepicker', plugins_url('assets/css/admin-datepicker.css', GRAVITYVIEW_FILE), \GV\Plugin::$version ); | |
| 1200 | + wp_enqueue_style( 'gravityview_views_datepicker', plugins_url( 'assets/css/admin-datepicker.css', GRAVITYVIEW_FILE ), \GV\Plugin::$version ); | |
| 1201 | 1201 | |
| 1202 | -        $script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min'; | |
| 1202 | + $script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; | |
| 1203 | 1203 | |
| 1204 | 1204 | //enqueue scripts | 
| 1205 | 1205 | wp_enqueue_script( 'gravityview_views_scripts', plugins_url( 'assets/js/admin-views' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery-ui-tabs', 'jquery-ui-draggable', 'jquery-ui-droppable', 'jquery-ui-sortable', 'jquery-ui-tooltip', 'jquery-ui-dialog', 'gravityview-jquery-cookie', 'jquery-ui-datepicker', 'underscore' ), \GV\Plugin::$version ); | 
| 1206 | 1206 | |
| 1207 | -        wp_localize_script('gravityview_views_scripts', 'gvGlobals', array( | |
| 1207 | + wp_localize_script( 'gravityview_views_scripts', 'gvGlobals', array( | |
| 1208 | 1208 | 'cookiepath' => COOKIEPATH, | 
| 1209 | - 'passed_form_id' => (bool) \GV\Utils::_GET( 'form_id' ), | |
| 1209 | + 'passed_form_id' => (bool)\GV\Utils::_GET( 'form_id' ), | |
| 1210 | 1210 | 'nonce' => wp_create_nonce( 'gravityview_ajaxviews' ), | 
| 1211 | 1211 | 'label_viewname' => __( 'Enter View name here', 'gravityview' ), | 
| 1212 | 1212 | 'label_reorder_search_fields' => __( 'Reorder Search Fields', 'gravityview' ), | 
| @@ -1221,7 +1221,7 @@ discard block | ||
| 1221 | 1221 | 'loading_error' => esc_html__( 'There was an error loading dynamic content.', 'gravityview' ), | 
| 1222 | 1222 | 'field_loaderror' => __( 'Error while adding the field. Please try again or contact GravityView support.', 'gravityview' ), | 
| 1223 | 1223 | 'remove_all_fields' => __( 'Would you like to remove all fields in this zone? (You are seeing this message because you were holding down the ALT key)', 'gravityview' ), | 
| 1224 | - )); | |
| 1224 | + ) ); | |
| 1225 | 1225 | |
| 1226 | 1226 | wp_enqueue_style( 'gravityview_views_styles' ); | 
| 1227 | 1227 | |
| @@ -1248,7 +1248,7 @@ discard block | ||
| 1248 | 1248 | ); | 
| 1249 | 1249 | |
| 1250 | 1250 |  		if ( wp_is_mobile() ) { | 
| 1251 | - $scripts[] = 'jquery-touch-punch'; | |
| 1251 | + $scripts[ ] = 'jquery-touch-punch'; | |
| 1252 | 1252 | } | 
| 1253 | 1253 | |
| 1254 | 1254 | wp_enqueue_script( $scripts ); | 
| @@ -49,11 +49,11 @@ discard block | ||
| 49 | 49 | |
| 50 | 50 | $post_types = get_post_types(); | 
| 51 | 51 | |
| 52 | -		foreach( $post_types as $post_type ) { | |
| 52 | +		foreach ( $post_types as $post_type ) { | |
| 53 | 53 | $post_type_rewrite = get_post_type_object( $post_type )->rewrite; | 
| 54 | 54 | |
| 55 | 55 |  			if ( $slug = \GV\Utils::get( $post_type_rewrite, 'slug' ) ) { | 
| 56 | - $reserved_slugs[] = $slug; | |
| 56 | + $reserved_slugs[ ] = $slug; | |
| 57 | 57 | } | 
| 58 | 58 | } | 
| 59 | 59 | |
| @@ -89,8 +89,7 @@ discard block | ||
| 89 | 89 | $tab = __( 'Edit Entry', 'gravityview' ); | 
| 90 | 90 | $context = 'edit'; | 
| 91 | 91 | break; | 
| 92 | - case ( $gravityview->request->is_entry( $gravityview->view->form ? $gravityview->view->form->ID : 0 ) ): | |
| 93 | - $tab = __( 'Single Entry', 'gravityview' ); | |
| 92 | + case ( $gravityview->request->is_entry( $gravityview->view->form ? $gravityview->view->form->ID : 0 ) ) : $tab = __( 'Single Entry', 'gravityview' ); | |
| 94 | 93 | $context = 'single'; | 
| 95 | 94 | break; | 
| 96 | 95 | default: | 
| @@ -110,7 +109,7 @@ discard block | ||
| 110 | 109 | $action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab ); | 
| 111 | 110 | $message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ); | 
| 112 | 111 | |
| 113 | - $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) ); | |
| 112 | + $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) ); | |
| 114 | 113 | $output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message ); | 
| 115 | 114 | |
| 116 | 115 | echo \GVCommon::generate_notice( $output . $image, 'gv-warning warning', 'edit_gravityview', $gravityview->view->ID ); |