@@ -255,7 +255,6 @@ |
||
255 | 255 | * Get the default date format for a field based on the field ID and the time format setting |
256 | 256 | * |
257 | 257 | * @since 1.14 |
258 | - |
|
259 | 258 | * @param string $time_format The time format ("12" or "24"). Default: "12" {@since 1.14} |
260 | 259 | * @param int $field_id The ID of the field. Used to figure out full time/hours/minutes/am/pm {@since 1.14} |
261 | 260 | * |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 ); |
61 | 61 | |
62 | - add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 ); |
|
62 | + add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 ); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -100,31 +100,31 @@ discard block |
||
100 | 100 | public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) { |
101 | 101 | |
102 | 102 | // If the search is being sorted |
103 | - if( ! empty( $criteria['sorting']['key'] ) ) { |
|
103 | + if ( ! empty( $criteria[ 'sorting' ][ 'key' ] ) ) { |
|
104 | 104 | |
105 | - $pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] ); |
|
105 | + $pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] ); |
|
106 | 106 | |
107 | 107 | /** |
108 | 108 | * And the sort key matches the key set in modify_sort_id(), then modify the Gravity Forms query SQL |
109 | 109 | * @see modify_sort_id() |
110 | 110 | */ |
111 | - if( ! empty( $pieces[1] ) ) { |
|
111 | + if ( ! empty( $pieces[ 1 ] ) ) { |
|
112 | 112 | |
113 | 113 | // Pass these to the _modify_query_sort_by_time_hack() method |
114 | - $this->_time_format = $pieces[1]; |
|
115 | - $this->_date_format = $pieces[2]; |
|
114 | + $this->_time_format = $pieces[ 1 ]; |
|
115 | + $this->_date_format = $pieces[ 2 ]; |
|
116 | 116 | |
117 | 117 | // Remove fake input IDs (5.1 doesn't exist. Use 5) |
118 | - $criteria['sorting']['key'] = floor( $pieces[0] ); |
|
118 | + $criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] ); |
|
119 | 119 | |
120 | 120 | /** |
121 | 121 | * Make sure sorting is numeric (# of seconds). IMPORTANT. |
122 | 122 | * @see GVCommon::is_field_numeric() is_numeric should also be set here |
123 | 123 | */ |
124 | - $criteria['sorting']['is_numeric'] = true; |
|
124 | + $criteria[ 'sorting' ][ 'is_numeric' ] = true; |
|
125 | 125 | |
126 | 126 | // Modify the Gravity Forms WP Query |
127 | - add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) ); |
|
127 | + add_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) ); |
|
128 | 128 | } |
129 | 129 | } |
130 | 130 | |
@@ -147,9 +147,9 @@ discard block |
||
147 | 147 | * then we want to modify the query. |
148 | 148 | * @see GFFormsModel::sort_by_field_query() |
149 | 149 | */ |
150 | - if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) { |
|
150 | + if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) { |
|
151 | 151 | |
152 | - if( $this->_time_format === '24' ) { |
|
152 | + if ( $this->_time_format === '24' ) { |
|
153 | 153 | $sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )"; |
154 | 154 | } else { |
155 | 155 | $sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )"; |
@@ -195,18 +195,18 @@ discard block |
||
195 | 195 | // Set variables |
196 | 196 | parent::field_options( $field_options, $template_id, $field_id, $context, $input_type ); |
197 | 197 | |
198 | - if( 'edit' === $context ) { |
|
198 | + if ( 'edit' === $context ) { |
|
199 | 199 | return $field_options; |
200 | 200 | } |
201 | 201 | |
202 | 202 | /** |
203 | 203 | * Set default date format based on field ID and Form ID |
204 | 204 | */ |
205 | - add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); |
|
205 | + add_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); |
|
206 | 206 | |
207 | - $this->add_field_support('date_display', $field_options ); |
|
207 | + $this->add_field_support( 'date_display', $field_options ); |
|
208 | 208 | |
209 | - remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); |
|
209 | + remove_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); |
|
210 | 210 | |
211 | 211 | return $field_options; |
212 | 212 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | private function _get_time_format() { |
222 | 222 | global $post; |
223 | 223 | |
224 | - $current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID ); |
|
224 | + $current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID ); |
|
225 | 225 | |
226 | 226 | return self::_get_time_format_for_field( $this->_field_id, $current_form ); |
227 | 227 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | // GF defaults to 12, so should we. |
241 | 241 | $time_format = '12'; |
242 | 242 | |
243 | - if( $form_id ) { |
|
243 | + if ( $form_id ) { |
|
244 | 244 | $form = GFAPI::get_form( $form_id ); |
245 | 245 | |
246 | 246 | if ( $form ) { |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | $default = 'h:i A'; |
288 | 288 | |
289 | 289 | // This doesn't take into account 24-hour |
290 | - switch( $field_input_id ) { |
|
290 | + switch ( $field_input_id ) { |
|
291 | 291 | // Hours |
292 | 292 | case 1: |
293 | 293 | return ( $time_format === '12' ) ? 'h' : 'H'; |
@@ -21,12 +21,12 @@ discard block |
||
21 | 21 | function init() { |
22 | 22 | |
23 | 23 | $icon = is_admin() ? '<i class="icon gv-icon-astronaut-head"></i> ' : NULL; |
24 | - $this->title( $icon . __('GravityView', 'gravityview') ); |
|
24 | + $this->title( $icon . __( 'GravityView', 'gravityview' ) ); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | function get_warnings() { |
28 | 28 | |
29 | - if( is_null( $this->warnings ) ) { |
|
29 | + if ( is_null( $this->warnings ) ) { |
|
30 | 30 | $this->warnings = GravityView_Logging::get_errors(); |
31 | 31 | } |
32 | 32 | |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | function get_notices() { |
37 | 37 | |
38 | - if( is_null( $this->notices ) ) { |
|
38 | + if ( is_null( $this->notices ) ) { |
|
39 | 39 | $this->notices = GravityView_Logging::get_notices(); |
40 | 40 | } |
41 | 41 | |
@@ -84,27 +84,27 @@ discard block |
||
84 | 84 | </style> |
85 | 85 | <div id='debug-bar-gravityview'>"; |
86 | 86 | |
87 | - $output .= '<img src="'.plugins_url('assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ).'" class="alignright" alt="" width="100" height="132" />'; |
|
87 | + $output .= '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" class="alignright" alt="" width="100" height="132" />'; |
|
88 | 88 | |
89 | 89 | |
90 | 90 | $warnings = $this->get_warnings(); |
91 | 91 | $notices = $this->get_notices(); |
92 | 92 | |
93 | - if(count($warnings)) { |
|
94 | - $output .= '<h3><span>'.__('Warnings', 'gravityview').'</span></h3>'; |
|
93 | + if ( count( $warnings ) ) { |
|
94 | + $output .= '<h3><span>' . __( 'Warnings', 'gravityview' ) . '</span></h3>'; |
|
95 | 95 | $output .= '<ol>'; |
96 | - foreach ( $warnings as $key => $notice) { |
|
97 | - if(empty($notice['message'])) { continue; } |
|
98 | - $output .= '<li><a href="#'.sanitize_html_class( 'gv-warning-' . $key ).'">'.strip_tags($notice['message']).'</a></li>'; |
|
96 | + foreach ( $warnings as $key => $notice ) { |
|
97 | + if ( empty( $notice[ 'message' ] ) ) { continue; } |
|
98 | + $output .= '<li><a href="#' . sanitize_html_class( 'gv-warning-' . $key ) . '">' . strip_tags( $notice[ 'message' ] ) . '</a></li>'; |
|
99 | 99 | } |
100 | 100 | $output .= '</ol><hr />'; |
101 | 101 | } |
102 | - if(count($notices)) { |
|
103 | - $output .= '<h3><span>'.__('Logs', 'gravityview').'</span></h3>'; |
|
102 | + if ( count( $notices ) ) { |
|
103 | + $output .= '<h3><span>' . __( 'Logs', 'gravityview' ) . '</span></h3>'; |
|
104 | 104 | $output .= '<ol>'; |
105 | - foreach ( $notices as $key => $notice) { |
|
106 | - if(empty($notice['message'])) { continue; } |
|
107 | - $output .= '<li><a href="#'.sanitize_html_class( 'gv-notice-' . $key ).'">'.strip_tags($notice['message']).'</a></li>'; |
|
105 | + foreach ( $notices as $key => $notice ) { |
|
106 | + if ( empty( $notice[ 'message' ] ) ) { continue; } |
|
107 | + $output .= '<li><a href="#' . sanitize_html_class( 'gv-notice-' . $key ) . '">' . strip_tags( $notice[ 'message' ] ) . '</a></li>'; |
|
108 | 108 | } |
109 | 109 | $output .= '</ol><hr />'; |
110 | 110 | } |
@@ -112,14 +112,14 @@ discard block |
||
112 | 112 | if ( count( $warnings ) ) { |
113 | 113 | $output .= '<h3>Warnings</h3>'; |
114 | 114 | $output .= '<ol class="debug-bar-php-list">'; |
115 | - foreach ( $warnings as $key => $notice) { $output .= $this->render_item( $notice, 'gv-warning-' . $key ); } |
|
115 | + foreach ( $warnings as $key => $notice ) { $output .= $this->render_item( $notice, 'gv-warning-' . $key ); } |
|
116 | 116 | $output .= '</ol>'; |
117 | 117 | } |
118 | 118 | |
119 | 119 | if ( count( $notices ) ) { |
120 | 120 | $output .= '<h3>Notices</h3>'; |
121 | 121 | $output .= '<ol class="debug-bar-php-list">'; |
122 | - foreach ( $notices as $key => $notice) { $output .= $this->render_item( $notice, 'gv-notice-' . $key ); } |
|
122 | + foreach ( $notices as $key => $notice ) { $output .= $this->render_item( $notice, 'gv-notice-' . $key ); } |
|
123 | 123 | $output .= '</ol>'; |
124 | 124 | } |
125 | 125 | |
@@ -133,17 +133,17 @@ discard block |
||
133 | 133 | * @param string|array $item Unescaped |
134 | 134 | * @return string Escaped HTML |
135 | 135 | */ |
136 | - function esc_html_recursive($item) { |
|
137 | - if(is_object($item)) { |
|
138 | - foreach($item as $key => $value) { |
|
139 | - $item->{$key} = $this->esc_html_recursive($value); |
|
136 | + function esc_html_recursive( $item ) { |
|
137 | + if ( is_object( $item ) ) { |
|
138 | + foreach ( $item as $key => $value ) { |
|
139 | + $item->{$key} = $this->esc_html_recursive( $value ); |
|
140 | 140 | } |
141 | - } else if(is_array($item)) { |
|
142 | - foreach($item as $key => $value) { |
|
143 | - $item[$key] = $this->esc_html_recursive($value); |
|
141 | + } else if ( is_array( $item ) ) { |
|
142 | + foreach ( $item as $key => $value ) { |
|
143 | + $item[ $key ] = $this->esc_html_recursive( $value ); |
|
144 | 144 | } |
145 | 145 | } else { |
146 | - $item = esc_html($item); |
|
146 | + $item = esc_html( $item ); |
|
147 | 147 | } |
148 | 148 | return $item; |
149 | 149 | } |
@@ -159,26 +159,26 @@ discard block |
||
159 | 159 | |
160 | 160 | $output = ''; |
161 | 161 | |
162 | - if(!empty($notice['message'])) { |
|
163 | - $output .= '<a id="'.sanitize_html_class( $anchor ).'"></a>'; |
|
162 | + if ( ! empty( $notice[ 'message' ] ) ) { |
|
163 | + $output .= '<a id="' . sanitize_html_class( $anchor ) . '"></a>'; |
|
164 | 164 | $output .= "<li class='debug-bar-php-notice'>"; |
165 | 165 | } |
166 | 166 | |
167 | 167 | $output .= '<div class="clear"></div>'; |
168 | 168 | |
169 | 169 | // Title |
170 | - $output .= '<div class="gravityview-debug-bar-title">'.esc_attr( $notice['message'] ).'</div>'; |
|
170 | + $output .= '<div class="gravityview-debug-bar-title">' . esc_attr( $notice[ 'message' ] ) . '</div>'; |
|
171 | 171 | |
172 | 172 | // Debugging Output |
173 | - if( empty( $notice['data'] ) ) { |
|
174 | - if( !is_null( $notice['data'] ) ) { |
|
175 | - $output .= '<em>'._x('Empty', 'Debugging output data is empty.', 'gravityview' ).'</em>'; |
|
173 | + if ( empty( $notice[ 'data' ] ) ) { |
|
174 | + if ( ! is_null( $notice[ 'data' ] ) ) { |
|
175 | + $output .= '<em>' . _x( 'Empty', 'Debugging output data is empty.', 'gravityview' ) . '</em>'; |
|
176 | 176 | } |
177 | 177 | } else { |
178 | - $output .= sprintf( '<pre>%s</pre>', print_r($this->esc_html_recursive( $notice['data'] ), true) ); |
|
178 | + $output .= sprintf( '<pre>%s</pre>', print_r( $this->esc_html_recursive( $notice[ 'data' ] ), true ) ); |
|
179 | 179 | } |
180 | 180 | |
181 | - if(!empty($notice['message'])) { |
|
181 | + if ( ! empty( $notice[ 'message' ] ) ) { |
|
182 | 182 | $output .= '</li>'; |
183 | 183 | } |
184 | 184 |
@@ -5,4 +5,4 @@ |
||
5 | 5 | * @deprecated 1.7.5 |
6 | 6 | */ |
7 | 7 | |
8 | -include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' ); |
|
8 | +include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' ); |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
29 | 29 | |
30 | - unset ( $field_options['search_filter'], $field_options['show_as_link'] ); |
|
30 | + unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ] ); |
|
31 | 31 | |
32 | 32 | return $field_options; |
33 | 33 | } |
@@ -28,17 +28,17 @@ |
||
28 | 28 | |
29 | 29 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
30 | 30 | |
31 | - $field_options['number_format'] = array( |
|
31 | + $field_options[ 'number_format' ] = array( |
|
32 | 32 | 'type' => 'checkbox', |
33 | 33 | 'label' => __( 'Format number?', 'gravityview' ), |
34 | - 'desc' => __('Display numbers with thousands separators.', 'gravityview'), |
|
34 | + 'desc' => __( 'Display numbers with thousands separators.', 'gravityview' ), |
|
35 | 35 | 'value' => false, |
36 | 36 | ); |
37 | 37 | |
38 | - $field_options['decimals'] = array( |
|
38 | + $field_options[ 'decimals' ] = array( |
|
39 | 39 | 'type' => 'number', |
40 | 40 | 'label' => __( 'Decimals', 'gravityview' ), |
41 | - 'desc' => __('Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview'), |
|
41 | + 'desc' => __( 'Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview' ), |
|
42 | 42 | 'value' => '', |
43 | 43 | 'merge_tags' => false, |
44 | 44 | ); |
@@ -29,7 +29,7 @@ |
||
29 | 29 | |
30 | 30 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
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 | return $field_options; |
35 | 35 | } |
@@ -25,13 +25,13 @@ |
||
25 | 25 | |
26 | 26 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
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 | - $this->add_field_support('dynamic_data', $field_options ); |
|
34 | + $this->add_field_support( 'dynamic_data', $field_options ); |
|
35 | 35 | |
36 | 36 | return $field_options; |
37 | 37 | } |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | |
24 | 24 | public function __construct() { |
25 | 25 | $this->label = esc_html__( 'Other Entries', 'gravityview' ); |
26 | - $this->description = esc_html__('Display other entries created by the entry creator.', 'gravityview'); |
|
26 | + $this->description = esc_html__( 'Display other entries created by the entry creator.', 'gravityview' ); |
|
27 | 27 | parent::__construct(); |
28 | 28 | } |
29 | 29 | |
@@ -33,32 +33,32 @@ discard block |
||
33 | 33 | */ |
34 | 34 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
35 | 35 | |
36 | - if( 'edit' === $context ) { |
|
36 | + if ( 'edit' === $context ) { |
|
37 | 37 | return $field_options; |
38 | 38 | } |
39 | 39 | |
40 | 40 | // No "Link to single entry"; all the items will be links to entries! |
41 | - unset( $field_options['show_as_link'] ); |
|
41 | + unset( $field_options[ 'show_as_link' ] ); |
|
42 | 42 | |
43 | 43 | $new_options = array(); |
44 | 44 | |
45 | - $new_options['link_format'] = array( |
|
45 | + $new_options[ 'link_format' ] = array( |
|
46 | 46 | 'type' => 'text', |
47 | 47 | 'label' => __( 'Entry link text (required)', 'gravityview' ), |
48 | - 'value' => __('Entry #{entry_id}', 'gravityview'), |
|
48 | + 'value' => __( 'Entry #{entry_id}', 'gravityview' ), |
|
49 | 49 | 'merge_tags' => 'force', |
50 | 50 | ); |
51 | 51 | |
52 | - $new_options['after_link'] = array( |
|
52 | + $new_options[ 'after_link' ] = array( |
|
53 | 53 | 'type' => 'textarea', |
54 | 54 | 'label' => __( 'Text or HTML to display after the link (optional)', 'gravityview' ), |
55 | - 'desc' => __('This content will be displayed below each entry link.', 'gravityview'), |
|
55 | + 'desc' => __( 'This content will be displayed below each entry link.', 'gravityview' ), |
|
56 | 56 | 'value' => '', |
57 | 57 | 'merge_tags' => 'force', |
58 | 58 | 'class' => 'widefat code', |
59 | 59 | ); |
60 | 60 | |
61 | - $new_options['page_size'] = array( |
|
61 | + $new_options[ 'page_size' ] = array( |
|
62 | 62 | 'type' => 'number', |
63 | 63 | 'label' => __( 'Entries to Display', 'gravityview' ), |
64 | 64 | 'desc' => __( 'What is the maximum number of entries that should be shown?', 'gravityview' ), |
@@ -66,14 +66,14 @@ discard block |
||
66 | 66 | 'merge_tags' => false, |
67 | 67 | ); |
68 | 68 | |
69 | - $new_options['no_entries_hide'] = array( |
|
69 | + $new_options[ 'no_entries_hide' ] = array( |
|
70 | 70 | 'type' => 'checkbox', |
71 | 71 | 'label' => __( 'Hide if no entries', 'gravityview' ), |
72 | 72 | 'desc' => __( 'Don\'t display this field if the entry creator has no other entries', 'gravityview' ), |
73 | 73 | 'value' => false, |
74 | 74 | ); |
75 | 75 | |
76 | - $new_options['no_entries_text'] = array( |
|
76 | + $new_options[ 'no_entries_text' ] = array( |
|
77 | 77 | 'type' => 'text', |
78 | 78 | 'label' => __( 'No Entries Text', 'gravityview' ), |
79 | 79 | 'desc' => __( 'The text that is shown if the entry creator has no other entries (and "Hide if no entries" is disabled).', 'gravityview' ), |
@@ -26,9 +26,9 @@ |
||
26 | 26 | function field_options( $field_options, $template_id = '', $field_id = '', $context = '', $input_type = '' ) { |
27 | 27 | |
28 | 28 | // It makes no sense to use this as the link. |
29 | - unset( $field_options['show_as_link'] ); |
|
29 | + unset( $field_options[ 'show_as_link' ] ); |
|
30 | 30 | |
31 | - if( 'edit' === $context ) { |
|
31 | + if ( 'edit' === $context ) { |
|
32 | 32 | return $field_options; |
33 | 33 | } |
34 | 34 |