@@ -2,8 +2,9 @@ |
||
2 | 2 | namespace GV; |
3 | 3 | |
4 | 4 | /** If this file is called directly, abort. */ |
5 | -if ( ! defined( 'GRAVITYVIEW_DIR' ) ) |
|
5 | +if ( ! defined( 'GRAVITYVIEW_DIR' ) ) { |
|
6 | 6 | die(); |
7 | +} |
|
7 | 8 | |
8 | 9 | /** |
9 | 10 | * The base \GV\Shortcode class. |
@@ -50,7 +50,6 @@ |
||
50 | 50 | * |
51 | 51 | * @throws \ErrorException if shortcode with this name has already been registered elsewhere. |
52 | 52 | * @internal |
53 | - |
|
54 | 53 | * @return \GV\Shortcode The only internally registered instance of this shortcode. |
55 | 54 | */ |
56 | 55 | public static function add() { |
@@ -56,15 +56,15 @@ discard block |
||
56 | 56 | public static function add() { |
57 | 57 | $shortcode = new static(); |
58 | 58 | if ( shortcode_exists( $shortcode->name ) ) { |
59 | - if ( empty( self::$shortcodes[$shortcode->name] ) ) { |
|
59 | + if ( empty( self::$shortcodes[ $shortcode->name ] ) ) { |
|
60 | 60 | throw new \ErrorException( sprintf( 'Shortcode [%s] has already been registered elsewhere.', $shortcode->name ) ); |
61 | 61 | } |
62 | 62 | } else { |
63 | 63 | add_shortcode( $shortcode->name, array( get_class( $shortcode ), 'callback' ) ); |
64 | - self::$shortcodes[$shortcode->name] = $shortcode; |
|
64 | + self::$shortcodes[ $shortcode->name ] = $shortcode; |
|
65 | 65 | } |
66 | 66 | |
67 | - return self::$shortcodes[$shortcode->name]; |
|
67 | + return self::$shortcodes[ $shortcode->name ]; |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | */ |
77 | 77 | public static function remove() { |
78 | 78 | $shortcode = new static(); |
79 | - unset( self::$shortcodes[$shortcode->name] ); |
|
79 | + unset( self::$shortcodes[ $shortcode->name ] ); |
|
80 | 80 | remove_shortcode( $shortcode->name ); |
81 | 81 | } |
82 | 82 | |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER ); |
109 | 109 | |
110 | 110 | foreach ( $matches as $shortcode ) { |
111 | - $shortcode_name = $shortcode[2]; |
|
111 | + $shortcode_name = $shortcode[ 2 ]; |
|
112 | 112 | |
113 | - $shortcode_atts = shortcode_parse_atts( $shortcode[3] ); |
|
114 | - $shortcode_content = $shortcode[5]; |
|
113 | + $shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] ); |
|
114 | + $shortcode_content = $shortcode[ 5 ]; |
|
115 | 115 | |
116 | 116 | /** This is a registered GravityView shortcode. */ |
117 | - if ( !empty( self::$shortcodes[$shortcode_name] ) ) { |
|
118 | - $shortcode = clone( self::$shortcodes[$shortcode_name] ); |
|
117 | + if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) { |
|
118 | + $shortcode = clone( self::$shortcodes[ $shortcode_name ] ); |
|
119 | 119 | } else { |
120 | 120 | /** This is some generic shortcode. */ |
121 | 121 | $shortcode = new self; |
@@ -2,8 +2,9 @@ |
||
2 | 2 | namespace GV\Shortcodes; |
3 | 3 | |
4 | 4 | /** If this file is called directly, abort. */ |
5 | -if ( ! defined( 'GRAVITYVIEW_DIR' ) ) |
|
5 | +if ( ! defined( 'GRAVITYVIEW_DIR' ) ) { |
|
6 | 6 | die(); |
7 | +} |
|
7 | 8 | |
8 | 9 | /** |
9 | 10 | * The base \GV\Shortcode class. |
@@ -4,7 +4,7 @@ |
||
4 | 4 | die(); |
5 | 5 | |
6 | 6 | /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */ |
7 | -if ( version_compare( phpversion(), '5.3' , '<' ) ) |
|
7 | +if ( version_compare( phpversion(), '5.3', '<' ) ) |
|
8 | 8 | return false; |
9 | 9 | |
10 | 10 | /** @define "GRAVITYVIEW_DIR" "../" Require core */ |
@@ -1,11 +1,13 @@ |
||
1 | 1 | <?php |
2 | 2 | /** If this file is called directly, abort. */ |
3 | -if ( ! defined( 'GRAVITYVIEW_DIR' ) ) |
|
3 | +if ( ! defined( 'GRAVITYVIEW_DIR' ) ) { |
|
4 | 4 | die(); |
5 | +} |
|
5 | 6 | |
6 | 7 | /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */ |
7 | -if ( version_compare( phpversion(), '5.3' , '<' ) ) |
|
8 | +if ( version_compare( phpversion(), '5.3' , '<' ) ) { |
|
8 | 9 | return false; |
10 | +} |
|
9 | 11 | |
10 | 12 | /** @define "GRAVITYVIEW_DIR" "../" Require core */ |
11 | 13 | require GRAVITYVIEW_DIR . 'future/includes/class-gv-core.php'; |
@@ -23,16 +23,16 @@ discard block |
||
23 | 23 | |
24 | 24 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
25 | 25 | |
26 | - unset ( $field_options['search_filter'] ); |
|
26 | + unset ( $field_options[ 'search_filter' ] ); |
|
27 | 27 | |
28 | - if( 'edit' === $context ) { |
|
28 | + if ( 'edit' === $context ) { |
|
29 | 29 | return $field_options; |
30 | 30 | } |
31 | 31 | |
32 | - $this->add_field_support('link_to_post', $field_options ); |
|
32 | + $this->add_field_support( 'link_to_post', $field_options ); |
|
33 | 33 | |
34 | 34 | // @since 1.5.4 |
35 | - $this->add_field_support('dynamic_data', $field_options ); |
|
35 | + $this->add_field_support( 'dynamic_data', $field_options ); |
|
36 | 36 | |
37 | 37 | return $field_options; |
38 | 38 | } |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $url = $title = $caption = $description = ''; |
60 | 60 | |
61 | 61 | // If there's a |:| match, process. Otherwise, empty array! |
62 | - if( preg_match( '/\|\:\|/', $value ) ) { |
|
62 | + if ( preg_match( '/\|\:\|/', $value ) ) { |
|
63 | 63 | list( $url, $title, $caption, $description ) = array_pad( explode( '|:|', $value ), 4, false ); |
64 | 64 | } |
65 | 65 | |
@@ -88,8 +88,8 @@ discard block |
||
88 | 88 | */ |
89 | 89 | public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Image $field ) { |
90 | 90 | |
91 | - $id = (int) $field->id; |
|
92 | - $form_id = $form['id']; |
|
91 | + $id = (int)$field->id; |
|
92 | + $form_id = $form[ 'id' ]; |
|
93 | 93 | $input_name = "input_{$id}"; |
94 | 94 | $field_id = sprintf( 'input_%d_%d', $form_id, $id ); |
95 | 95 | $img_name = null; |
@@ -97,16 +97,16 @@ discard block |
||
97 | 97 | // Convert |:| to associative array |
98 | 98 | $img_array = self::explode_value( $value ); |
99 | 99 | |
100 | - if( ! empty( $img_array['url'] ) ) { |
|
100 | + if ( ! empty( $img_array[ 'url' ] ) ) { |
|
101 | 101 | |
102 | - $img_name = basename( $img_array['url'] ); |
|
102 | + $img_name = basename( $img_array[ 'url' ] ); |
|
103 | 103 | |
104 | 104 | /** |
105 | 105 | * Set the $uploaded_files value so that the .ginput_preview renders, and the file upload is hidden |
106 | 106 | * @see GF_Field_Post_Image::get_field_input See the `<span class='ginput_preview'>` code |
107 | 107 | * @see GFFormsModel::get_temp_filename See the `rgget( $input_name, self::$uploaded_files[ $form_id ] );` code |
108 | 108 | */ |
109 | - if( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
109 | + if ( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) { |
|
110 | 110 | GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $img_name; |
111 | 111 | } |
112 | 112 | } |
@@ -135,8 +135,8 @@ discard block |
||
135 | 135 | * @hack |
136 | 136 | */ |
137 | 137 | if ( null !== $img_name ) { |
138 | - $current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array['url'] ) ); |
|
139 | - $gf_post_image_field_output = str_replace('<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>'.$current_file, $gf_post_image_field_output ); |
|
138 | + $current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array[ 'url' ] ) ); |
|
139 | + $gf_post_image_field_output = str_replace( '<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>' . $current_file, $gf_post_image_field_output ); |
|
140 | 140 | } |
141 | 141 | |
142 | 142 | return $gf_post_image_field_output; |
@@ -13,7 +13,7 @@ |
||
13 | 13 | * @see GFCommon::get_field_filter_settings Gravity Forms suggests checkboxes should just be "contains" |
14 | 14 | * @var array |
15 | 15 | */ |
16 | - var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains'); |
|
16 | + var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' ); |
|
17 | 17 | |
18 | 18 | var $is_searchable = true; |
19 | 19 |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | var $is_searchable = true; |
13 | 13 | |
14 | - var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains'); |
|
14 | + var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' ); |
|
15 | 15 | |
16 | 16 | var $_gf_field_class_name = 'GF_Field_Radio'; |
17 | 17 | |
@@ -40,8 +40,8 @@ discard block |
||
40 | 40 | // Set the $_field_id var |
41 | 41 | $field_options = parent::field_options( $field_options, $template_id, $field_id, $context, $input_type ); |
42 | 42 | |
43 | - if( $this->is_choice_value_enabled() ) { |
|
44 | - $field_options['choice_display'] = array( |
|
43 | + if ( $this->is_choice_value_enabled() ) { |
|
44 | + $field_options[ 'choice_display' ] = array( |
|
45 | 45 | 'type' => 'radio', |
46 | 46 | 'value' => 'value', |
47 | 47 | 'label' => __( 'What should be displayed:', 'gravityview' ), |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | public function get_content( $output, $entry = array(), $field_settings = array(), $field = array() ) { |
60 | 60 | |
61 | 61 | /** Overridden by a template. */ |
62 | - if( ! empty( $field['field_path'] ) ) { return $output; } |
|
62 | + if ( ! empty( $field[ 'field_path' ] ) ) { return $output; } |
|
63 | 63 | |
64 | 64 | return $this->get_string_from_value( $output ); |
65 | 65 | } |
@@ -78,11 +78,11 @@ discard block |
||
78 | 78 | switch ( intval( $value ) ) { |
79 | 79 | case self::NOT_FULFILLED: |
80 | 80 | default: |
81 | - $return = __('Not Fulfilled', 'gravityview'); |
|
81 | + $return = __( 'Not Fulfilled', 'gravityview' ); |
|
82 | 82 | break; |
83 | 83 | |
84 | 84 | case self::FULFILLED: |
85 | - $return = __('Fulfilled', 'gravityview'); |
|
85 | + $return = __( 'Fulfilled', 'gravityview' ); |
|
86 | 86 | break; |
87 | 87 | } |
88 | 88 | |
@@ -102,13 +102,13 @@ discard block |
||
102 | 102 | * |
103 | 103 | * @return string Original text if {is_fulfilled} isn't found. Otherwise, "Not Fulfilled" or "Fulfilled" |
104 | 104 | */ |
105 | - public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
105 | + public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
106 | 106 | |
107 | 107 | $return = $text; |
108 | 108 | |
109 | 109 | foreach ( $matches as $match ) { |
110 | 110 | |
111 | - $full_tag = $match[0]; |
|
111 | + $full_tag = $match[ 0 ]; |
|
112 | 112 | |
113 | 113 | $fulfilled = rgar( $entry, 'is_fulfilled' ); |
114 | 114 |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | var $is_searchable = true; |
13 | 13 | |
14 | - var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains'); |
|
14 | + var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' ); |
|
15 | 15 | |
16 | 16 | var $_gf_field_class_name = 'GF_Field_Post_Category'; |
17 | 17 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $entry = GFAPI::get_entry( $entry_id ); |
45 | 45 | $post_id = rgar( $entry, 'post_id' ); |
46 | 46 | |
47 | - if( empty( $post_id ) ) { |
|
47 | + if ( empty( $post_id ) ) { |
|
48 | 48 | return false; |
49 | 49 | } |
50 | 50 | |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | |
53 | 53 | $post_category_fields = GFAPI::get_fields_by_type( $form, 'post_category' ); |
54 | 54 | |
55 | - if( $post_category_fields ) { |
|
55 | + if ( $post_category_fields ) { |
|
56 | 56 | |
57 | 57 | $updated_categories = array(); |
58 | 58 | |
@@ -119,18 +119,18 @@ discard block |
||
119 | 119 | * |
120 | 120 | * @return mixed |
121 | 121 | */ |
122 | - function edit_entry_post_category_choices( $choices, $field, $form_id ) { |
|
122 | + function edit_entry_post_category_choices( $choices, $field, $form_id ) { |
|
123 | 123 | |
124 | - $entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry(); |
|
124 | + $entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry(); |
|
125 | 125 | |
126 | 126 | // $entry['post_id'] should always be set, but we check to make sure. |
127 | - if( $entry && isset( $entry['post_id'] ) && $post_id = $entry['post_id'] ) { |
|
127 | + if ( $entry && isset( $entry[ 'post_id' ] ) && $post_id = $entry[ 'post_id' ] ) { |
|
128 | 128 | |
129 | 129 | $post_categories = wp_get_post_categories( $post_id, array( 'fields' => 'ids' ) ); |
130 | 130 | |
131 | 131 | // Always use the live value |
132 | 132 | foreach ( $choices as &$choice ) { |
133 | - $choice['isSelected'] = in_array( $choice['value'], array_values( $post_categories ) ); |
|
133 | + $choice[ 'isSelected' ] = in_array( $choice[ 'value' ], array_values( $post_categories ) ); |
|
134 | 134 | } |
135 | 135 | } |
136 | 136 | |
@@ -139,12 +139,12 @@ discard block |
||
139 | 139 | |
140 | 140 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
141 | 141 | |
142 | - if( 'edit' === $context ) { |
|
142 | + if ( 'edit' === $context ) { |
|
143 | 143 | return $field_options; |
144 | 144 | } |
145 | 145 | |
146 | - $this->add_field_support('dynamic_data', $field_options ); |
|
147 | - $this->add_field_support('link_to_term', $field_options ); |
|
146 | + $this->add_field_support( 'dynamic_data', $field_options ); |
|
147 | + $this->add_field_support( 'link_to_term', $field_options ); |
|
148 | 148 | |
149 | 149 | return $field_options; |
150 | 150 | } |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | |
15 | 15 | var $is_searchable = true; |
16 | 16 | |
17 | - var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains'); |
|
17 | + var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' ); |
|
18 | 18 | |
19 | 19 | var $_gf_field_class_name = 'GF_Field_Post_Tags'; |
20 | 20 | |
@@ -27,12 +27,12 @@ discard block |
||
27 | 27 | |
28 | 28 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
29 | 29 | |
30 | - if( 'edit' === $context ) { |
|
30 | + if ( 'edit' === $context ) { |
|
31 | 31 | return $field_options; |
32 | 32 | } |
33 | 33 | |
34 | - $this->add_field_support('dynamic_data', $field_options ); |
|
35 | - $this->add_field_support('link_to_term', $field_options ); |
|
34 | + $this->add_field_support( 'dynamic_data', $field_options ); |
|
35 | + $this->add_field_support( 'link_to_term', $field_options ); |
|
36 | 36 | |
37 | 37 | return $field_options; |
38 | 38 | } |