| @@ -312,11 +312,11 @@ discard block | ||
| 312 | 312 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' ); | 
| 313 | 313 | |
| 314 | 314 | |
| 315 | - /** | |
| 316 | - * When an entry is created, check if we need to update the custom slug meta | |
| 317 | - * todo: move this to its own class.. | |
| 318 | - */ | |
| 319 | - add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 ); | |
| 315 | + /** | |
| 316 | + * When an entry is created, check if we need to update the custom slug meta | |
| 317 | + * todo: move this to its own class.. | |
| 318 | + */ | |
| 319 | + add_action( 'gform_entry_created', array( 'GravityView_API', 'entry_create_custom_slug' ), 10, 2 ); | |
| 320 | 320 | |
| 321 | 321 | /** | 
| 322 | 322 | * @action `gravityview_include_frontend_actions` Triggered after all GravityView frontend files are loaded | 
| @@ -347,34 +347,34 @@ discard block | ||
| 347 | 347 | |
| 348 | 348 | /** DEBUG */ | 
| 349 | 349 | |
| 350 | - /** | |
| 351 | - * Logs messages using Gravity Forms logging add-on | |
| 352 | - * @param string $message log message | |
| 353 | - * @param mixed $data Additional data to display | |
| 354 | - * @return void | |
| 355 | - */ | |
| 356 | -    public static function log_debug( $message, $data = null ){ | |
| 357 | - /** | |
| 358 | - * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output | |
| 359 | - * @param string $message Message to display | |
| 360 | - * @param mixed $data Supporting data to print alongside it | |
| 361 | - */ | |
| 362 | - do_action( 'gravityview_log_debug', $message, $data ); | |
| 363 | - } | |
| 364 | - | |
| 365 | - /** | |
| 366 | - * Logs messages using Gravity Forms logging add-on | |
| 367 | - * @param string $message log message | |
| 368 | - * @return void | |
| 369 | - */ | |
| 370 | -    public static function log_error( $message, $data = null ){ | |
| 371 | - /** | |
| 372 | - * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output | |
| 373 | - * @param string $message Error message to display | |
| 374 | - * @param mixed $data Supporting data to print alongside it | |
| 375 | - */ | |
| 376 | - do_action( 'gravityview_log_error', $message, $data ); | |
| 377 | - } | |
| 350 | + /** | |
| 351 | + * Logs messages using Gravity Forms logging add-on | |
| 352 | + * @param string $message log message | |
| 353 | + * @param mixed $data Additional data to display | |
| 354 | + * @return void | |
| 355 | + */ | |
| 356 | +	public static function log_debug( $message, $data = null ){ | |
| 357 | + /** | |
| 358 | + * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output | |
| 359 | + * @param string $message Message to display | |
| 360 | + * @param mixed $data Supporting data to print alongside it | |
| 361 | + */ | |
| 362 | + do_action( 'gravityview_log_debug', $message, $data ); | |
| 363 | + } | |
| 364 | + | |
| 365 | + /** | |
| 366 | + * Logs messages using Gravity Forms logging add-on | |
| 367 | + * @param string $message log message | |
| 368 | + * @return void | |
| 369 | + */ | |
| 370 | +	public static function log_error( $message, $data = null ){ | |
| 371 | + /** | |
| 372 | + * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output | |
| 373 | + * @param string $message Error message to display | |
| 374 | + * @param mixed $data Supporting data to print alongside it | |
| 375 | + */ | |
| 376 | + do_action( 'gravityview_log_error', $message, $data ); | |
| 377 | + } | |
| 378 | 378 | |
| 379 | 379 | } // end class GravityView_Plugin | 
| 380 | 380 | |
| @@ -66,20 +66,20 @@ discard block | ||
| 66 | 66 | |
| 67 | 67 | /** Load common & connector functions */ | 
| 68 | 68 | require_once( GRAVITYVIEW_DIR . 'includes/helper-functions.php' ); | 
| 69 | -require_once( GRAVITYVIEW_DIR . 'includes/class-common.php'); | |
| 70 | -require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php'); | |
| 69 | +require_once( GRAVITYVIEW_DIR . 'includes/class-common.php' ); | |
| 70 | +require_once( GRAVITYVIEW_DIR . 'includes/connector-functions.php' ); | |
| 71 | 71 | require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-compatibility.php' ); | 
| 72 | 72 | require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-roles-capabilities.php' ); | 
| 73 | 73 | require_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-notices.php' ); | 
| 74 | 74 | |
| 75 | 75 | /** Register Post Types and Rewrite Rules */ | 
| 76 | -require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php'); | |
| 76 | +require_once( GRAVITYVIEW_DIR . 'includes/class-post-types.php' ); | |
| 77 | 77 | |
| 78 | 78 | /** Add Cache Class */ | 
| 79 | -require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php'); | |
| 79 | +require_once( GRAVITYVIEW_DIR . 'includes/class-cache.php' ); | |
| 80 | 80 | |
| 81 | 81 | /** Register hooks that are fired when the plugin is activated and deactivated. */ | 
| 82 | -if( is_admin() ) { | |
| 82 | +if ( is_admin() ) { | |
| 83 | 83 | register_activation_hook( __FILE__, array( 'GravityView_Plugin', 'activate' ) ); | 
| 84 | 84 | register_deactivation_hook( __FILE__, array( 'GravityView_Plugin', 'deactivate' ) ); | 
| 85 | 85 | } | 
| @@ -100,7 +100,7 @@ discard block | ||
| 100 | 100 | */ | 
| 101 | 101 |  	public static function getInstance() { | 
| 102 | 102 | |
| 103 | -		if( empty( self::$instance ) ) { | |
| 103 | +		if ( empty( self::$instance ) ) { | |
| 104 | 104 | self::$instance = new self; | 
| 105 | 105 | } | 
| 106 | 106 | |
| @@ -110,7 +110,7 @@ discard block | ||
| 110 | 110 |  	private function __construct() { | 
| 111 | 111 | |
| 112 | 112 | |
| 113 | -		if( ! GravityView_Compatibility::is_valid() ) { | |
| 113 | +		if ( ! GravityView_Compatibility::is_valid() ) { | |
| 114 | 114 | return; | 
| 115 | 115 | } | 
| 116 | 116 | |
| @@ -139,7 +139,7 @@ discard block | ||
| 139 | 139 | */ | 
| 140 | 140 |  	public function include_files() { | 
| 141 | 141 | |
| 142 | - include_once( GRAVITYVIEW_DIR .'includes/class-admin.php' ); | |
| 142 | + include_once( GRAVITYVIEW_DIR . 'includes/class-admin.php' ); | |
| 143 | 143 | |
| 144 | 144 | // Load fields | 
| 145 | 145 | include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-fields.php' ); | 
| @@ -150,19 +150,19 @@ discard block | ||
| 150 | 150 | include_once( $gv_field_filename ); | 
| 151 | 151 | } | 
| 152 | 152 | |
| 153 | - include_once( GRAVITYVIEW_DIR .'includes/class-gravityview-entry-notes.php' ); | |
| 154 | - include_once( GRAVITYVIEW_DIR .'includes/load-plugin-and-theme-hooks.php' ); | |
| 153 | + include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-notes.php' ); | |
| 154 | + include_once( GRAVITYVIEW_DIR . 'includes/load-plugin-and-theme-hooks.php' ); | |
| 155 | 155 | |
| 156 | 156 | // Load Extensions | 
| 157 | 157 | // @todo: Convert to a scan of the directory or a method where this all lives | 
| 158 | - include_once( GRAVITYVIEW_DIR .'includes/extensions/edit-entry/class-edit-entry.php' ); | |
| 159 | - include_once( GRAVITYVIEW_DIR .'includes/extensions/delete-entry/class-delete-entry.php' ); | |
| 158 | + include_once( GRAVITYVIEW_DIR . 'includes/extensions/edit-entry/class-edit-entry.php' ); | |
| 159 | + include_once( GRAVITYVIEW_DIR . 'includes/extensions/delete-entry/class-delete-entry.php' ); | |
| 160 | 160 | |
| 161 | 161 | // Load WordPress Widgets | 
| 162 | - include_once( GRAVITYVIEW_DIR .'includes/wordpress-widgets/register-wordpress-widgets.php' ); | |
| 162 | + include_once( GRAVITYVIEW_DIR . 'includes/wordpress-widgets/register-wordpress-widgets.php' ); | |
| 163 | 163 | |
| 164 | 164 | // Load GravityView Widgets | 
| 165 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/register-gravityview-widgets.php' ); | |
| 165 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/register-gravityview-widgets.php' ); | |
| 166 | 166 | |
| 167 | 167 | // Add oEmbed | 
| 168 | 168 | include_once( GRAVITYVIEW_DIR . 'includes/class-oembed.php' ); | 
| @@ -175,7 +175,7 @@ discard block | ||
| 175 | 175 | include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' ); | 
| 176 | 176 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-admin-bar.php' ); | 
| 177 | 177 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-list.php' ); | 
| 178 | - include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */ | |
| 178 | + include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */ | |
| 179 | 179 | include_once( GRAVITYVIEW_DIR . 'includes/class-data.php' ); | 
| 180 | 180 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-shortcode.php' ); | 
| 181 | 181 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-entry-link-shortcode.php' ); | 
| @@ -190,7 +190,7 @@ discard block | ||
| 190 | 190 | * @return bool | 
| 191 | 191 | */ | 
| 192 | 192 |  	public static function is_network_activated() { | 
| 193 | -		return is_multisite() && ( function_exists('is_plugin_active_for_network') && is_plugin_active_for_network( 'gravityview/gravityview.php' ) ); | |
| 193 | + return is_multisite() && ( function_exists( 'is_plugin_active_for_network' ) && is_plugin_active_for_network( 'gravityview/gravityview.php' ) ); | |
| 194 | 194 | } | 
| 195 | 195 | |
| 196 | 196 | |
| @@ -255,7 +255,7 @@ discard block | ||
| 255 | 255 | * @since 1.7.5.1 | 
| 256 | 256 | */ | 
| 257 | 257 |  	public static function include_widget_class() { | 
| 258 | - include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' ); | |
| 258 | + include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' ); | |
| 259 | 259 | } | 
| 260 | 260 | |
| 261 | 261 | |
| @@ -276,7 +276,7 @@ discard block | ||
| 276 | 276 | } | 
| 277 | 277 |  		if ( ! $loaded ) { | 
| 278 | 278 | $locale = apply_filters( 'plugin_locale', get_locale(), 'gravityview' ); | 
| 279 | - $mofile = dirname( __FILE__ ) . '/languages/gravityview-'. $locale .'.mo'; | |
| 279 | + $mofile = dirname( __FILE__ ) . '/languages/gravityview-' . $locale . '.mo'; | |
| 280 | 280 | load_textdomain( 'gravityview', $mofile ); | 
| 281 | 281 | } | 
| 282 | 282 | |
| @@ -302,12 +302,12 @@ discard block | ||
| 302 | 302 | */ | 
| 303 | 303 |  	public function frontend_actions() { | 
| 304 | 304 | |
| 305 | -		if( self::is_admin() ) { return; } | |
| 305 | +		if ( self::is_admin() ) { return; } | |
| 306 | 306 | |
| 307 | 307 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-image.php' ); | 
| 308 | - include_once( GRAVITYVIEW_DIR .'includes/class-template.php' ); | |
| 309 | - include_once( GRAVITYVIEW_DIR .'includes/class-api.php' ); | |
| 310 | - include_once( GRAVITYVIEW_DIR .'includes/class-frontend-views.php' ); | |
| 308 | + include_once( GRAVITYVIEW_DIR . 'includes/class-template.php' ); | |
| 309 | + include_once( GRAVITYVIEW_DIR . 'includes/class-api.php' ); | |
| 310 | + include_once( GRAVITYVIEW_DIR . 'includes/class-frontend-views.php' ); | |
| 311 | 311 | include_once( GRAVITYVIEW_DIR . 'includes/class-gravityview-change-entry-creator.php' ); | 
| 312 | 312 | |
| 313 | 313 | |
| @@ -332,8 +332,8 @@ discard block | ||
| 332 | 332 | */ | 
| 333 | 333 |  	public static function get_default_widget_areas() { | 
| 334 | 334 | $default_areas = array( | 
| 335 | -			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __('Top', 'gravityview' ) , 'subtitle' => '' ) ) ), | |
| 336 | -			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __('Left', 'gravityview') , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __('Right', 'gravityview') , 'subtitle' => '' ) ) ), | |
| 335 | + array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ), | |
| 336 | + array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ), | |
| 337 | 337 | ); | 
| 338 | 338 | |
| 339 | 339 | /** | 
| @@ -351,7 +351,7 @@ discard block | ||
| 351 | 351 | * @param mixed $data Additional data to display | 
| 352 | 352 | * @return void | 
| 353 | 353 | */ | 
| 354 | -    public static function log_debug( $message, $data = null ){ | |
| 354 | +    public static function log_debug( $message, $data = null ) { | |
| 355 | 355 | /** | 
| 356 | 356 | * @action `gravityview_log_debug` Log a debug message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output | 
| 357 | 357 | * @param string $message Message to display | 
| @@ -365,7 +365,7 @@ discard block | ||
| 365 | 365 | * @param string $message log message | 
| 366 | 366 | * @return void | 
| 367 | 367 | */ | 
| 368 | -    public static function log_error( $message, $data = null ){ | |
| 368 | +    public static function log_error( $message, $data = null ) { | |
| 369 | 369 | /** | 
| 370 | 370 | * @action `gravityview_log_error` Log an error message that shows up in the Gravity Forms Logging Addon and also the Debug Bar plugin output | 
| 371 | 371 | * @param string $message Error message to display | 
| @@ -376,4 +376,4 @@ discard block | ||
| 376 | 376 | |
| 377 | 377 | } // end class GravityView_Plugin | 
| 378 | 378 | |
| 379 | -add_action('plugins_loaded', array('GravityView_Plugin', 'getInstance'), 1); | |
| 379 | +add_action( 'plugins_loaded', array( 'GravityView_Plugin', 'getInstance' ), 1 ); | |
| @@ -15,7 +15,7 @@ | ||
| 15 | 15 | return; | 
| 16 | 16 | } | 
| 17 | 17 | |
| 18 | - $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; | |
| 18 | + $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; | |
| 19 | 19 | |
| 20 | 20 | ?> | 
| 21 | 21 | <input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" /> | 
| @@ -10,12 +10,12 @@ | ||
| 10 | 10 | |
| 11 | 11 |  	function render_input( $override_input = null ) { | 
| 12 | 12 | |
| 13 | -		if( isset( $override_input ) ) { | |
| 13 | +		if ( isset( $override_input ) ) { | |
| 14 | 14 | echo $override_input; | 
| 15 | 15 | return; | 
| 16 | 16 | } | 
| 17 | 17 | |
| 18 | - $class = !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; | |
| 18 | + $class = ! empty( $this->field[ 'class' ] ) ? $this->field[ 'class' ] : 'widefat'; | |
| 19 | 19 | |
| 20 | 20 | ?> | 
| 21 | 21 | <input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="hidden" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>" /> | 
| @@ -28,10 +28,10 @@ | ||
| 28 | 28 | |
| 29 | 29 | $show_mt = $this->show_merge_tags(); | 
| 30 | 30 | |
| 31 | -        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { | |
| 32 | - $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; | |
| 33 | - } | |
| 34 | - $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; | |
| 31 | +		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { | |
| 32 | + $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; | |
| 33 | + } | |
| 34 | + $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; | |
| 35 | 35 | |
| 36 | 36 | ?> | 
| 37 | 37 | <input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>"> | 
| @@ -8,7 +8,7 @@ discard block | ||
| 8 | 8 | ?> | 
| 9 | 9 | <label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php | 
| 10 | 10 | |
| 11 | - echo '<span class="gv-label">'.$this->get_field_label().'</span>'; | |
| 11 | + echo '<span class="gv-label">' . $this->get_field_label() . '</span>'; | |
| 12 | 12 | echo $this->get_tooltip() . $this->get_field_desc(); | 
| 13 | 13 | ?><div> | 
| 14 | 14 | <?php $this->render_input(); ?> | 
| @@ -19,7 +19,7 @@ discard block | ||
| 19 | 19 | |
| 20 | 20 |  	function render_input( $override_input = null ) { | 
| 21 | 21 | |
| 22 | -		if( isset( $override_input ) ) { | |
| 22 | +		if ( isset( $override_input ) ) { | |
| 23 | 23 | echo $override_input; | 
| 24 | 24 | return; | 
| 25 | 25 | } | 
| @@ -28,10 +28,10 @@ discard block | ||
| 28 | 28 | |
| 29 | 29 | $show_mt = $this->show_merge_tags(); | 
| 30 | 30 | |
| 31 | -        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { | |
| 31 | +        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) { | |
| 32 | 32 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields '; | 
| 33 | 33 | } | 
| 34 | - $class .= !empty( $this->field['class'] ) ? $this->field['class'] : 'widefat'; | |
| 34 | + $class .= ! empty( $this->field[ 'class' ] ) ? $this->field[ 'class' ] : 'widefat'; | |
| 35 | 35 | |
| 36 | 36 | ?> | 
| 37 | 37 | <input name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" type="text" value="<?php echo esc_attr( $this->value ); ?>" class="<?php echo esc_attr( $class ); ?>"> | 
| @@ -28,14 +28,14 @@ | ||
| 28 | 28 | |
| 29 | 29 | $show_mt = $this->show_merge_tags(); | 
| 30 | 30 | |
| 31 | -        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { | |
| 32 | - $class = ' merge-tag-support mt-position-right '; | |
| 33 | - | |
| 34 | -            if( empty( $this->field['show_all_fields'] ) ) { | |
| 35 | - $class .= ' mt-hide_all_fields'; | |
| 36 | - } | |
| 37 | - } | |
| 38 | - $class .= !empty( $this->field['class'] ) ? 'widefat ' . $this->field['class'] : 'widefat'; | |
| 31 | +		if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { | |
| 32 | + $class = ' merge-tag-support mt-position-right '; | |
| 33 | + | |
| 34 | +			if( empty( $this->field['show_all_fields'] ) ) { | |
| 35 | + $class .= ' mt-hide_all_fields'; | |
| 36 | + } | |
| 37 | + } | |
| 38 | + $class .= !empty( $this->field['class'] ) ? 'widefat ' . $this->field['class'] : 'widefat'; | |
| 39 | 39 | |
| 40 | 40 | ?> | 
| 41 | 41 | <textarea name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo esc_attr( $class ); ?>" rows="5"><?php echo esc_textarea( $this->value ); ?></textarea> | 
| @@ -9,7 +9,7 @@ discard block | ||
| 9 | 9 | ?> | 
| 10 | 10 | <label for="<?php echo $this->get_field_id(); ?>" class="<?php echo $this->get_label_class(); ?>"><?php | 
| 11 | 11 | |
| 12 | - echo '<span class="gv-label">'.$this->get_field_label().'</span>'; | |
| 12 | + echo '<span class="gv-label">' . $this->get_field_label() . '</span>'; | |
| 13 | 13 | echo $this->get_tooltip() . $this->get_field_desc(); | 
| 14 | 14 | ?><div> | 
| 15 | 15 | <?php $this->render_input(); ?> | 
| @@ -19,7 +19,7 @@ discard block | ||
| 19 | 19 | } | 
| 20 | 20 | |
| 21 | 21 |  	function render_input( $override_input = null ) { | 
| 22 | -		if( isset( $override_input ) ) { | |
| 22 | +		if ( isset( $override_input ) ) { | |
| 23 | 23 | echo $override_input; | 
| 24 | 24 | return; | 
| 25 | 25 | } | 
| @@ -28,17 +28,17 @@ discard block | ||
| 28 | 28 | |
| 29 | 29 | $show_mt = $this->show_merge_tags(); | 
| 30 | 30 | |
| 31 | -        if( $show_mt && $this->field['merge_tags'] !== false || $this->field['merge_tags'] === 'force' ) { | |
| 31 | +        if ( $show_mt && $this->field[ 'merge_tags' ] !== false || $this->field[ 'merge_tags' ] === 'force' ) { | |
| 32 | 32 | $class = ' merge-tag-support mt-position-right '; | 
| 33 | 33 | |
| 34 | -            if( empty( $this->field['show_all_fields'] ) ) { | |
| 34 | +            if ( empty( $this->field[ 'show_all_fields' ] ) ) { | |
| 35 | 35 | $class .= ' mt-hide_all_fields'; | 
| 36 | 36 | } | 
| 37 | 37 | } | 
| 38 | - $class .= !empty( $this->field['class'] ) ? 'widefat ' . $this->field['class'] : 'widefat'; | |
| 38 | + $class .= ! empty( $this->field[ 'class' ] ) ? 'widefat ' . $this->field[ 'class' ] : 'widefat'; | |
| 39 | 39 | |
| 40 | 40 | ?> | 
| 41 | - <textarea name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo esc_attr( $class ); ?>" rows="5"><?php echo esc_textarea( $this->value ); ?></textarea> | |
| 41 | + <textarea name="<?php echo esc_attr( $this->name ); ?>" id="<?php echo $this->get_field_id(); ?>" class="<?php echo esc_attr( $class ); ?>" rows="5"><?php echo esc_textarea( $this->value ); ?></textarea> | |
| 42 | 42 | <?php | 
| 43 | 43 | } | 
| 44 | 44 | |
| @@ -14,7 +14,7 @@ discard block | ||
| 14 | 14 | |
| 15 | 15 |  		if( !GravityView_Compatibility::is_valid() ) { return; } | 
| 16 | 16 | |
| 17 | - self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/'; | |
| 17 | + self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/'; | |
| 18 | 18 | |
| 19 | 19 | include_once self::$metaboxes_dir . 'class-gravityview-metabox-tab.php'; | 
| 20 | 20 | |
| @@ -228,13 +228,13 @@ discard block | ||
| 228 | 228 | $get_id_backup = isset($_GET['id']) ? $_GET['id'] : NULL; | 
| 229 | 229 | |
| 230 | 230 |  		if( isset( $form['id'] ) ) { | 
| 231 | - $form_script = 'var form = ' . GFCommon::json_encode($form) . ';'; | |
| 231 | + $form_script = 'var form = ' . GFCommon::json_encode($form) . ';'; | |
| 232 | 232 | |
| 233 | - // The `gf_vars()` method needs a $_GET[id] variable set with the form ID. | |
| 234 | - $_GET['id'] = $form['id']; | |
| 233 | + // The `gf_vars()` method needs a $_GET[id] variable set with the form ID. | |
| 234 | + $_GET['id'] = $form['id']; | |
| 235 | 235 | |
| 236 | 236 |  		} else { | 
| 237 | - $form_script = 'var form = new Form();'; | |
| 237 | + $form_script = 'var form = new Form();'; | |
| 238 | 238 | } | 
| 239 | 239 | |
| 240 | 240 | $output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars(false) . '</script>'; | 
| @@ -17,7 +17,7 @@ discard block | ||
| 17 | 17 | */ | 
| 18 | 18 |  	function __construct() { | 
| 19 | 19 | |
| 20 | -		if( !GravityView_Compatibility::is_valid() ) { return; } | |
| 20 | +		if ( ! GravityView_Compatibility::is_valid() ) { return; } | |
| 21 | 21 | |
| 22 | 22 | self::$metaboxes_dir = GRAVITYVIEW_DIR . 'includes/admin/metaboxes/'; | 
| 23 | 23 | |
| @@ -35,9 +35,9 @@ discard block | ||
| 35 | 35 | */ | 
| 36 | 36 |  	function initialize() { | 
| 37 | 37 | |
| 38 | - add_action( 'add_meta_boxes', array( $this, 'register_metaboxes' )); | |
| 38 | + add_action( 'add_meta_boxes', array( $this, 'register_metaboxes' ) ); | |
| 39 | 39 | |
| 40 | - add_action( 'add_meta_boxes_gravityview' , array( $this, 'update_priority' ) ); | |
| 40 | + add_action( 'add_meta_boxes_gravityview', array( $this, 'update_priority' ) ); | |
| 41 | 41 | |
| 42 | 42 | // information box | 
| 43 | 43 | add_action( 'post_submitbox_misc_actions', array( $this, 'render_shortcode_hint' ) ); | 
| @@ -51,13 +51,13 @@ discard block | ||
| 51 | 51 |  	function update_priority() { | 
| 52 | 52 | global $wp_meta_boxes; | 
| 53 | 53 | |
| 54 | -		if( ! empty( $wp_meta_boxes['gravityview'] ) ) { | |
| 55 | -			foreach( array( 'high', 'core', 'low' ) as $position ) { | |
| 56 | -				if( isset( $wp_meta_boxes['gravityview']['normal'][ $position ] ) ) { | |
| 57 | -					foreach( $wp_meta_boxes['gravityview']['normal'][ $position ] as $key => $meta_box ) { | |
| 58 | -						if( ! preg_match( '/^gravityview_/ism', $key ) ) { | |
| 59 | - $wp_meta_boxes['gravityview']['advanced'][ $position ][ $key ] = $meta_box; | |
| 60 | - unset( $wp_meta_boxes['gravityview']['normal'][ $position ][ $key ] ); | |
| 54 | +		if ( ! empty( $wp_meta_boxes[ 'gravityview' ] ) ) { | |
| 55 | +			foreach ( array( 'high', 'core', 'low' ) as $position ) { | |
| 56 | +				if ( isset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] ) ) { | |
| 57 | +					foreach ( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] as $key => $meta_box ) { | |
| 58 | +						if ( ! preg_match( '/^gravityview_/ism', $key ) ) { | |
| 59 | + $wp_meta_boxes[ 'gravityview' ][ 'advanced' ][ $position ][ $key ] = $meta_box; | |
| 60 | + unset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ][ $key ] ); | |
| 61 | 61 | } | 
| 62 | 62 | } | 
| 63 | 63 | } | 
| @@ -69,7 +69,7 @@ discard block | ||
| 69 | 69 | global $post; | 
| 70 | 70 | |
| 71 | 71 | // On Comment Edit, for example, $post isn't set. | 
| 72 | -		if( empty( $post ) || !is_object( $post ) || !isset( $post->ID ) ) { | |
| 72 | +		if ( empty( $post ) || ! is_object( $post ) || ! isset( $post->ID ) ) { | |
| 73 | 73 | return; | 
| 74 | 74 | } | 
| 75 | 75 | |
| @@ -152,9 +152,9 @@ discard block | ||
| 152 | 152 | */ | 
| 153 | 153 | $metaboxes = apply_filters( 'gravityview/metaboxes/default', $metaboxes ); | 
| 154 | 154 | |
| 155 | -		foreach( $metaboxes as $m ) { | |
| 155 | +		foreach ( $metaboxes as $m ) { | |
| 156 | 156 | |
| 157 | - $tab = new GravityView_Metabox_Tab( $m['id'], $m['title'], $m['file'], $m['icon-class'], $m['callback'], $m['callback_args'] ); | |
| 157 | + $tab = new GravityView_Metabox_Tab( $m[ 'id' ], $m[ 'title' ], $m[ 'file' ], $m[ 'icon-class' ], $m[ 'callback' ], $m[ 'callback_args' ] ); | |
| 158 | 158 | |
| 159 | 159 | GravityView_Metabox_Tabs::add( $tab ); | 
| 160 | 160 | |
| @@ -180,8 +180,8 @@ discard block | ||
| 180 | 180 | |
| 181 | 181 | $links = GravityView_Admin_Views::get_connected_form_links( $current_form, false ); | 
| 182 | 182 | |
| 183 | -		if( !empty( $links ) ) { | |
| 184 | - $links = '<span class="alignright gv-form-links">'. $links .'</span>'; | |
| 183 | +		if ( ! empty( $links ) ) { | |
| 184 | + $links = '<span class="alignright gv-form-links">' . $links . '</span>'; | |
| 185 | 185 | } | 
| 186 | 186 | |
| 187 | 187 | return __( 'Data Source', 'gravityview' ) . $links; | 
| @@ -220,28 +220,28 @@ discard block | ||
| 220 | 220 | */ | 
| 221 | 221 |  	public static function render_merge_tags_scripts( $curr_form ) { | 
| 222 | 222 | |
| 223 | -		if( empty( $curr_form )) { | |
| 223 | +		if ( empty( $curr_form ) ) { | |
| 224 | 224 | return NULL; | 
| 225 | 225 | } | 
| 226 | 226 | |
| 227 | 227 | $form = gravityview_get_form( $curr_form ); | 
| 228 | 228 | |
| 229 | - $get_id_backup = isset($_GET['id']) ? $_GET['id'] : NULL; | |
| 229 | + $get_id_backup = isset( $_GET[ 'id' ] ) ? $_GET[ 'id' ] : NULL; | |
| 230 | 230 | |
| 231 | -		if( isset( $form['id'] ) ) { | |
| 232 | - $form_script = 'var form = ' . GFCommon::json_encode($form) . ';'; | |
| 231 | +		if ( isset( $form[ 'id' ] ) ) { | |
| 232 | + $form_script = 'var form = ' . GFCommon::json_encode( $form ) . ';'; | |
| 233 | 233 | |
| 234 | 234 | // The `gf_vars()` method needs a $_GET[id] variable set with the form ID. | 
| 235 | - $_GET['id'] = $form['id']; | |
| 235 | + $_GET[ 'id' ] = $form[ 'id' ]; | |
| 236 | 236 | |
| 237 | 237 |  		} else { | 
| 238 | 238 | $form_script = 'var form = new Form();'; | 
| 239 | 239 | } | 
| 240 | 240 | |
| 241 | - $output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars(false) . '</script>'; | |
| 241 | + $output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars( false ) . '</script>'; | |
| 242 | 242 | |
| 243 | 243 | // Restore previous $_GET setting | 
| 244 | - $_GET['id'] = $get_id_backup; | |
| 244 | + $_GET[ 'id' ] = $get_id_backup; | |
| 245 | 245 | |
| 246 | 246 | return $output; | 
| 247 | 247 | } | 
| @@ -297,10 +297,10 @@ discard block | ||
| 297 | 297 | global $post; | 
| 298 | 298 | |
| 299 | 299 | // Only show this on GravityView post types. | 
| 300 | -		if( false === gravityview_is_admin_page() ) { return; } | |
| 300 | +		if ( false === gravityview_is_admin_page() ) { return; } | |
| 301 | 301 | |
| 302 | 302 | // If the View hasn't been configured yet, don't show embed shortcode | 
| 303 | -		if( !gravityview_get_directory_fields( $post->ID ) ) { return; } | |
| 303 | +		if ( ! gravityview_get_directory_fields( $post->ID ) ) { return; } | |
| 304 | 304 | |
| 305 | 305 | include self::$metaboxes_dir . 'views/shortcode-hint.php'; | 
| 306 | 306 | } | 
| @@ -1,14 +1,14 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | /** | 
| 3 | - * Display the tab panels for the Settings metabox | |
| 4 | - * | |
| 5 | - * @package GravityView | |
| 6 | - * @subpackage Gravityview/admin/metaboxes/views | |
| 7 | - * @since 1.8 | |
| 8 | - * | |
| 9 | - * @global array $metaboxes | |
| 10 | - * @global WP_Post $post | |
| 11 | - */ | |
| 3 | + * Display the tab panels for the Settings metabox | |
| 4 | + * | |
| 5 | + * @package GravityView | |
| 6 | + * @subpackage Gravityview/admin/metaboxes/views | |
| 7 | + * @since 1.8 | |
| 8 | + * | |
| 9 | + * @global array $metaboxes | |
| 10 | + * @global WP_Post $post | |
| 11 | + */ | |
| 12 | 12 | |
| 13 | 13 | ?> | 
| 14 | 14 | |
| @@ -19,9 +19,9 @@ | ||
| 19 | 19 | * Loop through the array of registered metaboxes | 
| 20 | 20 | * @var GravityView_Metabox_Tab $metabox | 
| 21 | 21 | */ | 
| 22 | -	foreach( $metaboxes as $metabox ) { | |
| 22 | +	foreach ( $metaboxes as $metabox ) { | |
| 23 | 23 | |
| 24 | - echo '<div id="'.esc_attr( $metabox->id ).'">'; | |
| 24 | + echo '<div id="' . esc_attr( $metabox->id ) . '">'; | |
| 25 | 25 | |
| 26 | 26 | $metabox->render( $post ); | 
| 27 | 27 | |
| @@ -1,14 +1,14 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | /** | 
| 3 | - * Display the tab navigation for the Settings metabox | |
| 4 | - * | |
| 5 | - * @package GravityView | |
| 6 | - * @subpackage Gravityview/admin/metaboxes/views | |
| 7 | - * @since 1.8 | |
| 8 | - * | |
| 9 | - * @global GravityView_Metabox_Tab[] $metaboxes | |
| 10 | - * @global WP_Post $post | |
| 11 | - */ | |
| 3 | + * Display the tab navigation for the Settings metabox | |
| 4 | + * | |
| 5 | + * @package GravityView | |
| 6 | + * @subpackage Gravityview/admin/metaboxes/views | |
| 7 | + * @since 1.8 | |
| 8 | + * | |
| 9 | + * @global GravityView_Metabox_Tab[] $metaboxes | |
| 10 | + * @global WP_Post $post | |
| 11 | + */ | |
| 12 | 12 | |
| 13 | 13 | ?> | 
| 14 | 14 | <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"> | 
| @@ -14,8 +14,8 @@ | ||
| 14 | 14 | <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"> | 
| 15 | 15 | <?php | 
| 16 | 16 | |
| 17 | -	foreach( $metaboxes as $metabox ) { | |
| 18 | - $class = !isset( $class ) ? 'nav-tab-active' : ''; | |
| 17 | +	foreach ( $metaboxes as $metabox ) { | |
| 18 | + $class = ! isset( $class ) ? 'nav-tab-active' : ''; | |
| 19 | 19 | ?> | 
| 20 | 20 | <li class="ui-state-default"> | 
| 21 | 21 | <a class="nav-tab ui-tabs-anchor <?php echo $class; ?>" href="#<?php echo esc_attr( $metabox->id ); ?>"> | 
| @@ -1,10 +1,10 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | /** | 
| 3 | - * @file select-template.php | |
| 4 | - * @package GravityView | |
| 5 | - * @subpackage Gravityview/admin/metaboxes/partials | |
| 6 | - * @global WP_Post $post | |
| 7 | - */ | |
| 3 | + * @file select-template.php | |
| 4 | + * @package GravityView | |
| 5 | + * @subpackage Gravityview/admin/metaboxes/partials | |
| 6 | + * @global WP_Post $post | |
| 7 | + */ | |
| 8 | 8 | |
| 9 | 9 | global $post; | 
| 10 | 10 | |
| @@ -22,27 +22,27 @@ | ||
| 22 | 22 | |
| 23 | 23 | <?php // list all the available templates (type= fresh or custom ) ?> | 
| 24 | 24 | <div class="gv-grid"> | 
| 25 | -	<?php foreach( $templates as $id => $template ) { | |
| 25 | +	<?php foreach ( $templates as $id => $template ) { | |
| 26 | 26 | $selected = ( $id == $current_template ) ? ' gv-selected' : ''; ?> | 
| 27 | 27 | |
| 28 | 28 | <div class="gv-grid-col-1-3"> | 
| 29 | - <div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template['type'] ); ?>"> | |
| 29 | + <div class="gv-view-types-module<?php echo $selected; ?>" data-filter="<?php echo esc_attr( $template[ 'type' ] ); ?>"> | |
| 30 | 30 | <div class="gv-view-types-hover"> | 
| 31 | 31 | <div> | 
| 32 | -						<?php if( !empty( $template['buy_source'] ) ) { ?> | |
| 33 | - <p><a href="<?php echo esc_url( $template['buy_source'] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview'); ?></a></p> | |
| 32 | +						<?php if ( ! empty( $template[ 'buy_source' ] ) ) { ?> | |
| 33 | + <p><a href="<?php echo esc_url( $template[ 'buy_source' ] ); ?>" class="button-primary button-buy-now"><?php esc_html_e( 'Buy Now', 'gravityview' ); ?></a></p> | |
| 34 | 34 |  						<?php } else { ?> | 
| 35 | - <p><a href="#gv_select_template" class="button button-large button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview'); ?></a></p> | |
| 36 | -							<?php if( !empty( $template['preview'] ) ) { ?> | |
| 37 | - <a href="<?php echo esc_url( $template['preview'] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview'); ?>"></i></a> | |
| 35 | + <p><a href="#gv_select_template" class="button button-large button-primary" data-templateid="<?php echo esc_attr( $id ); ?>"><?php esc_html_e( 'Select', 'gravityview' ); ?></a></p> | |
| 36 | +							<?php if ( ! empty( $template[ 'preview' ] ) ) { ?> | |
| 37 | + <a href="<?php echo esc_url( $template[ 'preview' ] ); ?>" rel="external" class="gv-site-preview"><i class="dashicons dashicons-admin-links" title="<?php esc_html_e( 'View a live demo of this preset', 'gravityview' ); ?>"></i></a> | |
| 38 | 38 | <?php } ?> | 
| 39 | 39 | <?php } ?> | 
| 40 | 40 | </div> | 
| 41 | 41 | </div> | 
| 42 | 42 | <div class="gv-view-types-normal"> | 
| 43 | - <img src="<?php echo esc_url( $template['logo'] ); ?>" alt="<?php echo esc_attr( $template['label'] ); ?>"> | |
| 44 | - <h5><?php echo esc_attr( $template['label'] ); ?></h5> | |
| 45 | - <p class="description"><?php echo esc_attr( $template['description'] ); ?></p> | |
| 43 | + <img src="<?php echo esc_url( $template[ 'logo' ] ); ?>" alt="<?php echo esc_attr( $template[ 'label' ] ); ?>"> | |
| 44 | + <h5><?php echo esc_attr( $template[ 'label' ] ); ?></h5> | |
| 45 | + <p class="description"><?php echo esc_attr( $template[ 'description' ] ); ?></p> | |
| 46 | 46 | </div> | 
| 47 | 47 | </div> | 
| 48 | 48 | </div> | 
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | /** | 
| 3 | - * @package GravityView | |
| 4 | - * @subpackage Gravityview/admin/metaboxes/partials | |
| 5 | - * @global WP_Post $post | |
| 6 | - */ | |
| 3 | + * @package GravityView | |
| 4 | + * @subpackage Gravityview/admin/metaboxes/partials | |
| 5 | + * @global WP_Post $post | |
| 6 | + */ | |
| 7 | 7 | global $post; | 
| 8 | 8 | |
| 9 | 9 | $curr_form = gravityview_get_form_id( $post->ID ); | 
| @@ -26,7 +26,7 @@ | ||
| 26 | 26 | */ | 
| 27 | 27 | GravityView_Render_Settings::render_setting_row( 'sort_columns', $current_settings ); | 
| 28 | 28 | |
| 29 | - $sort_fields_input = '<select name="template_settings[sort_field]" id="gravityview_sort_field">'.gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'] ).'</select>'; | |
| 29 | + $sort_fields_input = '<select name="template_settings[sort_field]" id="gravityview_sort_field">' . gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ] ) . '</select>'; | |
| 30 | 30 | |
| 31 | 31 | GravityView_Render_Settings::render_setting_row( 'sort_field', $current_settings, $sort_fields_input ); | 
| 32 | 32 | |