@@ -84,7 +84,7 @@ |
||
| 84 | 84 | * @see \Gamajo_Template_Loader::set_template_data |
| 85 | 85 | * @see \GV\Template::pop_template_data |
| 86 | 86 | * |
| 87 | - * @return \Gamajo_Template_Loader The current instance. |
|
| 87 | + * @return Template The current instance. |
|
| 88 | 88 | */ |
| 89 | 89 | public function push_template_data( $data, $var_name = 'data' ) { |
| 90 | 90 | if ( ! isset( self::$data_stack[ $var_name ] ) ) { |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | function modify_entry_value_workflow_final_status( $output, $entry, $field_settings, $field ) { |
| 43 | 43 | |
| 44 | - if( ! empty( $output ) ) { |
|
| 44 | + if ( ! empty( $output ) ) { |
|
| 45 | 45 | $output = gravity_flow()->translate_status_label( $output ); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | foreach ( $search_fields as & $search_field ) { |
| 66 | 66 | if ( $this->name === \GV\Utils::get( $search_field, 'key' ) ) { |
| 67 | - $search_field['choices'] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options(); |
|
| 67 | + $search_field[ 'choices' ] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options(); |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | public function __destruct() { |
| 95 | - remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback );; |
|
| 95 | + remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback ); ; |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | /** |
@@ -175,55 +175,55 @@ discard block |
||
| 175 | 175 | |
| 176 | 176 | if ( $is_view && $post ) { |
| 177 | 177 | if ( $field_type ) { |
| 178 | - $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name ); |
|
| 179 | - $inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name ); |
|
| 180 | - $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type ); |
|
| 181 | - $inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType ); |
|
| 182 | - $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name ); |
|
| 183 | - $inputType && $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name ); |
|
| 184 | - $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type ); |
|
| 185 | - $inputType && $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType ); |
|
| 178 | + $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name ); |
|
| 179 | + $inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name ); |
|
| 180 | + $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type ); |
|
| 181 | + $inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType ); |
|
| 182 | + $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name ); |
|
| 183 | + $inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name ); |
|
| 184 | + $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type ); |
|
| 185 | + $inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType ); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name ); |
|
| 189 | - $specifics []= sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id ); |
|
| 190 | - $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name ); |
|
| 191 | - $specifics []= sprintf( '%spost-%d-field.php', $slug_dir, $post->ID ); |
|
| 188 | + $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name ); |
|
| 189 | + $specifics [ ] = sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id ); |
|
| 190 | + $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name ); |
|
| 191 | + $specifics [ ] = sprintf( '%spost-%d-field.php', $slug_dir, $post->ID ); |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | /** Field-specific */ |
| 195 | 195 | if ( $field_id && $form_id ) { |
| 196 | 196 | |
| 197 | 197 | if ( $field_id ) { |
| 198 | - $specifics []= sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name ); |
|
| 199 | - $specifics []= sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id ); |
|
| 198 | + $specifics [ ] = sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name ); |
|
| 199 | + $specifics [ ] = sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id ); |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | if ( $field_type ) { |
| 203 | - $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name ); |
|
| 204 | - $inputType && $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name ); |
|
| 205 | - $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type ); |
|
| 206 | - $inputType && $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType ); |
|
| 207 | - |
|
| 208 | - $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name ); |
|
| 209 | - $inputType && $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name ); |
|
| 210 | - $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type ); |
|
| 211 | - $inputType && $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType ); |
|
| 212 | - |
|
| 213 | - $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name ); |
|
| 214 | - $inputType && $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name ); |
|
| 215 | - $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $field_type ); |
|
| 216 | - $inputType && $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $inputType ); |
|
| 203 | + $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name ); |
|
| 204 | + $inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name ); |
|
| 205 | + $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type ); |
|
| 206 | + $inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType ); |
|
| 207 | + |
|
| 208 | + $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name ); |
|
| 209 | + $inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name ); |
|
| 210 | + $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type ); |
|
| 211 | + $inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType ); |
|
| 212 | + |
|
| 213 | + $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name ); |
|
| 214 | + $inputType && $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name ); |
|
| 215 | + $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $field_type ); |
|
| 216 | + $inputType && $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $inputType ); |
|
| 217 | 217 | } |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | if ( $form_id ) { |
| 221 | 221 | /** Generic field templates */ |
| 222 | - $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name ); |
|
| 223 | - $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name ); |
|
| 222 | + $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name ); |
|
| 223 | + $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name ); |
|
| 224 | 224 | |
| 225 | - $specifics []= sprintf( '%sview-%d-field.php', $slug_dir, $view_id ); |
|
| 226 | - $specifics []= sprintf( '%sform-%d-field.php', $slug_dir, $form_id ); |
|
| 225 | + $specifics [ ] = sprintf( '%sview-%d-field.php', $slug_dir, $view_id ); |
|
| 226 | + $specifics [ ] = sprintf( '%sform-%d-field.php', $slug_dir, $form_id ); |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | /** |
@@ -231,12 +231,12 @@ discard block |
||
| 231 | 231 | * Ignore some types that conflict. |
| 232 | 232 | */ |
| 233 | 233 | if ( ! in_array( $field_type, array( 'notes' ) ) ) { |
| 234 | - $specifics []= sprintf( '%s.php', $field_type ); |
|
| 235 | - $specifics []= sprintf( 'fields/%s.php', $field_type ); |
|
| 234 | + $specifics [ ] = sprintf( '%s.php', $field_type ); |
|
| 235 | + $specifics [ ] = sprintf( 'fields/%s.php', $field_type ); |
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | - $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $slug_name ); |
|
| 239 | - $specifics []= sprintf( '%sfield.php', $slug_dir ); |
|
| 238 | + $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name ); |
|
| 239 | + $specifics [ ] = sprintf( '%sfield.php', $slug_dir ); |
|
| 240 | 240 | |
| 241 | 241 | return array_merge( $specifics, $templates ); |
| 242 | 242 | }; |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | /** Prevent any PHP warnings that may be generated. */ |
| 267 | 267 | ob_start(); |
| 268 | 268 | |
| 269 | - $display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry['currency'], false, 'html' ); |
|
| 269 | + $display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry[ 'currency' ], false, 'html' ); |
|
| 270 | 270 | |
| 271 | 271 | if ( $errors = ob_get_clean() ) { |
| 272 | 272 | gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', array( 'data' => $errors ) ); |
@@ -44,12 +44,12 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | protected $form_id; |
| 46 | 46 | |
| 47 | - function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null) { |
|
| 47 | + function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null ) { |
|
| 48 | 48 | |
| 49 | 49 | // Backward compat |
| 50 | - if ( ! empty( $item['type'] ) ) { |
|
| 51 | - $item['input_type'] = $item['type']; |
|
| 52 | - unset( $item['type'] ); |
|
| 50 | + if ( ! empty( $item[ 'type' ] ) ) { |
|
| 51 | + $item[ 'input_type' ] = $item[ 'type' ]; |
|
| 52 | + unset( $item[ 'type' ] ); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | // Prevent items from not having index set |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | $this->id = $item_id; |
| 72 | 72 | $this->form_id = $form_id; |
| 73 | 73 | $this->settings = $settings; |
| 74 | - $this->label_type = $item['label_type']; |
|
| 74 | + $this->label_type = $item[ 'label_type' ]; |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -114,10 +114,10 @@ discard block |
||
| 114 | 114 | if ( $html ) { |
| 115 | 115 | |
| 116 | 116 | foreach ( $field_info_items as $item ) { |
| 117 | - $class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description'; |
|
| 117 | + $class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description'; |
|
| 118 | 118 | // Add the title in case the value's long, in which case, it'll be truncated by CSS. |
| 119 | 119 | $output .= '<span class="' . $class . '">'; |
| 120 | - $output .= esc_html( $item['value'] ); |
|
| 120 | + $output .= esc_html( $item[ 'value' ] ); |
|
| 121 | 121 | $output .= '</span>'; |
| 122 | 122 | } |
| 123 | 123 | |
@@ -145,29 +145,29 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | // $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know. |
| 147 | 147 | // TODO: Un-hack this |
| 148 | - $hide_settings_link = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : ''; |
|
| 148 | + $hide_settings_link = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : ''; |
|
| 149 | 149 | $settings_link = sprintf( '<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr( $settings_title ) ); |
| 150 | 150 | |
| 151 | 151 | // Should we show the icon that the field is being used as a link to single entry? |
| 152 | - $hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : ''; |
|
| 152 | + $hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : ''; |
|
| 153 | 153 | $show_as_link = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>'; |
| 154 | 154 | |
| 155 | 155 | // When a field label is empty, use the Field ID |
| 156 | 156 | $label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title; |
| 157 | 157 | |
| 158 | 158 | // If there's a custom label, and show label is checked, use that as the field heading |
| 159 | - if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) { |
|
| 160 | - $label = $this->settings['custom_label']; |
|
| 161 | - } else if ( ! empty( $this->item['customLabel'] ) ) { |
|
| 162 | - $label = $this->item['customLabel']; |
|
| 159 | + if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) { |
|
| 160 | + $label = $this->settings[ 'custom_label' ]; |
|
| 161 | + } else if ( ! empty( $this->item[ 'customLabel' ] ) ) { |
|
| 162 | + $label = $this->item[ 'customLabel' ]; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | $output = '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">'; |
| 166 | 166 | |
| 167 | 167 | $label = esc_attr( $label ); |
| 168 | 168 | |
| 169 | - if ( ! empty( $this->item['parent'] ) ) { |
|
| 170 | - $label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>'; |
|
| 169 | + if ( ! empty( $this->item[ 'parent' ] ) ) { |
|
| 170 | + $label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>'; |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | // Name of field / widget |
@@ -183,10 +183,10 @@ discard block |
||
| 183 | 183 | |
| 184 | 184 | $output .= '</h5>'; |
| 185 | 185 | |
| 186 | - $container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : ''; |
|
| 187 | - $data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : ''; |
|
| 186 | + $container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : ''; |
|
| 187 | + $data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : ''; |
|
| 188 | 188 | |
| 189 | - $output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>'; |
|
| 189 | + $output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>'; |
|
| 190 | 190 | |
| 191 | 191 | return $output; |
| 192 | 192 | } |
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | <?php |
| 28 | 28 | |
| 29 | - do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
| 29 | + do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
| 30 | 30 | |
| 31 | - do_action('gravityview_render_field_pickers', 'directory' ); |
|
| 31 | + do_action('gravityview_render_field_pickers', 'directory' ); |
|
| 32 | 32 | |
| 33 | - ?> |
|
| 33 | + ?> |
|
| 34 | 34 | |
| 35 | 35 | <?php // list of available widgets to be shown in the popup ?> |
| 36 | 36 | <div id="directory-available-widgets" class="hide-if-js gv-tooltip"> |
@@ -55,13 +55,13 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | <div id="single-active-fields" class="gv-grid gv-grid-pad gv-grid-border"> |
| 57 | 57 | <?php |
| 58 | - if(!empty( $curr_template ) ) { |
|
| 59 | - do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
| 60 | - } |
|
| 61 | - ?> |
|
| 58 | + if(!empty( $curr_template ) ) { |
|
| 59 | + do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
| 60 | + } |
|
| 61 | + ?> |
|
| 62 | 62 | </div> |
| 63 | 63 | <?php |
| 64 | - do_action('gravityview_render_field_pickers', 'single' ); |
|
| 64 | + do_action('gravityview_render_field_pickers', 'single' ); |
|
| 65 | 65 | ?> |
| 66 | 66 | </div> |
| 67 | 67 | |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | </div> |
| 81 | 81 | |
| 82 | 82 | <?php |
| 83 | - do_action('gravityview_render_field_pickers', 'edit' ); |
|
| 83 | + do_action('gravityview_render_field_pickers', 'edit' ); |
|
| 84 | 84 | ?> |
| 85 | 85 | |
| 86 | 86 | </div> |
@@ -10,32 +10,32 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | <div id="directory-fields" class="gv-section"> |
| 12 | 12 | |
| 13 | - <h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4> |
|
| 13 | + <h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview' ); ?></span></h4> |
|
| 14 | 14 | |
| 15 | - <?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?> |
|
| 15 | + <?php do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?> |
|
| 16 | 16 | |
| 17 | - <h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4> |
|
| 17 | + <h4><?php esc_html_e( 'Entries Fields', 'gravityview' ); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview' ); ?></span></h4> |
|
| 18 | 18 | |
| 19 | 19 | <div id="directory-active-fields" class="gv-grid gv-grid-pad gv-grid-border"> |
| 20 | - <?php if(!empty( $curr_template ) ) { |
|
| 21 | - do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true ); |
|
| 20 | + <?php if ( ! empty( $curr_template ) ) { |
|
| 21 | + do_action( 'gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true ); |
|
| 22 | 22 | } ?> |
| 23 | 23 | </div> |
| 24 | 24 | |
| 25 | - <h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview'); ?></span></h4> |
|
| 25 | + <h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview' ); ?></span></h4> |
|
| 26 | 26 | |
| 27 | 27 | <?php |
| 28 | 28 | |
| 29 | - do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
| 29 | + do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID ); |
|
| 30 | 30 | |
| 31 | - do_action('gravityview_render_field_pickers', 'directory' ); |
|
| 31 | + do_action( 'gravityview_render_field_pickers', 'directory' ); |
|
| 32 | 32 | |
| 33 | 33 | ?> |
| 34 | 34 | |
| 35 | 35 | <?php // list of available widgets to be shown in the popup ?> |
| 36 | 36 | <div id="directory-available-widgets" class="hide-if-js gv-tooltip"> |
| 37 | 37 | <span class="close"><i class="dashicons dashicons-dismiss"></i></span> |
| 38 | - <?php do_action('gravityview_render_available_widgets' ); ?> |
|
| 38 | + <?php do_action( 'gravityview_render_available_widgets' ); ?> |
|
| 39 | 39 | </div> |
| 40 | 40 | |
| 41 | 41 | </div> |
@@ -51,17 +51,17 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | <div id="single-fields" class="gv-section"> |
| 53 | 53 | |
| 54 | - <h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview'); ?></h4> |
|
| 54 | + <h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview' ); ?></h4> |
|
| 55 | 55 | |
| 56 | 56 | <div id="single-active-fields" class="gv-grid gv-grid-pad gv-grid-border"> |
| 57 | 57 | <?php |
| 58 | - if(!empty( $curr_template ) ) { |
|
| 59 | - do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
| 58 | + if ( ! empty( $curr_template ) ) { |
|
| 59 | + do_action( 'gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true ); |
|
| 60 | 60 | } |
| 61 | 61 | ?> |
| 62 | 62 | </div> |
| 63 | 63 | <?php |
| 64 | - do_action('gravityview_render_field_pickers', 'single' ); |
|
| 64 | + do_action( 'gravityview_render_field_pickers', 'single' ); |
|
| 65 | 65 | ?> |
| 66 | 66 | </div> |
| 67 | 67 | |
@@ -71,16 +71,16 @@ discard block |
||
| 71 | 71 | |
| 72 | 72 | <div id="edit-fields" class="gv-section"> |
| 73 | 73 | |
| 74 | - <h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4> |
|
| 74 | + <h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview' ); ?> <span><?php esc_html_e( 'If not configured, all form fields will be displayed.', 'gravityview' ); ?></span></h4> |
|
| 75 | 75 | |
| 76 | 76 | <div id="edit-active-fields" class="gv-grid gv-grid-pad gv-grid-border"> |
| 77 | 77 | <?php |
| 78 | - do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true ); |
|
| 78 | + do_action( 'gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true ); |
|
| 79 | 79 | ?> |
| 80 | 80 | </div> |
| 81 | 81 | |
| 82 | 82 | <?php |
| 83 | - do_action('gravityview_render_field_pickers', 'edit' ); |
|
| 83 | + do_action( 'gravityview_render_field_pickers', 'edit' ); |
|
| 84 | 84 | ?> |
| 85 | 85 | |
| 86 | 86 | </div> |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | /** |
| 85 | 85 | * @var string The REST API functionality identifier. |
| 86 | 86 | */ |
| 87 | - const FEATURE_REST = 'rest_api'; |
|
| 87 | + const FEATURE_REST = 'rest_api'; |
|
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | 90 | * Get the global instance of \GV\Plugin. |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | include_once $this->dir( 'includes/class-frontend-views.php' ); |
| 211 | 211 | include_once $this->dir( 'includes/class-gravityview-admin-bar.php' ); |
| 212 | 212 | include_once $this->dir( 'includes/class-gravityview-entry-list.php' ); |
| 213 | - include_once $this->dir( 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */ |
|
| 213 | + include_once $this->dir( 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */ |
|
| 214 | 214 | include_once $this->dir( 'includes/class-data.php' ); |
| 215 | 215 | include_once $this->dir( 'includes/class-gravityview-shortcode.php' ); |
| 216 | 216 | include_once $this->dir( 'includes/class-gravityview-entry-link-shortcode.php' ); |
@@ -244,12 +244,12 @@ discard block |
||
| 244 | 244 | |
| 245 | 245 | $locale = get_locale(); |
| 246 | 246 | |
| 247 | - if ( function_exists('get_user_locale') && is_admin() ) { |
|
| 247 | + if ( function_exists( 'get_user_locale' ) && is_admin() ) { |
|
| 248 | 248 | $locale = get_user_locale(); |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | $locale = apply_filters( 'plugin_locale', $locale, 'gravityview' ); |
| 252 | - $mofile = $this->dir( 'languages' ) . '/gravityview-'. $locale .'.mo'; |
|
| 252 | + $mofile = $this->dir( 'languages' ) . '/gravityview-' . $locale . '.mo'; |
|
| 253 | 253 | load_textdomain( 'gravityview', $mofile ); |
| 254 | 254 | } |
| 255 | 255 | } |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | */ |
| 383 | 383 | public function is_compatible_wordpress( $version = null ) { |
| 384 | 384 | |
| 385 | - if( ! $version ) { |
|
| 385 | + if ( ! $version ) { |
|
| 386 | 386 | $version = self::$min_wp_version; |
| 387 | 387 | } |
| 388 | 388 | |
@@ -423,8 +423,8 @@ discard block |
||
| 423 | 423 | * @return string The version of PHP. |
| 424 | 424 | */ |
| 425 | 425 | private function get_php_version() { |
| 426 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ? |
|
| 427 | - $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion(); |
|
| 426 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ? |
|
| 427 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion(); |
|
| 428 | 428 | } |
| 429 | 429 | |
| 430 | 430 | /** |
@@ -435,8 +435,8 @@ discard block |
||
| 435 | 435 | * @return string The version of WordPress. |
| 436 | 436 | */ |
| 437 | 437 | private function get_wordpress_version() { |
| 438 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ? |
|
| 439 | - $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version']; |
|
| 438 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ? |
|
| 439 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ]; |
|
| 440 | 440 | } |
| 441 | 441 | |
| 442 | 442 | /** |
@@ -447,13 +447,13 @@ discard block |
||
| 447 | 447 | * @return string|null The version of Gravity Forms or null if inactive. |
| 448 | 448 | */ |
| 449 | 449 | private function get_gravityforms_version() { |
| 450 | - if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) { |
|
| 450 | + if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) { |
|
| 451 | 451 | gravityview()->log->error( 'Gravity Forms is inactive or not installed.' ); |
| 452 | 452 | return null; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | - return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ? |
|
| 456 | - $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version; |
|
| 455 | + return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ? |
|
| 456 | + $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version; |
|
| 457 | 457 | } |
| 458 | 458 | |
| 459 | 459 | /** |
@@ -509,9 +509,9 @@ discard block |
||
| 509 | 509 | $tables = array(); |
| 510 | 510 | |
| 511 | 511 | if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) { |
| 512 | - $tables []= \GFFormsModel::get_entry_meta_table_name(); |
|
| 512 | + $tables [ ] = \GFFormsModel::get_entry_meta_table_name(); |
|
| 513 | 513 | } |
| 514 | - $tables []= \GFFormsModel::get_lead_meta_table_name(); |
|
| 514 | + $tables [ ] = \GFFormsModel::get_lead_meta_table_name(); |
|
| 515 | 515 | |
| 516 | 516 | foreach ( $tables as $meta_table ) { |
| 517 | 517 | $sql = " |
@@ -529,13 +529,13 @@ discard block |
||
| 529 | 529 | $tables = array(); |
| 530 | 530 | |
| 531 | 531 | if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) { |
| 532 | - $tables[] = \GFFormsModel::get_entry_notes_table_name(); |
|
| 532 | + $tables[ ] = \GFFormsModel::get_entry_notes_table_name(); |
|
| 533 | 533 | } |
| 534 | 534 | |
| 535 | - $tables[] = \GFFormsModel::get_lead_notes_table_name(); |
|
| 535 | + $tables[ ] = \GFFormsModel::get_lead_notes_table_name(); |
|
| 536 | 536 | |
| 537 | - $disapproved = __('Disapproved the Entry for GravityView', 'gravityview'); |
|
| 538 | - $approved = __('Approved the Entry for GravityView', 'gravityview'); |
|
| 537 | + $disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' ); |
|
| 538 | + $approved = __( 'Approved the Entry for GravityView', 'gravityview' ); |
|
| 539 | 539 | |
| 540 | 540 | $suppress = $wpdb->suppress_errors(); |
| 541 | 541 | foreach ( $tables as $notes_table ) { |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | |
| 46 | 46 | /** Entry does not belong to this view. */ |
| 47 | - if ( $view->form && $view->form->ID != $entry['form_id'] ) { |
|
| 47 | + if ( $view->form && $view->form->ID != $entry[ 'form_id' ] ) { |
|
| 48 | 48 | gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $entry->ID, 'view_id' => $view->ID ) ); |
| 49 | 49 | return null; |
| 50 | 50 | } |
@@ -105,14 +105,14 @@ discard block |
||
| 105 | 105 | * @return \GV\GF_Entry|null An instance of this entry or null if not found. |
| 106 | 106 | */ |
| 107 | 107 | public static function from_entry( $entry ) { |
| 108 | - if ( empty( $entry['id'] ) ) { |
|
| 108 | + if ( empty( $entry[ 'id' ] ) ) { |
|
| 109 | 109 | return null; |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | $self = new self(); |
| 113 | 113 | $self->entry = $entry; |
| 114 | 114 | |
| 115 | - $self->ID = $self->entry['id']; |
|
| 115 | + $self->ID = $self->entry[ 'id' ]; |
|
| 116 | 116 | $self->slug = \GravityView_API::get_entry_slug( $self->ID, $self->as_entry() ); |
| 117 | 117 | |
| 118 | 118 | return $self; |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | * @return bool Whether the offset exists or not. |
| 128 | 128 | */ |
| 129 | 129 | public function offsetExists( $offset ) { |
| 130 | - return isset( $this->entry[$offset] ); |
|
| 130 | + return isset( $this->entry[ $offset ] ); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /** |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | * @return mixed The value of the requested entry data. |
| 143 | 143 | */ |
| 144 | 144 | public function offsetGet( $offset ) { |
| 145 | - return $this->entry[$offset]; |
|
| 145 | + return $this->entry[ $offset ]; |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | /** |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | wp_embed_register_handler( 'gravityview_entry', self::get_entry_regex(), array( __CLASS__, 'render' ), 20000 ); |
| 27 | 27 | wp_oembed_add_provider( self::get_entry_regex(), self::$provider_url, true ); |
| 28 | 28 | |
| 29 | - if ( ! empty( $_GET['gv_oembed_provider'] ) && ! empty( $_GET['url'] ) ) { |
|
| 29 | + if ( ! empty( $_GET[ 'gv_oembed_provider' ] ) && ! empty( $_GET[ 'url' ] ) ) { |
|
| 30 | 30 | add_action( 'template_redirect', array( __CLASS__, 'render_provider_request' ) ); |
| 31 | 31 | } |
| 32 | 32 | |
@@ -43,8 +43,8 @@ discard block |
||
| 43 | 43 | * @return void |
| 44 | 44 | */ |
| 45 | 45 | public static function render_provider_request() { |
| 46 | - if ( ! empty( $_GET['url'] ) ) { |
|
| 47 | - $url = $_GET['url']; |
|
| 46 | + if ( ! empty( $_GET[ 'url' ] ) ) { |
|
| 47 | + $url = $_GET[ 'url' ]; |
|
| 48 | 48 | } else { |
| 49 | 49 | header( 'HTTP/1.0 404 Not Found' ); |
| 50 | 50 | exit; |
@@ -111,18 +111,18 @@ discard block |
||
| 111 | 111 | */ |
| 112 | 112 | private static function parse_matches( $matches, $url ) { |
| 113 | 113 | // If not using permalinks, re-assign values for matching groups |
| 114 | - if ( ! empty( $matches['entry_slug2'] ) ) { |
|
| 115 | - $matches['is_cpt'] = $matches['is_cpt2']; |
|
| 116 | - $matches['slug'] = $matches['slug2']; |
|
| 117 | - $matches['entry_slug'] = $matches['entry_slug2']; |
|
| 118 | - unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] ); |
|
| 114 | + if ( ! empty( $matches[ 'entry_slug2' ] ) ) { |
|
| 115 | + $matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ]; |
|
| 116 | + $matches[ 'slug' ] = $matches[ 'slug2' ]; |
|
| 117 | + $matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ]; |
|
| 118 | + unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] ); |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - if ( empty( $matches['entry_slug'] ) ) { |
|
| 121 | + if ( empty( $matches[ 'entry_slug' ] ) ) { |
|
| 122 | 122 | gravityview()->log->error( 'Entry slug not parsed by regex.', array( 'data' => $matches ) ); |
| 123 | 123 | return null; |
| 124 | 124 | } else { |
| 125 | - $entry_id = $matches['entry_slug']; |
|
| 125 | + $entry_id = $matches[ 'entry_slug' ]; |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) { |
@@ -142,12 +142,12 @@ discard block |
||
| 142 | 142 | if ( ! $view ) { |
| 143 | 143 | |
| 144 | 144 | // If the slug doesn't work, maybe using Plain permalinks and not the slug, only ID |
| 145 | - if( is_numeric( $matches['slug'] ) ) { |
|
| 146 | - $view = \GV\View::by_id( $matches['slug'] ); |
|
| 145 | + if ( is_numeric( $matches[ 'slug' ] ) ) { |
|
| 146 | + $view = \GV\View::by_id( $matches[ 'slug' ] ); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - if( ! $view ) { |
|
| 150 | - $view = \GV\View::from_post( get_page_by_path( $matches['slug'], OBJECT, 'gravityview' ) ); |
|
| 149 | + if ( ! $view ) { |
|
| 150 | + $view = \GV\View::from_post( get_page_by_path( $matches[ 'slug' ], OBJECT, 'gravityview' ) ); |
|
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | |
@@ -178,9 +178,9 @@ discard block |
||
| 178 | 178 | |
| 179 | 179 | return ' |
| 180 | 180 | <div class="loading-placeholder" style="background-color:#e6f0f5;"> |
| 181 | - <h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3> |
|
| 181 | + <h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image . $embed_heading . '</h3> |
|
| 182 | 182 | <p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;"> |
| 183 | - '.$embed_text.' |
|
| 183 | + '.$embed_text . ' |
|
| 184 | 184 | </p> |
| 185 | 185 | <br style="clear: both;"> |
| 186 | 186 | </div>'; |
@@ -194,8 +194,8 @@ discard block |
||
| 194 | 194 | private static function render_preview_notice() { |
| 195 | 195 | $floaty = \GravityView_Admin::get_floaty(); |
| 196 | 196 | $title = esc_html__( 'This will look better when it is embedded.', 'gravityview' ); |
| 197 | - $message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview'); |
|
| 198 | - return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>'; |
|
| 197 | + $message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview' ); |
|
| 198 | + return '<div class="updated notice">' . $floaty . '<h3>' . $title . '</h3><p>' . $message . '</p><br style="clear:both;" /></div>'; |
|
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | /** |
@@ -214,13 +214,13 @@ discard block |
||
| 214 | 214 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | - if ( $entry && 'active' !== $entry['status'] ) { |
|
| 217 | + if ( $entry && 'active' !== $entry[ 'status' ] ) { |
|
| 218 | 218 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
| 219 | 219 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 220 | 220 | } |
| 221 | 221 | |
| 222 | 222 | if ( $view->settings->get( 'show_only_approved' ) ) { |
| 223 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 223 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
| 224 | 224 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
| 225 | 225 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
| 226 | 226 | } |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | // Catch either |
| 286 | 286 | $match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})"; |
| 287 | 287 | |
| 288 | - return '#'.$match_regex.'#i'; |
|
| 288 | + return '#' . $match_regex . '#i'; |
|
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | /** |