| @@ -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 ); ?>" /> | 
| @@ -204,7 +204,7 @@ | ||
| 204 | 204 | self::$notices['wp_version'] = array( | 
| 205 | 205 | 'class' => 'error', | 
| 206 | 206 | 'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.$wp_version.'</span>' ), | 
| 207 | - 'cap' => 'update_core', | |
| 207 | + 'cap' => 'update_core', | |
| 208 | 208 | 'dismiss' => 'wp_version', | 
| 209 | 209 | ); | 
| 210 | 210 | |
| @@ -76,7 +76,7 @@ discard block | ||
| 76 | 76 | * @return GravityView_Compatibility | 
| 77 | 77 | */ | 
| 78 | 78 |  	public static function getInstance() { | 
| 79 | -		if( self::$instance ) { | |
| 79 | +		if ( self::$instance ) { | |
| 80 | 80 | return self::$instance; | 
| 81 | 81 | } | 
| 82 | 82 | return new self; | 
| @@ -138,10 +138,10 @@ discard block | ||
| 138 | 138 | // If Gravity Forms doesn't exist or is outdated, load the admin view class to | 
| 139 | 139 | // show the notice, but not load any post types or process shortcodes. | 
| 140 | 140 | // Without Gravity Forms, there is no GravityView. Beautiful, really. | 
| 141 | -		if( ! self::is_valid() ) { | |
| 141 | +		if ( ! self::is_valid() ) { | |
| 142 | 142 | |
| 143 | 143 | // If the plugin's not loaded, might as well hide the shortcode for people. | 
| 144 | - add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice') ); | |
| 144 | + add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice' ) ); | |
| 145 | 145 | |
| 146 | 146 | } | 
| 147 | 147 | } | 
| @@ -167,15 +167,15 @@ discard block | ||
| 167 | 167 | */ | 
| 168 | 168 |  	public function _shortcode_gf_notice( $atts = array(), $content = null, $shortcode = 'gravityview' ) { | 
| 169 | 169 | |
| 170 | -		if( ! GVCommon::has_cap( 'activate_plugins' ) ) { | |
| 170 | +		if ( ! GVCommon::has_cap( 'activate_plugins' ) ) { | |
| 171 | 171 | return null; | 
| 172 | 172 | } | 
| 173 | 173 | |
| 174 | 174 | $notices = self::get_notices(); | 
| 175 | 175 | |
| 176 | - $message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview') . '</em></p>'; | |
| 177 | -		foreach( (array)$notices as $notice ) { | |
| 178 | - $message .= wpautop( $notice['message'] ); | |
| 176 | + $message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview' ) . '</em></p>'; | |
| 177 | +		foreach ( (array)$notices as $notice ) { | |
| 178 | + $message .= wpautop( $notice[ 'message' ] ); | |
| 179 | 179 | } | 
| 180 | 180 | $message .= '</div>'; | 
| 181 | 181 | |
| @@ -195,9 +195,9 @@ discard block | ||
| 195 | 195 | |
| 196 | 196 |  		if ( ! gravityview()->plugin->is_compatible_php() ) { | 
| 197 | 197 | |
| 198 | - self::$notices['php_version'] = array( | |
| 198 | + self::$notices[ 'php_version' ] = array( | |
| 199 | 199 | 'class' => 'error', | 
| 200 | - 'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ), | |
| 200 | + 'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ), | |
| 201 | 201 | 'cap' => 'manage_options', | 
| 202 | 202 | 'dismiss' => 'php_version', | 
| 203 | 203 | ); | 
| @@ -208,11 +208,11 @@ discard block | ||
| 208 | 208 |  		if ( ! gravityview()->plugin->is_compatible_future_php() ) { | 
| 209 | 209 | |
| 210 | 210 | // Show the notice on every update. Yes, annoying, but not as annoying as a plugin breaking. | 
| 211 | -			$key = sprintf('php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version ); | |
| 211 | + $key = sprintf( 'php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version ); | |
| 212 | 212 | |
| 213 | 213 | self::$notices[ $key ] = array( | 
| 214 | 214 | 'class' => 'error', | 
| 215 | - 'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ), | |
| 215 | + 'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ), | |
| 216 | 216 | 'cap' => 'manage_options', | 
| 217 | 217 | 'dismiss' => $key, | 
| 218 | 218 | ); | 
| @@ -233,9 +233,9 @@ discard block | ||
| 233 | 233 | |
| 234 | 234 |  		if ( ! gravityview()->plugin->is_compatible_wordpress() ) { | 
| 235 | 235 | |
| 236 | - self::$notices['wp_version'] = array( | |
| 236 | + self::$notices[ 'wp_version' ] = array( | |
| 237 | 237 | 'class' => 'error', | 
| 238 | - 'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.$wp_version.'</span>' ), | |
| 238 | + 'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . $wp_version . '</span>' ), | |
| 239 | 239 | 'cap' => 'update_core', | 
| 240 | 240 | 'dismiss' => 'wp_version', | 
| 241 | 241 | ); | 
| @@ -258,17 +258,17 @@ discard block | ||
| 258 | 258 |  	public static function check_gravityforms() { | 
| 259 | 259 | |
| 260 | 260 | // Bypass other checks: if the class exists | 
| 261 | -		if( class_exists( 'GFCommon' ) ) { | |
| 261 | +		if ( class_exists( 'GFCommon' ) ) { | |
| 262 | 262 | |
| 263 | 263 | // Does the version meet future requirements? | 
| 264 | -			if( true === version_compare( GFCommon::$version, GV_FUTURE_MIN_GF_VERSION, ">=" ) ) { | |
| 264 | +			if ( true === version_compare( GFCommon::$version, GV_FUTURE_MIN_GF_VERSION, ">=" ) ) { | |
| 265 | 265 | return true; | 
| 266 | 266 | } | 
| 267 | 267 | |
| 268 | 268 | // Does it meet minimum requirements? | 
| 269 | 269 | $meets_minimum = gravityview()->plugin->is_compatible_gravityforms(); | 
| 270 | 270 | |
| 271 | -			if( $meets_minimum ) { | |
| 271 | +			if ( $meets_minimum ) { | |
| 272 | 272 | /* translators: first placeholder is the future required version of Gravity Forms. The second placeholder is the current version of Gravity Forms. */ | 
| 273 | 273 | $title = __( 'In the future, GravityView will require Gravity Forms Version %s or newer.', 'gravityview' ); | 
| 274 | 274 | $version = GV_FUTURE_MIN_GF_VERSION; | 
| @@ -283,14 +283,14 @@ discard block | ||
| 283 | 283 | $message = '<h3>' . esc_html( sprintf( $title, $version ) ) . '</h3>'; | 
| 284 | 284 | |
| 285 | 285 | /* translators: the placeholder is the current version of Gravity Forms. */ | 
| 286 | - $message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>' ) . '</p>'; | |
| 286 | + $message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">' . GFCommon::$version . '</span>' ) . '</p>'; | |
| 287 | 287 | |
| 288 | 288 | /* translators: In this context, "get" means purchase */ | 
| 289 | 289 | $message .= '<p><a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">' . esc_html__( 'Get the Latest Gravity Forms', 'gravityview' ) . '</a></p>'; | 
| 290 | 290 | |
| 291 | 291 | |
| 292 | 292 | // Show the notice even if the future version requirements aren't met | 
| 293 | - self::$notices['gf_version'] = array( | |
| 293 | + self::$notices[ 'gf_version' ] = array( | |
| 294 | 294 | 'class' => $class, | 
| 295 | 295 | 'message' => $message, | 
| 296 | 296 | 'cap' => 'update_plugins', | 
| @@ -308,42 +308,42 @@ discard block | ||
| 308 | 308 | * OR | 
| 309 | 309 | * It's the Network Admin and we just don't know whether the sites have GF activated themselves. | 
| 310 | 310 | */ | 
| 311 | -		if( true === $gf_status || is_network_admin() ) { | |
| 311 | +		if ( true === $gf_status || is_network_admin() ) { | |
| 312 | 312 | return true; | 
| 313 | 313 | } | 
| 314 | 314 | |
| 315 | 315 | // If GFCommon doesn't exist, assume GF not active | 
| 316 | 316 | $return = false; | 
| 317 | 317 | |
| 318 | -		switch( $gf_status ) { | |
| 318 | +		switch ( $gf_status ) { | |
| 319 | 319 | case 'inactive': | 
| 320 | 320 | |
| 321 | 321 | // Required for multisite | 
| 322 | -				if( ! function_exists('wp_create_nonce') ) { | |
| 322 | +				if ( ! function_exists( 'wp_create_nonce' ) ) { | |
| 323 | 323 | require_once ABSPATH . WPINC . '/pluggable.php'; | 
| 324 | 324 | } | 
| 325 | 325 | |
| 326 | 326 | // Otherwise, throws an error on activation & deactivation "Use of undefined constant LOGGED_IN_COOKIE" | 
| 327 | -				if( is_multisite() ) { | |
| 327 | +				if ( is_multisite() ) { | |
| 328 | 328 | wp_cookie_constants(); | 
| 329 | 329 | } | 
| 330 | 330 | |
| 331 | 331 | $return = false; | 
| 332 | 332 | |
| 333 | -				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'. wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php') . '" class="button button-large">'; | |
| 333 | + $button = function_exists( 'is_network_admin' ) && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="' . wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php' ) . '" class="button button-large">'; | |
| 334 | 334 | |
| 335 | - self::$notices['gf_inactive'] = array( | |
| 335 | + self::$notices[ 'gf_inactive' ] = array( | |
| 336 | 336 | 'class' => 'error', | 
| 337 | - 'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n". $button, '</a></strong>' ), | |
| 337 | + 'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n" . $button, '</a></strong>' ), | |
| 338 | 338 | 'cap' => 'activate_plugins', | 
| 339 | 339 | 'dismiss' => 'gf_inactive', | 
| 340 | 340 | ); | 
| 341 | 341 | |
| 342 | 342 | break; | 
| 343 | 343 | default: | 
| 344 | - self::$notices['gf_installed'] = array( | |
| 344 | + self::$notices[ 'gf_installed' ] = array( | |
| 345 | 345 | 'class' => 'error', | 
| 346 | - 'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n".'<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'), | |
| 346 | + 'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n" . '<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ), | |
| 347 | 347 | 'cap' => 'install_plugins', | 
| 348 | 348 | 'dismiss' => 'gf_installed', | 
| 349 | 349 | ); | 
| @@ -360,10 +360,10 @@ discard block | ||
| 360 | 360 | */ | 
| 361 | 361 |  	private static function check_gf_directory() { | 
| 362 | 362 | |
| 363 | -		if( class_exists( 'GFDirectory' ) ) { | |
| 364 | - self::$notices['gf_directory'] = array( | |
| 363 | +		if ( class_exists( 'GFDirectory' ) ) { | |
| 364 | + self::$notices[ 'gf_directory' ] = array( | |
| 365 | 365 | 'class' => 'error is-dismissible', | 
| 366 | -				'title' => __('Potential Conflict', 'gravityview' ), | |
| 366 | + 'title' => __( 'Potential Conflict', 'gravityview' ), | |
| 367 | 367 | 'message' => __( 'GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview' ), | 
| 368 | 368 | 'dismiss' => 'gf_directory', | 
| 369 | 369 | 'cap' => 'activate_plugins', | 
| @@ -382,21 +382,21 @@ discard block | ||
| 382 | 382 | */ | 
| 383 | 383 |  	public static function get_plugin_status( $location = '' ) { | 
| 384 | 384 | |
| 385 | -		if( ! function_exists('is_plugin_active') ) { | |
| 385 | +		if ( ! function_exists( 'is_plugin_active' ) ) { | |
| 386 | 386 | include_once( ABSPATH . '/wp-admin/includes/plugin.php' ); | 
| 387 | 387 | } | 
| 388 | 388 | |
| 389 | -		if( is_network_admin() && is_plugin_active_for_network( $location ) ) { | |
| 389 | +		if ( is_network_admin() && is_plugin_active_for_network( $location ) ) { | |
| 390 | 390 | return true; | 
| 391 | 391 | } | 
| 392 | 392 | |
| 393 | -		if( !is_network_admin() && is_plugin_active( $location ) ) { | |
| 393 | +		if ( ! is_network_admin() && is_plugin_active( $location ) ) { | |
| 394 | 394 | return true; | 
| 395 | 395 | } | 
| 396 | 396 | |
| 397 | - if( | |
| 398 | - !file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) && | |
| 399 | - !file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location ) | |
| 397 | + if ( | |
| 398 | + ! file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) && | |
| 399 | + ! file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location ) | |
| 400 | 400 |  		) { | 
| 401 | 401 | return false; | 
| 402 | 402 | } | 
| @@ -23,7 +23,7 @@ | ||
| 23 | 23 | var $style = NULL; | 
| 24 | 24 | |
| 25 | 25 | /** | 
| 26 | - * String representing size of image - Choose from "full", "medium", "thumb", "tiny" | |
| 26 | + * String representing size of image - Choose from "full", "medium", "thumb", "tiny" | |
| 27 | 27 | * @var string | 
| 28 | 28 | */ | 
| 29 | 29 | var $size = NULL; | 
| @@ -65,11 +65,11 @@ discard block | ||
| 65 | 65 | |
| 66 | 66 | $atts = wp_parse_args( $atts, $defaults ); | 
| 67 | 67 | |
| 68 | -		foreach( $atts as $key => $val ) { | |
| 68 | +		foreach ( $atts as $key => $val ) { | |
| 69 | 69 |  			$this->{$key} = $val; | 
| 70 | 70 | } | 
| 71 | 71 | |
| 72 | - $this->class = !empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class; | |
| 72 | + $this->class = ! empty( $this->class ) ? esc_attr( implode( ' ', (array)$this->class ) ) : $this->class; | |
| 73 | 73 | |
| 74 | 74 | $this->set_image_size(); | 
| 75 | 75 | |
| @@ -85,7 +85,7 @@ discard block | ||
| 85 | 85 | */ | 
| 86 | 86 |  	function validate_image_src() { | 
| 87 | 87 | |
| 88 | -		if ( !$this->validate_src ) { return true; } | |
| 88 | +		if ( ! $this->validate_src ) { return true; } | |
| 89 | 89 | |
| 90 | 90 | $info = pathinfo( $this->src ); | 
| 91 | 91 | |
| @@ -93,9 +93,9 @@ discard block | ||
| 93 | 93 | * @filter `gravityview_image_extensions` Extensions that GravityView recognizes as valid images to be shown in an `img` tag | 
| 94 | 94 | * @param array $image_exts Default: `['jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico']` | 
| 95 | 95 | */ | 
| 96 | - $image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' )); | |
| 96 | + $image_exts = apply_filters( 'gravityview_image_extensions', array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico' ) ); | |
| 97 | 97 | |
| 98 | - return isset( $info['extension'] ) && in_array( strtolower( $info['extension'] ), $image_exts); | |
| 98 | + return isset( $info[ 'extension' ] ) && in_array( strtolower( $info[ 'extension' ] ), $image_exts ); | |
| 99 | 99 | } | 
| 100 | 100 | |
| 101 | 101 | /** | 
| @@ -111,16 +111,16 @@ discard block | ||
| 111 | 111 | |
| 112 | 112 | // And there is no string size passed | 
| 113 | 113 | // And we want to get the image size using PHP | 
| 114 | -			if ( empty( $string ) && !empty( $this->getimagesize ) ) { | |
| 114 | +			if ( empty( $string ) && ! empty( $this->getimagesize ) ) { | |
| 115 | 115 | |
| 116 | 116 | $image_size = @getimagesize( $this->src ); | 
| 117 | 117 | |
| 118 | 118 | // If it didn't return a response, it may be a HTTPS/SSL error | 
| 119 | -				if ( empty( $image_size[0] ) ) { | |
| 119 | +				if ( empty( $image_size[ 0 ] ) ) { | |
| 120 | 120 | $image_size = @getimagesize( set_url_scheme( $this->src, 'http' ) ); | 
| 121 | 121 | } | 
| 122 | 122 | |
| 123 | -				if ( !empty( $image_size ) ) { | |
| 123 | +				if ( ! empty( $image_size ) ) { | |
| 124 | 124 | list( $width, $height ) = $image_size; | 
| 125 | 125 | } | 
| 126 | 126 | |
| @@ -133,33 +133,33 @@ discard block | ||
| 133 | 133 | * @param array $image_sizes Array of image sizes with the key being the size slug, and the value being an array with `width` and `height` defined, in pixels | 
| 134 | 134 | */ | 
| 135 | 135 | $image_sizes = apply_filters( 'gravityview_image_sizes', array( | 
| 136 | -					'tiny' => array('width' => 40, 'height' => 30), | |
| 137 | -					'small' => array('width' => 100, 'height' => 75), | |
| 138 | -					'medium' => array('width' => 250, 'height' => 188), | |
| 139 | -					'large' => array('width' => 448, 'height' => 336), | |
| 136 | + 'tiny' => array( 'width' => 40, 'height' => 30 ), | |
| 137 | + 'small' => array( 'width' => 100, 'height' => 75 ), | |
| 138 | + 'medium' => array( 'width' => 250, 'height' => 188 ), | |
| 139 | + 'large' => array( 'width' => 448, 'height' => 336 ), | |
| 140 | 140 | ) ); | 
| 141 | 141 | |
| 142 | -				switch( $this->size ) { | |
| 142 | +				switch ( $this->size ) { | |
| 143 | 143 | case 'tiny': | 
| 144 | - extract($image_sizes['tiny']); | |
| 144 | + extract( $image_sizes[ 'tiny' ] ); | |
| 145 | 145 | break; | 
| 146 | 146 | case 'small': | 
| 147 | 147 | case 's': | 
| 148 | 148 | case 'thumb': | 
| 149 | - extract($image_sizes['small']); | |
| 149 | + extract( $image_sizes[ 'small' ] ); | |
| 150 | 150 | break; | 
| 151 | 151 | case 'm': | 
| 152 | 152 | case 'medium': | 
| 153 | - extract($image_sizes['medium']); | |
| 153 | + extract( $image_sizes[ 'medium' ] ); | |
| 154 | 154 | break; | 
| 155 | 155 | case 'large': | 
| 156 | 156 | case 'l': | 
| 157 | - extract($image_sizes['large']); | |
| 157 | + extract( $image_sizes[ 'large' ] ); | |
| 158 | 158 | break; | 
| 159 | 159 | default: | 
| 160 | 160 | // Verify that the passed sizes are integers. | 
| 161 | - $width = !empty( $width ) ? intval( $width ) : intval( $this->width ); | |
| 162 | - $height = !empty( $height ) ? intval( $height ) : intval( $this->height ); | |
| 161 | + $width = ! empty( $width ) ? intval( $width ) : intval( $this->width ); | |
| 162 | + $height = ! empty( $height ) ? intval( $height ) : intval( $this->height ); | |
| 163 | 163 | } | 
| 164 | 164 | |
| 165 | 165 | } | 
| @@ -180,8 +180,8 @@ | ||
| 180 | 180 | |
| 181 | 181 | // check widget settings: | 
| 182 | 182 | // [search_free] => 1 | 
| 183 | - // [search_date] => 1 | |
| 184 | - $search_generic = array(); | |
| 183 | + // [search_date] => 1 | |
| 184 | + $search_generic = array(); | |
| 185 | 185 |  					if( !empty( $widget['search_free'] ) ) { | 
| 186 | 186 | $search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' ); | 
| 187 | 187 | } | 
| @@ -72,7 +72,7 @@ discard block | ||
| 72 | 72 | |
| 73 | 73 | $disapproved_result = $wpdb->query( $wpdb->prepare( $sql, GravityView_Entry_Approval_Status::DISAPPROVED, '0' ) ); | 
| 74 | 74 | |
| 75 | -		if( false === $approved_result || false === $disapproved_result ) { | |
| 75 | +		if ( false === $approved_result || false === $disapproved_result ) { | |
| 76 | 76 |  			gravityview()->log->error( 'There was an error processing the query. {error}', array( 'error' => $wpdb->last_error ) ); | 
| 77 | 77 |  		} else { | 
| 78 | 78 | // All done: Meta values are migrated | 
| @@ -105,11 +105,11 @@ discard block | ||
| 105 | 105 | $redux_settings = $this->get_redux_settings(); | 
| 106 | 106 | |
| 107 | 107 | // No need to process | 
| 108 | -		if( false === $redux_settings ) { | |
| 108 | +		if ( false === $redux_settings ) { | |
| 109 | 109 | return; | 
| 110 | 110 | } | 
| 111 | 111 | |
| 112 | -		if( empty(  $redux_settings['license_key_status'] ) ) { | |
| 112 | +		if ( empty( $redux_settings[ 'license_key_status' ] ) ) { | |
| 113 | 113 | $redux_settings = $this->get_redux_license_status( $redux_settings ); | 
| 114 | 114 | } | 
| 115 | 115 | |
| @@ -123,8 +123,8 @@ discard block | ||
| 123 | 123 | gravityview()->plugin->settings->update( $updated_settings ); | 
| 124 | 124 | |
| 125 | 125 | // And now remove the previous option, so this is a one-time thing. | 
| 126 | -		delete_option('gravityview_settings'); | |
| 127 | -		delete_option('gravityview_settings-transients'); | |
| 126 | + delete_option( 'gravityview_settings' ); | |
| 127 | + delete_option( 'gravityview_settings-transients' ); | |
| 128 | 128 | } | 
| 129 | 129 | |
| 130 | 130 | /** | 
| @@ -147,9 +147,9 @@ discard block | ||
| 147 | 147 | |
| 148 | 148 | $license_call = \GV\License_Handler::get()->license_call( $data ); | 
| 149 | 149 | |
| 150 | -		if( is_object( $license_call ) && isset( $license_call->license ) ) { | |
| 151 | - $redux_settings['license_key_status'] = $license_call->license; | |
| 152 | - $redux_settings['license_key_response'] = json_encode( $license_call ); | |
| 150 | +		if ( is_object( $license_call ) && isset( $license_call->license ) ) { | |
| 151 | + $redux_settings[ 'license_key_status' ] = $license_call->license; | |
| 152 | + $redux_settings[ 'license_key_response' ] = json_encode( $license_call ); | |
| 153 | 153 | } | 
| 154 | 154 | |
| 155 | 155 | return $redux_settings; | 
| @@ -163,10 +163,10 @@ discard block | ||
| 163 | 163 |  	function get_redux_settings() { | 
| 164 | 164 | |
| 165 | 165 | // Previous settings set by Redux | 
| 166 | -		$redux_option = get_option('gravityview_settings'); | |
| 166 | + $redux_option = get_option( 'gravityview_settings' ); | |
| 167 | 167 | |
| 168 | 168 | // No Redux settings? Don't proceed. | 
| 169 | -		if( false === $redux_option ) { | |
| 169 | +		if ( false === $redux_option ) { | |
| 170 | 170 | return false; | 
| 171 | 171 | } | 
| 172 | 172 | |
| @@ -178,19 +178,19 @@ discard block | ||
| 178 | 178 | |
| 179 | 179 |  		if ( $license_array = \GV\Utils::get( $redux_option, 'license' ) ) { | 
| 180 | 180 | |
| 181 | - $redux_settings['license_key'] = $license_key = \GV\Utils::get( $license_array, 'license' ); | |
| 181 | + $redux_settings[ 'license_key' ] = $license_key = \GV\Utils::get( $license_array, 'license' ); | |
| 182 | 182 | |
| 183 | -			$redux_last_changed_values = get_option('gravityview_settings-transients'); | |
| 183 | + $redux_last_changed_values = get_option( 'gravityview_settings-transients' ); | |
| 184 | 184 | |
| 185 | 185 | // This contains the last response for license validation | 
| 186 | -			if( !empty( $redux_last_changed_values ) && $saved_values = \GV\Utils::get( $redux_last_changed_values, 'changed_values' ) ) { | |
| 186 | +			if ( ! empty( $redux_last_changed_values ) && $saved_values = \GV\Utils::get( $redux_last_changed_values, 'changed_values' ) ) { | |
| 187 | 187 | |
| 188 | 188 | $saved_license = \GV\Utils::get( $saved_values, 'license' ); | 
| 189 | 189 | |
| 190 | 190 | // Only use the last-saved values if they are for the same license | 
| 191 | -				if( $saved_license && \GV\Utils::get( $saved_license, 'license' ) === $license_key ) { | |
| 192 | - $redux_settings['license_key_status'] = \GV\Utils::get( $saved_license, 'status' ); | |
| 193 | - $redux_settings['license_key_response'] = \GV\Utils::get( $saved_license, 'response' ); | |
| 191 | +				if ( $saved_license && \GV\Utils::get( $saved_license, 'license' ) === $license_key ) { | |
| 192 | + $redux_settings[ 'license_key_status' ] = \GV\Utils::get( $saved_license, 'status' ); | |
| 193 | + $redux_settings[ 'license_key_response' ] = \GV\Utils::get( $saved_license, 'response' ); | |
| 194 | 194 | } | 
| 195 | 195 | } | 
| 196 | 196 | } | 
| @@ -202,8 +202,8 @@ discard block | ||
| 202 | 202 | /** ---- Migrate from old search widget to new search widget ---- */ | 
| 203 | 203 |  	function update_search_on_views() { | 
| 204 | 204 | |
| 205 | -		if( !class_exists('GravityView_Widget_Search') ) { | |
| 206 | - include_once( GRAVITYVIEW_DIR .'includes/extensions/search-widget/class-search-widget.php' ); | |
| 205 | +		if ( ! class_exists( 'GravityView_Widget_Search' ) ) { | |
| 206 | + include_once( GRAVITYVIEW_DIR . 'includes/extensions/search-widget/class-search-widget.php' ); | |
| 207 | 207 | } | 
| 208 | 208 | |
| 209 | 209 | // Loop through all the views | 
| @@ -215,20 +215,20 @@ discard block | ||
| 215 | 215 | |
| 216 | 216 | $views = get_posts( $query_args ); | 
| 217 | 217 | |
| 218 | -		foreach( $views as $view ) { | |
| 218 | +		foreach ( $views as $view ) { | |
| 219 | 219 | |
| 220 | 220 | $widgets = gravityview_get_directory_widgets( $view->ID ); | 
| 221 | 221 | $search_fields = null; | 
| 222 | 222 | |
| 223 | -			if( empty( $widgets ) || !is_array( $widgets ) ) { continue; } | |
| 223 | +			if ( empty( $widgets ) || ! is_array( $widgets ) ) { continue; } | |
| 224 | 224 | |
| 225 | 225 |  			gravityview()->log->debug( '[GravityView_Migrate/update_search_on_views] Loading View ID: {view_id}', array( 'view_id' => $view->ID ) ); | 
| 226 | 226 | |
| 227 | -			foreach( $widgets as $area => $ws ) { | |
| 228 | -				foreach( $ws as $k => $widget ) { | |
| 229 | -					if( $widget['id'] !== 'search_bar' ) { continue; } | |
| 227 | +			foreach ( $widgets as $area => $ws ) { | |
| 228 | +				foreach ( $ws as $k => $widget ) { | |
| 229 | +					if ( $widget[ 'id' ] !== 'search_bar' ) { continue; } | |
| 230 | 230 | |
| 231 | -					if( is_null( $search_fields ) ) { | |
| 231 | +					if ( is_null( $search_fields ) ) { | |
| 232 | 232 | $search_fields = $this->get_search_fields( $view->ID ); | 
| 233 | 233 | } | 
| 234 | 234 | |
| @@ -236,24 +236,24 @@ discard block | ||
| 236 | 236 | // [search_free] => 1 | 
| 237 | 237 | // [search_date] => 1 | 
| 238 | 238 | $search_generic = array(); | 
| 239 | -					if( !empty( $widget['search_free'] ) ) { | |
| 240 | - $search_generic[] = array( 'field' => 'search_all', 'input' => 'input_text' ); | |
| 239 | +					if ( ! empty( $widget[ 'search_free' ] ) ) { | |
| 240 | + $search_generic[ ] = array( 'field' => 'search_all', 'input' => 'input_text' ); | |
| 241 | 241 | } | 
| 242 | -					if( !empty( $widget['search_date'] ) ) { | |
| 243 | - $search_generic[] = array( 'field' => 'entry_date', 'input' => 'date' ); | |
| 242 | +					if ( ! empty( $widget[ 'search_date' ] ) ) { | |
| 243 | + $search_generic[ ] = array( 'field' => 'entry_date', 'input' => 'date' ); | |
| 244 | 244 | } | 
| 245 | 245 | |
| 246 | 246 | $search_config = array_merge( $search_generic, $search_fields ); | 
| 247 | 247 | |
| 248 | 248 | // don't throw '[]' when json_encode an empty array | 
| 249 | -					if( empty( $search_config ) ) { | |
| 249 | +					if ( empty( $search_config ) ) { | |
| 250 | 250 | $search_config = ''; | 
| 251 | 251 |  					} else { | 
| 252 | 252 | $search_config = json_encode( $search_config ); | 
| 253 | 253 | } | 
| 254 | 254 | |
| 255 | - $widgets[ $area ][ $k ]['search_fields'] = $search_config; | |
| 256 | - $widgets[ $area ][ $k ]['search_layout'] = 'horizontal'; | |
| 255 | + $widgets[ $area ][ $k ][ 'search_fields' ] = $search_config; | |
| 256 | + $widgets[ $area ][ $k ][ 'search_layout' ] = 'horizontal'; | |
| 257 | 257 | |
| 258 | 258 | gravityview()->log->debug( '[GravityView_Migrate/update_search_on_views] Updated Widget: ', array( 'data' => $widgets[ $area ][ $k ] ) ); | 
| 259 | 259 | } | 
| @@ -281,26 +281,26 @@ discard block | ||
| 281 | 281 | // check view fields' settings | 
| 282 | 282 | $fields = gravityview_get_directory_fields( $view_id, false ); | 
| 283 | 283 | |
| 284 | -		if( !empty( $fields ) && is_array( $fields ) ) { | |
| 284 | +		if ( ! empty( $fields ) && is_array( $fields ) ) { | |
| 285 | 285 | |
| 286 | -			foreach( $fields as $t => $fs ) { | |
| 286 | +			foreach ( $fields as $t => $fs ) { | |
| 287 | 287 | |
| 288 | -				foreach( $fs as $k => $field ) { | |
| 288 | +				foreach ( $fs as $k => $field ) { | |
| 289 | 289 | // is field a search_filter ? | 
| 290 | -					if( empty( $field['search_filter'] ) ) { continue; } | |
| 290 | +					if ( empty( $field[ 'search_filter' ] ) ) { continue; } | |
| 291 | 291 | |
| 292 | 292 | // get field type & calculate the input type (by default) | 
| 293 | - $form_field = gravityview_get_field( $form, $field['id'] ); | |
| 293 | + $form_field = gravityview_get_field( $form, $field[ 'id' ] ); | |
| 294 | 294 | |
| 295 | -					if( empty( $form_field['type'] ) ) { | |
| 295 | +					if ( empty( $form_field[ 'type' ] ) ) { | |
| 296 | 296 | continue; | 
| 297 | 297 | } | 
| 298 | 298 | |
| 299 | 299 | // depending on the field type assign a group of possible search field types | 
| 300 | - $type = GravityView_Widget_Search::get_search_input_types( $field['id'], $form_field['type'] ); | |
| 300 | + $type = GravityView_Widget_Search::get_search_input_types( $field[ 'id' ], $form_field[ 'type' ] ); | |
| 301 | 301 | |
| 302 | 302 | // add field to config | 
| 303 | - $search_fields[] = array( 'field' => $field['id'], 'input' => $type ); | |
| 303 | + $search_fields[ ] = array( 'field' => $field[ 'id' ], 'input' => $type ); | |
| 304 | 304 | |
| 305 | 305 | } | 
| 306 | 306 | } | 
| @@ -56,7 +56,7 @@ discard block | ||
| 56 | 56 | add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) ); | 
| 57 | 57 | add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 ); | 
| 58 | 58 | add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 ); | 
| 59 | - add_action( 'admin_init', array( $this, 'add_caps') ); | |
| 59 | + add_action( 'admin_init', array( $this, 'add_caps') ); | |
| 60 | 60 | } | 
| 61 | 61 | |
| 62 | 62 | |
| @@ -360,7 +360,6 @@ discard block | ||
| 360 | 360 | * Add Gravity Forms and GravityView's "full access" caps when any other caps are checked against. | 
| 361 | 361 | * | 
| 362 | 362 | * @since 1.15 | 
| 363 | - | |
| 364 | 363 | * @param array $caps_to_check | 
| 365 | 364 | * | 
| 366 | 365 | * @return array | 
| @@ -33,7 +33,7 @@ discard block | ||
| 33 | 33 | */ | 
| 34 | 34 |  	public static function get_instance() { | 
| 35 | 35 | |
| 36 | -		if( ! self::$instance ) { | |
| 36 | +		if ( ! self::$instance ) { | |
| 37 | 37 | self::$instance = new self; | 
| 38 | 38 | } | 
| 39 | 39 | |
| @@ -56,7 +56,7 @@ discard block | ||
| 56 | 56 | add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) ); | 
| 57 | 57 | add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 ); | 
| 58 | 58 | add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 ); | 
| 59 | - add_action( 'admin_init', array( $this, 'add_caps') ); | |
| 59 | + add_action( 'admin_init', array( $this, 'add_caps' ) ); | |
| 60 | 60 | } | 
| 61 | 61 | |
| 62 | 62 | |
| @@ -77,18 +77,18 @@ discard block | ||
| 77 | 77 |  	public function filter_user_has_cap( $usercaps = array(), $caps = array(), $args = array(), $user = NULL ) { | 
| 78 | 78 | |
| 79 | 79 | // Empty caps_to_check array | 
| 80 | -		if( ! $usercaps || ! $caps ) { | |
| 80 | +		if ( ! $usercaps || ! $caps ) { | |
| 81 | 81 | return $usercaps; | 
| 82 | 82 | } | 
| 83 | 83 | |
| 84 | 84 | /** | 
| 85 | 85 | * Enable all GravityView caps_to_check if `gravityview_full_access` is enabled | 
| 86 | 86 | */ | 
| 87 | -		if( ! empty( $usercaps['gravityview_full_access'] ) ) { | |
| 87 | +		if ( ! empty( $usercaps[ 'gravityview_full_access' ] ) ) { | |
| 88 | 88 | |
| 89 | 89 | $all_gravityview_caps = self::all_caps(); | 
| 90 | 90 | |
| 91 | -			foreach( $all_gravityview_caps as $gv_cap ) { | |
| 91 | +			foreach ( $all_gravityview_caps as $gv_cap ) { | |
| 92 | 92 | $usercaps[ $gv_cap ] = true; | 
| 93 | 93 | } | 
| 94 | 94 | |
| @@ -306,7 +306,7 @@ discard block | ||
| 306 | 306 | $all = $administrator; | 
| 307 | 307 | |
| 308 | 308 | // If role is set, return caps_to_check for just that role. | 
| 309 | -		if( $single_role ) { | |
| 309 | +		if ( $single_role ) { | |
| 310 | 310 |  			$caps = isset( ${$single_role} ) ? ${$single_role} : false; | 
| 311 | 311 | return $flat_array ? $caps : array( $single_role => $caps ); | 
| 312 | 312 | } | 
| @@ -355,9 +355,9 @@ discard block | ||
| 355 | 355 | |
| 356 | 356 |  		if ( true === $allow_logged_out ) { | 
| 357 | 357 | |
| 358 | -			$all_caps = self::all_caps('editor'); | |
| 358 | + $all_caps = self::all_caps( 'editor' ); | |
| 359 | 359 | |
| 360 | -			if( array_intersect( $all_caps, (array) $caps_to_check ) ) { | |
| 360 | +			if ( array_intersect( $all_caps, (array)$caps_to_check ) ) { | |
| 361 | 361 | return true; | 
| 362 | 362 | } | 
| 363 | 363 | } | 
| @@ -378,13 +378,13 @@ discard block | ||
| 378 | 378 | $caps_to_check = self::maybe_add_full_access_caps( $caps_to_check ); | 
| 379 | 379 | |
| 380 | 380 |  		foreach ( $caps_to_check as $cap ) { | 
| 381 | -			if( ! is_null( $object_id ) ) { | |
| 381 | +			if ( ! is_null( $object_id ) ) { | |
| 382 | 382 | $has_cap = $user_id ? user_can( $user_id, $cap, $object_id ) : current_user_can( $cap, $object_id ); | 
| 383 | 383 |  			} else { | 
| 384 | 384 | $has_cap = $user_id ? user_can( $user_id, $cap ) : current_user_can( $cap ); | 
| 385 | 385 | } | 
| 386 | 386 | // At the first successful response, stop checking | 
| 387 | -			if( $has_cap ) { | |
| 387 | +			if ( $has_cap ) { | |
| 388 | 388 | break; | 
| 389 | 389 | } | 
| 390 | 390 | } | 
| @@ -408,15 +408,15 @@ discard block | ||
| 408 | 408 | $all_gravityview_caps = self::all_caps(); | 
| 409 | 409 | |
| 410 | 410 | // Are there any $caps_to_check that are from GravityView? | 
| 411 | -		if( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) { | |
| 412 | - $caps_to_check[] = 'gravityview_full_access'; | |
| 411 | +		if ( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) { | |
| 412 | + $caps_to_check[ ] = 'gravityview_full_access'; | |
| 413 | 413 | } | 
| 414 | 414 | |
| 415 | 415 | $all_gravity_forms_caps = class_exists( 'GFCommon' ) ? GFCommon::all_caps() : array(); | 
| 416 | 416 | |
| 417 | 417 | // Are there any $caps_to_check that are from Gravity Forms? | 
| 418 | -		if( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) { | |
| 419 | - $caps_to_check[] = 'gform_full_access'; | |
| 418 | +		if ( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) { | |
| 419 | + $caps_to_check[ ] = 'gform_full_access'; | |
| 420 | 420 | } | 
| 421 | 421 | |
| 422 | 422 | return array_unique( $caps_to_check ); | 
| @@ -438,7 +438,7 @@ discard block | ||
| 438 | 438 | $capabilities = self::all_caps(); | 
| 439 | 439 | |
| 440 | 440 | // Loop through each role and remove GV caps_to_check | 
| 441 | -			foreach( $wp_roles->get_names() as $role_slug => $role_name ) { | |
| 441 | +			foreach ( $wp_roles->get_names() as $role_slug => $role_name ) { | |
| 442 | 442 |  				foreach ( $capabilities as $cap ) { | 
| 443 | 443 | $wp_roles->remove_cap( $role_slug, $cap ); | 
| 444 | 444 | } | 
| @@ -307,7 +307,7 @@ | ||
| 307 | 307 | ! isset( $value ) // If it's not set, it's empty! | 
| 308 | 308 | || false === $value | 
| 309 | 309 | || null === $value | 
| 310 | - || '' === $value // Empty string | |
| 310 | + || '' === $value // Empty string | |
| 311 | 311 | || array() === $value // Empty array | 
| 312 | 312 | || ( is_object( $value ) && ! get_object_vars( $value ) ) // Empty object | 
| 313 | 313 |  	) { | 
| @@ -32,19 +32,19 @@ discard block | ||
| 32 | 32 | // If there's an overriding CSS file in the current template folder, use it. | 
| 33 | 33 | $template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file; | 
| 34 | 34 | |
| 35 | -	if( file_exists( $template_css_path ) ) { | |
| 35 | +	if ( file_exists( $template_css_path ) ) { | |
| 36 | 36 | $path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file; | 
| 37 | 37 |  		gravityview()->log->debug( 'Stylesheet override ({css_file})', array( 'css_file' => esc_attr( $css_file ) ) ); | 
| 38 | 38 |  	} else { | 
| 39 | 39 | // Default: use GravityView CSS file | 
| 40 | 40 | |
| 41 | 41 | // If no path is provided, assume default plugin templates CSS folder | 
| 42 | -		if( '' === $dir_path ) { | |
| 42 | +		if ( '' === $dir_path ) { | |
| 43 | 43 | $dir_path = GRAVITYVIEW_DIR . 'templates/css/'; | 
| 44 | 44 | } | 
| 45 | 45 | |
| 46 | 46 | // plugins_url() expects a path to a file, not directory. We append a file to be stripped. | 
| 47 | - $path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' ); | |
| 47 | + $path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' ); | |
| 48 | 48 | } | 
| 49 | 49 | |
| 50 | 50 | return $path; | 
| @@ -82,9 +82,9 @@ discard block | ||
| 82 | 82 | |
| 83 | 83 | $parsed_permalink = parse_url( get_permalink( $id ) ); | 
| 84 | 84 | |
| 85 | - $permalink_args = isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false; | |
| 85 | + $permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false; | |
| 86 | 86 | |
| 87 | -	if( empty( $permalink_args ) ) { | |
| 87 | +	if ( empty( $permalink_args ) ) { | |
| 88 | 88 | return array(); | 
| 89 | 89 | } | 
| 90 | 90 | |
| @@ -109,15 +109,15 @@ discard block | ||
| 109 | 109 |  function gv_selected( $value, $current, $echo = true, $type = 'selected' ) { | 
| 110 | 110 | |
| 111 | 111 | $output = ''; | 
| 112 | -	if( is_array( $current ) ) { | |
| 113 | -		if( in_array( $value, $current ) ) { | |
| 112 | +	if ( is_array( $current ) ) { | |
| 113 | +		if ( in_array( $value, $current ) ) { | |
| 114 | 114 | $output = __checked_selected_helper( true, true, false, $type ); | 
| 115 | 115 | } | 
| 116 | 116 |  	} else { | 
| 117 | 117 | $output = __checked_selected_helper( $value, $current, false, $type ); | 
| 118 | 118 | } | 
| 119 | 119 | |
| 120 | -	if( $echo ) { | |
| 120 | +	if ( $echo ) { | |
| 121 | 121 | echo $output; | 
| 122 | 122 | } | 
| 123 | 123 | |
| @@ -125,7 +125,7 @@ discard block | ||
| 125 | 125 | } | 
| 126 | 126 | |
| 127 | 127 | |
| 128 | -if( ! function_exists( 'gravityview_sanitize_html_class' ) ) { | |
| 128 | +if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) { | |
| 129 | 129 | |
| 130 | 130 | /** | 
| 131 | 131 | * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that. | 
| @@ -171,7 +171,7 @@ discard block | ||
| 171 | 171 | */ | 
| 172 | 172 |  function gravityview_strip_whitespace( $string ) { | 
| 173 | 173 | $string = normalize_whitespace( $string ); | 
| 174 | -	return preg_replace('/[\r\n\t ]+/', ' ', $string ); | |
| 174 | + return preg_replace( '/[\r\n\t ]+/', ' ', $string ); | |
| 175 | 175 | } | 
| 176 | 176 | |
| 177 | 177 | /** | 
| @@ -185,7 +185,7 @@ discard block | ||
| 185 | 185 | * @return string Included file contents | 
| 186 | 186 | */ | 
| 187 | 187 |  function gravityview_ob_include( $file_path, $object = NULL ) { | 
| 188 | -	if( ! file_exists( $file_path ) ) { | |
| 188 | +	if ( ! file_exists( $file_path ) ) { | |
| 189 | 189 |  		gravityview()->log->error( 'File path does not exist. {path}', array( 'path' => $file_path ) ); | 
| 190 | 190 | return ''; | 
| 191 | 191 | } | 
| @@ -209,15 +209,15 @@ discard block | ||
| 209 | 209 | |
| 210 | 210 | $width = $height * 0.7586206897; | 
| 211 | 211 | |
| 212 | -	if( function_exists('is_rtl') && is_rtl() ) { | |
| 213 | - $style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;'; | |
| 212 | +	if ( function_exists( 'is_rtl' ) && is_rtl() ) { | |
| 213 | + $style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;'; | |
| 214 | 214 | $css_class = is_string( $css_class ) ? $css_class : 'alignright'; | 
| 215 | 215 |  	} else { | 
| 216 | - $style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;'; | |
| 216 | + $style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;'; | |
| 217 | 217 | $css_class = is_string( $css_class ) ? $css_class : 'alignleft'; | 
| 218 | 218 | } | 
| 219 | 219 | |
| 220 | - return '<img src="'. esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) .'" class="'. gravityview_sanitize_html_class( $css_class ).'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />'; | |
| 220 | + return '<img src="' . esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) . '" class="' . gravityview_sanitize_html_class( $css_class ) . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />'; | |
| 221 | 221 | } | 
| 222 | 222 | |
| 223 | 223 | /** | 
| @@ -241,9 +241,9 @@ discard block | ||
| 241 | 241 |  function gravityview_number_format( $number, $decimals = '', $separator = true ) { | 
| 242 | 242 | global $wp_locale; | 
| 243 | 243 | |
| 244 | -	if( '' === $decimals ) { | |
| 244 | +	if ( '' === $decimals ) { | |
| 245 | 245 | |
| 246 | - $decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.'; | |
| 246 | + $decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.'; | |
| 247 | 247 | |
| 248 | 248 | /** | 
| 249 | 249 | * Calculate the position of the decimal point in the number | 
| @@ -276,7 +276,7 @@ discard block | ||
| 276 | 276 | $parts = parse_url( $value ); | 
| 277 | 277 | |
| 278 | 278 | // No domain? Strange...show the original text. | 
| 279 | -	if( empty( $parts['host'] ) ) { | |
| 279 | +	if ( empty( $parts[ 'host' ] ) ) { | |
| 280 | 280 | return $value; | 
| 281 | 281 | } | 
| 282 | 282 | |
| @@ -289,16 +289,16 @@ discard block | ||
| 289 | 289 | * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n | 
| 290 | 290 | * If true: `http://example.com => example.com` | 
| 291 | 291 | */ | 
| 292 | -	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) { | |
| 292 | +	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) { | |
| 293 | 293 | |
| 294 | -		if( isset( $parts['scheme'] ) ) { | |
| 295 | - $return .= $parts['scheme']; | |
| 294 | +		if ( isset( $parts[ 'scheme' ] ) ) { | |
| 295 | + $return .= $parts[ 'scheme' ]; | |
| 296 | 296 | } | 
| 297 | 297 | |
| 298 | 298 | } | 
| 299 | 299 | |
| 300 | 300 | // The domain, which may contain a subdomain | 
| 301 | - $domain = $parts['host']; | |
| 301 | + $domain = $parts[ 'host' ]; | |
| 302 | 302 | |
| 303 | 303 | /** | 
| 304 | 304 | * @filter `gravityview_anchor_text_stripwww` Strip www from the domain? | 
| @@ -306,10 +306,10 @@ discard block | ||
| 306 | 306 | * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n | 
| 307 | 307 | * If true: `www.example.com => example.com` | 
| 308 | 308 | */ | 
| 309 | -	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true ); | |
| 309 | + $strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true ); | |
| 310 | 310 | |
| 311 | -	if( $strip_www ) { | |
| 312 | -		$domain = str_replace('www.', '', $domain ); | |
| 311 | +	if ( $strip_www ) { | |
| 312 | + $domain = str_replace( 'www.', '', $domain ); | |
| 313 | 313 | } | 
| 314 | 314 | |
| 315 | 315 | /** | 
| @@ -319,11 +319,11 @@ discard block | ||
| 319 | 319 | * If true: `http://demo.example.com => example.com` \n | 
| 320 | 320 | * If false: `http://demo.example.com => demo.example.com` | 
| 321 | 321 | */ | 
| 322 | -	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true); | |
| 322 | + $strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true ); | |
| 323 | 323 | |
| 324 | -	if( $strip_subdomains ) { | |
| 324 | +	if ( $strip_subdomains ) { | |
| 325 | 325 | |
| 326 | - $domain = _gravityview_strip_subdomain( $parts['host'] ); | |
| 326 | + $domain = _gravityview_strip_subdomain( $parts[ 'host' ] ); | |
| 327 | 327 | |
| 328 | 328 | } | 
| 329 | 329 | |
| @@ -337,12 +337,12 @@ discard block | ||
| 337 | 337 | * If true: `http://example.com/sub/directory/page.html => example.com` \n | 
| 338 | 338 | * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html` | 
| 339 | 339 | */ | 
| 340 | -	$root_only = apply_filters('gravityview_anchor_text_rootonly', true); | |
| 340 | + $root_only = apply_filters( 'gravityview_anchor_text_rootonly', true ); | |
| 341 | 341 | |
| 342 | -	if( empty( $root_only ) ) { | |
| 342 | +	if ( empty( $root_only ) ) { | |
| 343 | 343 | |
| 344 | -		if( isset( $parts['path'] ) ) { | |
| 345 | - $return .= $parts['path']; | |
| 344 | +		if ( isset( $parts[ 'path' ] ) ) { | |
| 345 | + $return .= $parts[ 'path' ]; | |
| 346 | 346 | } | 
| 347 | 347 | } | 
| 348 | 348 | |
| @@ -352,12 +352,12 @@ discard block | ||
| 352 | 352 | * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n | 
| 353 | 353 | * If true: `http://example.com/?query=example => example.com` | 
| 354 | 354 | */ | 
| 355 | -	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true ); | |
| 355 | + $strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true ); | |
| 356 | 356 | |
| 357 | -	if( empty( $strip_query_string ) ) { | |
| 357 | +	if ( empty( $strip_query_string ) ) { | |
| 358 | 358 | |
| 359 | -		if( isset( $parts['query'] ) ) { | |
| 360 | - $return .= '?'.$parts['query']; | |
| 359 | +		if ( isset( $parts[ 'query' ] ) ) { | |
| 360 | + $return .= '?' . $parts[ 'query' ]; | |
| 361 | 361 | } | 
| 362 | 362 | |
| 363 | 363 | } | 
| @@ -374,8 +374,8 @@ discard block | ||
| 374 | 374 | */ | 
| 375 | 375 |  function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) { | 
| 376 | 376 | |
| 377 | -	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) { | |
| 378 | - return $matches['domain']; | |
| 377 | +	if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) { | |
| 378 | + return $matches[ 'domain' ]; | |
| 379 | 379 |  	} else { | 
| 380 | 380 | return $string_maybe_has_subdomain; | 
| 381 | 381 | } | 
| @@ -444,7 +444,7 @@ discard block | ||
| 444 | 444 | |
| 445 | 445 |  		if ( in_array( $value, array( 'yes', 'true' ), true ) ) { | 
| 446 | 446 | $value = true; | 
| 447 | -		} else if( in_array( $value, array( 'no', 'false' ), true ) ) { | |
| 447 | +		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) { | |
| 448 | 448 | $value = false; | 
| 449 | 449 | } | 
| 450 | 450 | } | 
| @@ -473,7 +473,7 @@ discard block | ||
| 473 | 473 | */ | 
| 474 | 474 |  function gv_maybe_json_decode( $value, $assoc = false, $depth = 512, $options = 0 ) { | 
| 475 | 475 | |
| 476 | -	if( ! is_string( $value ) ) { | |
| 476 | +	if ( ! is_string( $value ) ) { | |
| 477 | 477 | return $value; | 
| 478 | 478 | } | 
| 479 | 479 | |
| @@ -484,12 +484,12 @@ discard block | ||
| 484 | 484 | } | 
| 485 | 485 | |
| 486 | 486 | // There was a JSON error (PHP 5.3+) | 
| 487 | -	if( function_exists('json_last_error') && JSON_ERROR_NONE !== json_last_error() ) { | |
| 487 | +	if ( function_exists( 'json_last_error' ) && JSON_ERROR_NONE !== json_last_error() ) { | |
| 488 | 488 | return $value; | 
| 489 | 489 | } | 
| 490 | 490 | |
| 491 | 491 | // It wasn't JSON (PHP < 5.3 fallback) | 
| 492 | -	if( is_null( $decoded ) ) { | |
| 492 | +	if ( is_null( $decoded ) ) { | |
| 493 | 493 | return $value; | 
| 494 | 494 | } | 
| 495 | 495 | |
| @@ -512,7 +512,7 @@ discard block | ||
| 512 | 512 | |
| 513 | 513 | // Use the original function, if exists. | 
| 514 | 514 | // Requires WP 4.4+ | 
| 515 | -	if( function_exists( 'map_deep') ) { | |
| 515 | +	if ( function_exists( 'map_deep' ) ) { | |
| 516 | 516 | return map_deep( $value, $callback ); | 
| 517 | 517 | } | 
| 518 | 518 | |
| @@ -577,7 +577,7 @@ discard block | ||
| 577 | 577 | |
| 578 | 578 |  	$exploded = explode( '.', "{$field_id}" ); | 
| 579 | 579 | |
| 580 | - return isset( $exploded[1] ) ? intval( $exploded[1] ) : false; | |
| 580 | + return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false; | |
| 581 | 581 | } | 
| 582 | 582 | |
| 583 | 583 | /** | 
| @@ -618,13 +618,13 @@ discard block | ||
| 618 | 618 | */ | 
| 619 | 619 | $args = apply_filters( 'gravityview_get_terms_choices_args', $args ); | 
| 620 | 620 | |
| 621 | - $terms = get_terms( $args['taxonomy'], $args ); | |
| 621 | + $terms = get_terms( $args[ 'taxonomy' ], $args ); | |
| 622 | 622 | |
| 623 | 623 | $choices = array(); | 
| 624 | 624 | |
| 625 | 625 |  	if ( is_array( $terms ) ) { | 
| 626 | 626 |  		foreach ( $terms as $term_id => $term_name ) { | 
| 627 | - $choices[] = array( | |
| 627 | + $choices[ ] = array( | |
| 628 | 628 | 'text' => $term_name, | 
| 629 | 629 | 'value' => $term_id | 
| 630 | 630 | ); | 
| @@ -648,21 +648,21 @@ discard block | ||
| 648 | 648 |  function _gravityview_process_posted_fields() { | 
| 649 | 649 | $fields = array(); | 
| 650 | 650 | |
| 651 | -	if( !empty( $_POST['gv_fields'] ) ) { | |
| 652 | -		if ( ! is_array( $_POST['gv_fields'] ) ) { | |
| 651 | +	if ( ! empty( $_POST[ 'gv_fields' ] ) ) { | |
| 652 | +		if ( ! is_array( $_POST[ 'gv_fields' ] ) ) { | |
| 653 | 653 | |
| 654 | 654 | // We are not using parse_str() due to max_input_vars limitation with large View configurations | 
| 655 | 655 | $fields_holder = array(); | 
| 656 | - GVCommon::gv_parse_str( stripslashes( $_POST['gv_fields'] ), $fields_holder ); | |
| 656 | + GVCommon::gv_parse_str( stripslashes( $_POST[ 'gv_fields' ] ), $fields_holder ); | |
| 657 | 657 | |
| 658 | -			if ( isset( $fields_holder['fields'] ) ) { | |
| 659 | - $fields = $fields_holder['fields']; | |
| 658 | +			if ( isset( $fields_holder[ 'fields' ] ) ) { | |
| 659 | + $fields = $fields_holder[ 'fields' ]; | |
| 660 | 660 |  			} else { | 
| 661 | 661 | gravityview()->log->error( 'No `fields` key was found after parsing $fields string', array( 'data' => $fields_holder ) ); | 
| 662 | 662 | } | 
| 663 | 663 | |
| 664 | 664 |  		} else { | 
| 665 | - $fields = $_POST['gv_fields']; | |
| 665 | + $fields = $_POST[ 'gv_fields' ]; | |
| 666 | 666 | } | 
| 667 | 667 | } | 
| 668 | 668 | |
| @@ -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 | * | 
| @@ -62,7 +62,7 @@ discard block | ||
| 62 | 62 | |
| 63 | 63 | add_filter( 'gravityview/sorting/time', array( $this, 'modify_sort_id' ), 10, 2 ); | 
| 64 | 64 | |
| 65 | -		add_filter('gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 ); | |
| 65 | + add_filter( 'gravityview_search_criteria', array( $this, '_maybe_filter_gravity_forms_query' ), 10, 4 ); | |
| 66 | 66 | } | 
| 67 | 67 | |
| 68 | 68 | /** | 
| @@ -103,35 +103,35 @@ discard block | ||
| 103 | 103 |  	public function _maybe_filter_gravity_forms_query( $criteria, $form_ids, $view_id ) { | 
| 104 | 104 | |
| 105 | 105 | // If the search is not being sorted, return early | 
| 106 | -		if( empty( $criteria['sorting']['key'] ) ) { | |
| 106 | +		if ( empty( $criteria[ 'sorting' ][ 'key' ] ) ) { | |
| 107 | 107 | return $criteria; | 
| 108 | 108 | } | 
| 109 | 109 | |
| 110 | - $pieces = explode( $this->_sort_divider, $criteria['sorting']['key'] ); | |
| 110 | + $pieces = explode( $this->_sort_divider, $criteria[ 'sorting' ][ 'key' ] ); | |
| 111 | 111 | |
| 112 | 112 | /** | 
| 113 | 113 | * If the sort key does not match the key set in modify_sort_id(), do not modify the Gravity Forms query SQL | 
| 114 | 114 | * @see modify_sort_id() | 
| 115 | 115 | */ | 
| 116 | -		if( empty( $pieces[1] ) ) { | |
| 116 | +		if ( empty( $pieces[ 1 ] ) ) { | |
| 117 | 117 | return $criteria; | 
| 118 | 118 | } | 
| 119 | 119 | |
| 120 | 120 | // Pass these to the _modify_query_sort_by_time_hack() method | 
| 121 | - $this->_time_format = $pieces[1]; | |
| 122 | - $this->_date_format = $pieces[2]; | |
| 121 | + $this->_time_format = $pieces[ 1 ]; | |
| 122 | + $this->_date_format = $pieces[ 2 ]; | |
| 123 | 123 | |
| 124 | 124 | // Remove fake input IDs (5.1 doesn't exist. Use 5) | 
| 125 | - $criteria['sorting']['key'] = floor( $pieces[0] ); | |
| 125 | + $criteria[ 'sorting' ][ 'key' ] = floor( $pieces[ 0 ] ); | |
| 126 | 126 | |
| 127 | 127 | /** | 
| 128 | 128 | * Make sure sorting is numeric (# of seconds). IMPORTANT. | 
| 129 | 129 | * @see GVCommon::is_field_numeric() is_numeric should also be set here | 
| 130 | 130 | */ | 
| 131 | - $criteria['sorting']['is_numeric'] = true; | |
| 131 | + $criteria[ 'sorting' ][ 'is_numeric' ] = true; | |
| 132 | 132 | |
| 133 | 133 | // Modify the Gravity Forms WP Query | 
| 134 | -		add_filter('query', array( $this, '_modify_query_sort_by_time_hack' ) ); | |
| 134 | + add_filter( 'query', array( $this, '_modify_query_sort_by_time_hack' ) ); | |
| 135 | 135 | |
| 136 | 136 | return $criteria; | 
| 137 | 137 | } | 
| @@ -152,9 +152,9 @@ discard block | ||
| 152 | 152 | * then we want to modify the query. | 
| 153 | 153 | * @see GFFormsModel::sort_by_field_query() | 
| 154 | 154 | */ | 
| 155 | -		if( strpos( $query, self::GF_SORTING_SQL ) > 0 ) { | |
| 155 | +		if ( strpos( $query, self::GF_SORTING_SQL ) > 0 ) { | |
| 156 | 156 | |
| 157 | -			if( $this->_time_format === '24' ) { | |
| 157 | +			if ( $this->_time_format === '24' ) { | |
| 158 | 158 | $sql_str_to_date = "STR_TO_DATE( `value`, '%H:%i' )"; | 
| 159 | 159 |  			} else { | 
| 160 | 160 | $sql_str_to_date = "STR_TO_DATE( `value`, '%h:%i %p' )"; | 
| @@ -200,18 +200,18 @@ discard block | ||
| 200 | 200 | // Set variables | 
| 201 | 201 | parent::field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ); | 
| 202 | 202 | |
| 203 | -		if( 'edit' === $context ) { | |
| 203 | +		if ( 'edit' === $context ) { | |
| 204 | 204 | return $field_options; | 
| 205 | 205 | } | 
| 206 | 206 | |
| 207 | 207 | /** | 
| 208 | 208 | * Set default date format based on field ID and Form ID | 
| 209 | 209 | */ | 
| 210 | -		add_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); | |
| 210 | + add_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); | |
| 211 | 211 | |
| 212 | -		$this->add_field_support('date_display', $field_options ); | |
| 212 | + $this->add_field_support( 'date_display', $field_options ); | |
| 213 | 213 | |
| 214 | -		remove_filter('gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); | |
| 214 | + remove_filter( 'gravityview_date_format', array( $this, '_filter_date_display_date_format' ) ); | |
| 215 | 215 | |
| 216 | 216 | return $field_options; | 
| 217 | 217 | } | 
| @@ -226,7 +226,7 @@ discard block | ||
| 226 | 226 |  	private function _get_time_format() { | 
| 227 | 227 | global $post; | 
| 228 | 228 | |
| 229 | - $current_form = isset( $_POST['form_id'] ) ? intval( $_POST['form_id'] ) : gravityview_get_form_id( $post->ID ); | |
| 229 | + $current_form = isset( $_POST[ 'form_id' ] ) ? intval( $_POST[ 'form_id' ] ) : gravityview_get_form_id( $post->ID ); | |
| 230 | 230 | |
| 231 | 231 | return self::_get_time_format_for_field( $this->_field_id, $current_form ); | 
| 232 | 232 | } | 
| @@ -245,7 +245,7 @@ discard block | ||
| 245 | 245 | // GF defaults to 12, so should we. | 
| 246 | 246 | $time_format = '12'; | 
| 247 | 247 | |
| 248 | -		if( $form_id ) { | |
| 248 | +		if ( $form_id ) { | |
| 249 | 249 | $form = GFAPI::get_form( $form_id ); | 
| 250 | 250 | |
| 251 | 251 |  			if ( $form ) { | 
| @@ -292,7 +292,7 @@ discard block | ||
| 292 | 292 | $default = 'h:i A'; | 
| 293 | 293 | |
| 294 | 294 | // This doesn't take into account 24-hour | 
| 295 | -		switch( $field_input_id ) { | |
| 295 | +		switch ( $field_input_id ) { | |
| 296 | 296 | // Hours | 
| 297 | 297 | case 1: | 
| 298 | 298 | return ( $time_format === '12' ) ? 'h' : 'H'; | 
| @@ -193,8 +193,8 @@ discard block | ||
| 193 | 193 | * @return string Path to XML file | 
| 194 | 194 | */ | 
| 195 | 195 |  	public function assign_form_xml( $xml = '', $template = '' ) { | 
| 196 | -		if ( $this->settings['type'] === 'preset' && ! empty( $this->settings['preset_form'] ) && $this->template_id === $template ) { | |
| 197 | - return $this->settings['preset_form']; | |
| 196 | +		if ( $this->settings[ 'type' ] === 'preset' && ! empty( $this->settings[ 'preset_form' ] ) && $this->template_id === $template ) { | |
| 197 | + return $this->settings[ 'preset_form' ]; | |
| 198 | 198 | } | 
| 199 | 199 | |
| 200 | 200 | return $xml; | 
| @@ -207,8 +207,8 @@ discard block | ||
| 207 | 207 | * @return string Path to XML file | 
| 208 | 208 | */ | 
| 209 | 209 |  	public function assign_fields_xml( $xml = '', $template = '' ) { | 
| 210 | -		if ( $this->settings['type'] === 'preset' && ! empty( $this->settings['preset_fields'] ) && $this->template_id === $template ) { | |
| 211 | - return $this->settings['preset_fields']; | |
| 210 | +		if ( $this->settings[ 'type' ] === 'preset' && ! empty( $this->settings[ 'preset_fields' ] ) && $this->template_id === $template ) { | |
| 211 | + return $this->settings[ 'preset_fields' ]; | |
| 212 | 212 | } | 
| 213 | 213 | |
| 214 | 214 | return $xml; | 
| @@ -226,8 +226,8 @@ discard block | ||
| 226 | 226 | */ | 
| 227 | 227 |  	public function assign_view_slug( $default, $context ) { | 
| 228 | 228 | |
| 229 | -		if ( ! empty( $this->settings['slug'] ) ) { | |
| 230 | - return $this->settings['slug']; | |
| 229 | +		if ( ! empty( $this->settings[ 'slug' ] ) ) { | |
| 230 | + return $this->settings[ 'slug' ]; | |
| 231 | 231 | } | 
| 232 | 232 |  		if ( ! empty( $default ) ) { | 
| 233 | 233 | return $default; | 
| @@ -244,8 +244,8 @@ discard block | ||
| 244 | 244 | * @return void | 
| 245 | 245 | */ | 
| 246 | 246 |  	public function register_styles() { | 
| 247 | -		if ( ! empty( $this->settings['css_source'] ) ) { | |
| 248 | - wp_register_style( 'gravityview_style_' . $this->template_id, $this->settings['css_source'], array(), GravityView_Plugin::version, 'all' ); | |
| 247 | +		if ( ! empty( $this->settings[ 'css_source' ] ) ) { | |
| 248 | + wp_register_style( 'gravityview_style_' . $this->template_id, $this->settings[ 'css_source' ], array(), GravityView_Plugin::version, 'all' ); | |
| 249 | 249 | } | 
| 250 | 250 | } | 
| 251 | 251 | |
| @@ -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 | |