Strategy11 / formidable-forms

classes/controllers/FrmFormsController.php

Braces +2 added lines, -1 removed lines

@@ -1082,7 +1082,8 @@
 	private static function maybe_get_form_to_show( $id ) {
 		$form = false;
 
-		if ( ! empty( $id ) ) { // no form id or key set
+		if ( ! empty( $id ) ) {
+// no form id or key set
 			$form = FrmForm::getOne( $id );
 			if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
 				$form = false;

Doc Comments +8 added lines

@@ -1126,6 +1126,7 @@ 
 	 * Get an array of the helper shortcodes to display in the customization panel
 	 *
 	 * @since 2.0.6
+	 * @param boolean $settings_tab
 	 */
 	private static function get_shortcode_helpers( $settings_tab ) {
 		$entry_shortcodes = array(
@@ -1204,6 +1205,9 @@ 
 		return $content;
 	}
 
+	/**
+	 * @param boolean $entry
+	 */
 	private static function get_entry_by_param( &$entry ) {
 		if ( ! $entry || ! is_object( $entry ) ) {
 			if ( ! $entry || ! is_numeric( $entry ) ) {
@@ -1498,6 +1502,9 @@ 
 		return $form;
 	}
 
+	/**
+	 * @param string $id
+	 */
 	private static function maybe_get_form_to_show( $id ) {
 		$form = false;
 
@@ -1921,6 +1928,7 @@ 
 
 	/**
 	 * @since 2.0.8
+	 * @param string $content
 	 */
 	private static function maybe_minimize_form( $atts, &$content ) {
 		// check if minimizing is turned on

Spacing +20 added lines, -20 removed lines

@@ -409,11 +409,11 @@ 
 			),
 		);
 
-		if ( ! isset( $available_status[ $status ] ) ) {
+		if ( ! isset( $available_status[$status] ) ) {
 			return;
 		}
 
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
 
 		$params = FrmForm::list_page_params();
 
@@ -421,7 +421,7 @@ 
 		check_admin_referer( $status . '_form_' . $params['id'] );
 
 		$count = 0;
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
 			$count ++;
 		}
 
@@ -438,7 +438,7 @@ 
 		/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
 		$available_status['trash']['message']   = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
 
-		$message = $available_status[ $status ]['message'];
+		$message = $available_status[$status]['message'];
 
 		self::display_forms_list( $params, $message );
 	}
@@ -459,7 +459,7 @@ 
 				'type'  => 'request',
 			)
 		);
-		$message      = sprintf(
+		$message = sprintf(
 			/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
 			_n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ),
 			$count,
@@ -976,7 +976,7 @@ 
 				$section['id'] = $section['anchor'];
 			}
 
-			$sections[ $key ] = $section;
+			$sections[$key] = $section;
 		}
 
 		return $sections;
@@ -1055,7 +1055,7 @@ 
 		if ( ! empty( $user_fields ) ) {
 			$user_helpers = array();
 			foreach ( $user_fields as $uk => $uf ) {
-				$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
+				$user_helpers['|user_id| show="' . $uk . '"'] = $uf;
 				unset( $uk, $uf );
 			}
 
@@ -1288,7 +1288,7 @@ 
 				add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
 			} else {
 				$vars   = FrmAppHelper::json_to_array( $json_vars );
-				$action = $vars[ $action ];
+				$action = $vars[$action];
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] );
 				$_REQUEST = array_merge( $_REQUEST, $vars );
 				$_POST    = array_merge( $_POST, $_REQUEST );
@@ -1367,7 +1367,7 @@ 
 		$actions = array();
 		foreach ( $frm_vars['forms_loaded'] as $form ) {
 			if ( is_object( $form ) ) {
-				$actions[ $form->id ] = $form->name;
+				$actions[$form->id] = $form->name;
 			}
 			unset( $form );
 		}
@@ -1594,8 +1594,8 @@ 
 	private static function get_saved_errors( $form, $params ) {
 		global $frm_vars;
 
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
-			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][$form->id] ) ) {
+			$errors = $frm_vars['created_entries'][$form->id]['errors'];
 		} else {
 			$errors = array();
 		}
@@ -1609,7 +1609,7 @@ 
 	public static function just_created_entry( $form_id ) {
 		global $frm_vars;
 
-		return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0;
+		return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][$form_id] ) && isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) ? $frm_vars['created_entries'][$form_id]['entry_id'] : 0;
 	}
 
 	/**
@@ -1617,7 +1617,7 @@ 
 	 */
 	private static function get_confirmation_method( $atts ) {
 		$opt    = 'success_action';
-		$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
+		$method = ( isset( $atts['form']->options[$opt] ) && ! empty( $atts['form']->options[$opt] ) ) ? $atts['form']->options[$opt] : 'message';
 		$method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
 
 		if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
@@ -1630,7 +1630,7 @@ 
 	public static function maybe_trigger_redirect( $form, $params, $args ) {
 		if ( ! isset( $params['id'] ) ) {
 			global $frm_vars;
-			$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
+			$params['id'] = $frm_vars['created_entries'][$form->id]['entry_id'];
 		}
 
 		$conf_method = self::get_confirmation_method(
@@ -1674,7 +1674,7 @@ 
 		$opt = ( ! isset( $args['action'] ) || $args['action'] == 'create' ) ? 'success' : 'edit';
 
 		$args['success_opt'] = $opt;
-		if ( $args['conf_method'] == 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
+		if ( $args['conf_method'] == 'page' && is_numeric( $args['form']->options[$opt . '_page_id'] ) ) {
 			self::load_page_after_submit( $args );
 		} elseif ( $args['conf_method'] == 'redirect' ) {
 			self::redirect_after_submit( $args );
@@ -1689,8 +1689,8 @@ 
 	private static function load_page_after_submit( $args ) {
 		global $post;
 		$opt = $args['success_opt'];
-		if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
-			$page     = get_post( $args['form']->options[ $opt . '_page_id' ] );
+		if ( ! $post || $args['form']->options[$opt . '_page_id'] != $post->ID ) {
+			$page     = get_post( $args['form']->options[$opt . '_page_id'] );
 			$old_post = $post;
 			$post     = $page;
 			$content  = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
@@ -1708,11 +1708,11 @@ 
 		add_filter( 'frm_use_wpautop', '__return_false' );
 
 		$opt         = $args['success_opt'];
-		$success_url = trim( $args['form']->options[ $opt . '_url' ] );
+		$success_url = trim( $args['form']->options[$opt . '_url'] );
 		$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
 		$success_url = do_shortcode( $success_url );
 
-		$success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
+		$success_msg = isset( $args['form']->options[$opt . '_msg'] ) ? $args['form']->options[$opt . '_msg'] : __( 'Please wait while you are redirected.', 'formidable' );
 
 		$redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
 
@@ -1819,7 +1819,7 @@ 
 			'description' => false,
 			'reset'       => false,
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args( $args, $defaults );
 	}
 
 	/**

classes/models/FrmFieldValueSelector.php

Doc Comments +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 	/**
 	 * FrmFieldValueSelector constructor
 	 *
-	 * @param int|string $field_id
+	 * @param integer $field_id
 	 */
 	public function __construct( $field_id, $args ) {
 		$this->set_html_name( $args );

classes/models/FrmEntryShortcodeFormatter.php

Spacing +1 added lines, -1 removed lines

@@ -285,7 +285,7 @@
 			'type'  => $field->type,
 		);
 
-		$this->array_content[ $field->id ] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $array, $field );
+		$this->array_content[$field->id] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $array, $field );
 	}
 
 	/**

classes/models/FrmEntryFormatter.php

Doc Comments +3 added lines, -3 removed lines

@@ -363,7 +363,7 @@ 
 	 *
 	 * @since 2.04
 	 *
-	 * @param array $field_values
+	 * @param FrmFieldValue[] $field_values
 	 * @param array $output
 	 */
 	protected function push_field_values_to_array( $field_values, &$output ) {
@@ -570,7 +570,7 @@ 
 	 *
 	 * @param mixed $value
 	 *
-	 * @return mixed|string
+	 * @return FrmFieldValue
 	 */
 	protected function prepare_display_value_for_array( $value ) {
 		return $this->strip_html( $value );
@@ -585,7 +585,7 @@ 
 	 * @param mixed $display_value
 	 * @param string $field_type
 	 *
-	 * @return mixed|string
+	 * @return string
 	 */
 	protected function prepare_display_value_for_html_table( $display_value, $field_type = '' ) {
 		$display_value = $this->flatten_array( $display_value );

Spacing +7 added lines, -7 removed lines

@@ -161,8 +161,8 @@ 
 
 		$conditionally_add = array( 'include_fields', 'fields', 'exclude_fields', 'entry' );
 		foreach ( $conditionally_add as $index ) {
-			if ( isset( $atts[ $index ] ) ) {
-				$entry_atts[ $index ] = $atts[ $index ];
+			if ( isset( $atts[$index] ) ) {
+				$entry_atts[$index] = $atts[$index];
 			}
 		}
 
@@ -331,8 +331,8 @@ 
 
 		$unset = array( 'id', 'entry', 'form_id', 'format' );
 		foreach ( $unset as $param ) {
-			if ( isset( $atts[ $param ] ) ) {
-				unset( $atts[ $param ] );
+			if ( isset( $atts[$param] ) ) {
+				unset( $atts[$param] );
 			}
 		}
 
@@ -485,11 +485,11 @@ 
 
 			$displayed_value = $this->prepare_display_value_for_array( $field_value->get_displayed_value() );
 
-			$output[ $this->get_key_or_id( $field_value ) ] = $displayed_value;
+			$output[$this->get_key_or_id( $field_value )] = $displayed_value;
 
 			$has_separate_value = (bool) $field_value->get_field_option( 'separate_value' );
 			if ( $has_separate_value || $displayed_value !== $field_value->get_saved_value() ) {
-				$output[ $this->get_key_or_id( $field_value ) . '-value' ] = $field_value->get_saved_value();
+				$output[$this->get_key_or_id( $field_value ) . '-value'] = $field_value->get_saved_value();
 			}
 		}
 	}
@@ -876,7 +876,7 @@ 
 
 			if ( is_array( $value ) ) {
 				foreach ( $value as $key => $single_value ) {
-					$value[ $key ] = $this->strip_html( $single_value );
+					$value[$key] = $this->strip_html( $single_value );
 				}
 			} elseif ( $this->is_plain_text && ! is_array( $value ) ) {
 				if ( strpos( $value, '<img' ) !== false ) {

classes/factories/FrmFieldFactory.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 			'captcha'  => 'FrmFieldCaptcha',
 		);
 
-		$class = isset( $type_classes[ $field_type ] ) ? $type_classes[ $field_type ] : '';
+		$class = isset( $type_classes[$field_type] ) ? $type_classes[$field_type] : '';
 		return apply_filters( 'frm_get_field_type_class', $class, $field_type );
 	}
 

Doc Comments +2 added lines, -1 removed lines

@@ -55,7 +55,7 @@ 
 	 * @since 3.0
 	 *
 	 * @param string $field_type
-	 * @param int|array|object $field
+	 * @param integer $field
 	 *
 	 * @return stdClass
 	 */
@@ -111,6 +111,7 @@ 
 
 	/**
 	 * @since 3.0
+	 * @param string $property
 	 */
 	public static function field_has_property( $type, $property ) {
 		$field = self::get_field_type( $type );

classes/controllers/FrmFieldsController.php

Doc Comments +1 added lines

@@ -246,6 +246,7 @@
 
 	/**
 	 * @since 3.0
+	 * @param stdClass $field_info
 	 */
 	private static function get_classes_for_builder_field( $field, $display, $field_info ) {
 		$li_classes = $field_info->form_builder_classes( $display['type'] );

Spacing +19 added lines, -19 removed lines

@@ -13,7 +13,7 @@ 
 
 		$_GET['page'] = 'formidable';
 
-		$values     = array(
+		$values = array(
 			'id'         => FrmAppHelper::get_post_param( 'form_id', '', 'absint' ),
 			'doing_ajax' => true,
 		);
@@ -36,7 +36,7 @@ 
 
 			ob_start();
 			self::load_single_field( $field, $values );
-			$field_html[ absint( $field->id ) ] = ob_get_contents();
+			$field_html[absint( $field->id )] = ob_get_contents();
 			ob_end_clean();
 		}
 
@@ -237,7 +237,7 @@ 
 			foreach ( $opts as $opt_key => $opt ) {
 				if ( strpos( $opt, '|' ) !== false ) {
 					$vals = explode( '|', $opt );
-					$opts[ $opt_key ] = array(
+					$opts[$opt_key] = array(
 						'label' => trim( $vals[0] ),
 						'value' => trim( $vals[1] ),
 					);
@@ -252,7 +252,7 @@ 
 			$other_array = array();
 			foreach ( $field['options'] as $opt_key => $opt ) {
 				if ( FrmFieldsHelper::is_other_opt( $opt_key ) ) {
-					$other_array[ $opt_key ] = $opt;
+					$other_array[$opt_key] = $opt;
 				}
 				unset( $opt_key, $opt );
 			}
@@ -294,18 +294,18 @@ 
 		$disabled_fields     = FrmAppHelper::pro_is_installed() ? array() : $pro_field_selection;
 		$frm_settings        = FrmAppHelper::get_settings();
 
-		if ( ! isset( $all_field_types[ $field['type'] ] ) ) {
+		if ( ! isset( $all_field_types[$field['type']] ) ) {
 			// Add fallback for an add-on field type that has been deactivated.
-			$all_field_types[ $field['type'] ] = array(
+			$all_field_types[$field['type']] = array(
 				'name' => ucfirst( $field['type'] ),
 				'icon' => 'frm_icon_font frm_pencil_icon',
 			);
-		} elseif ( ! is_array( $all_field_types[ $field['type'] ] ) ) {
+		} elseif ( ! is_array( $all_field_types[$field['type']] ) ) {
 			// Fallback for fields added in a more basic way.
-			FrmFormsHelper::prepare_field_type( $all_field_types[ $field['type'] ] );
+			FrmFormsHelper::prepare_field_type( $all_field_types[$field['type']] );
 		}
 
-		$type_name = $all_field_types[ $field['type'] ]['name'];
+		$type_name = $all_field_types[$field['type']]['name'];
 		if ( $field['type'] === 'divider' && FrmField::is_option_true( $field, 'repeat' ) ) {
 			$type_name = $all_field_types['divider|repeat']['name'];
 		}
@@ -387,13 +387,13 @@ 
 		$active   = 'default_value';
 
 		foreach ( $settings as $type ) {
-			if ( ! empty( $field[ $type ] ) ) {
+			if ( ! empty( $field[$type] ) ) {
 				$active = $type;
 			}
 		}
 
-		$types[ $active ]['class']  .= ' current';
-		$types[ $active ]['current'] = true;
+		$types[$active]['class']  .= ' current';
+		$types[$active]['current'] = true;
 
 		return $types;
 	}
@@ -407,8 +407,8 @@ 
 			'website' => 'url',
 			'image'   => 'url',
 		);
-		if ( isset( $type_switch[ $type ] ) ) {
-			$type = $type_switch[ $type ];
+		if ( isset( $type_switch[$type] ) ) {
+			$type = $type_switch[$type];
 		}
 
 		$pro_fields = FrmField::pro_field_selection();
@@ -532,11 +532,11 @@ 
 		// include "col" for valid html
 		$unit = trim( preg_replace( '/[0-9]+/', '', $field['size'] ) );
 
-		if ( ! isset( $calc[ $unit ] ) ) {
+		if ( ! isset( $calc[$unit] ) ) {
 			return;
 		}
 
-		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[ $unit ];
+		$size = (float) str_replace( $unit, '', $field['size'] ) / $calc[$unit];
 
 		$add_html['cols'] = 'cols="' . absint( $size ) . '"';
 	}
@@ -696,10 +696,10 @@ 
 
 			if ( is_numeric( $k ) && strpos( $v, '=' ) ) {
 				$add_html[] = $v;
-			} elseif ( ! empty( $k ) && isset( $add_html[ $k ] ) ) {
-				$add_html[ $k ] = str_replace( $k . '="', $k . '="' . $v, $add_html[ $k ] );
+			} elseif ( ! empty( $k ) && isset( $add_html[$k] ) ) {
+				$add_html[$k] = str_replace( $k . '="', $k . '="' . $v, $add_html[$k] );
 			} else {
-				$add_html[ $k ] = $k . '="' . esc_attr( $v ) . '"';
+				$add_html[$k] = $k . '="' . esc_attr( $v ) . '"';
 			}
 
 			unset( $k, $v );

classes/controllers/FrmStylesController.php

Doc Comments +3 added lines

@@ -149,6 +149,9 @@
 		return $name;
 	}
 
+	/**
+	 * @param string $version
+	 */
 	private static function get_css_version( $css_key, $version ) {
 		if ( 'formidable' == $css_key ) {
 			$this_version = get_option( 'frm_last_style_update' );

Spacing +6 added lines, -6 removed lines

@@ -234,7 +234,7 @@ 
 		$styles    = $frm_style->get_all();
 
 		if ( is_numeric( $style ) ) {
-			$style = $styles[ $style ];
+			$style = $styles[$style];
 		} elseif ( 'default' == $style ) {
 			$style = $frm_style->get_default_style( $styles );
 		}
@@ -270,8 +270,8 @@ 
 
 		$forms = FrmForm::get_published_forms();
 		foreach ( $forms as $form ) {
-			$new_style      = ( isset( $_POST['style'] ) && isset( $_POST['style'][ $form->id ] ) ) ? sanitize_text_field( wp_unslash( $_POST['style'][ $form->id ] ) ) : '';
-			$previous_style = ( isset( $_POST['prev_style'] ) && isset( $_POST['prev_style'][ $form->id ] ) ) ? sanitize_text_field( wp_unslash( $_POST['prev_style'][ $form->id ] ) ) : '';
+			$new_style      = ( isset( $_POST['style'] ) && isset( $_POST['style'][$form->id] ) ) ? sanitize_text_field( wp_unslash( $_POST['style'][$form->id] ) ) : '';
+			$previous_style = ( isset( $_POST['prev_style'] ) && isset( $_POST['prev_style'][$form->id] ) ) ? sanitize_text_field( wp_unslash( $_POST['prev_style'][$form->id] ) ) : '';
 			if ( $new_style == $previous_style ) {
 				continue;
 			}
@@ -530,8 +530,8 @@ 
 	 */
 	public static function get_style_val( $val, $form = 'default' ) {
 		$style = self::get_form_style( $form );
-		if ( $style && isset( $style->post_content[ $val ] ) ) {
-			return $style->post_content[ $val ];
+		if ( $style && isset( $style->post_content[$val] ) ) {
+			return $style->post_content[$val];
 		}
 	}
 
@@ -550,7 +550,7 @@ 
 			} elseif ( 'alt_bg_color' == $name ) {
 				$setting = 'bg_color_active';
 			}
-			$default_styles[ $name ] = $style->post_content[ $setting ];
+			$default_styles[$name] = $style->post_content[$setting];
 			unset( $name, $val );
 		}
 

classes/views/xml/xml.php

Spacing +4 added lines, -4 removed lines

@@ -7,17 +7,17 @@ 
 <?php
 foreach ( $type as $tb_type ) {
 
-	if ( ! isset( $tables[ $tb_type ] ) ) {
+	if ( ! isset( $tables[$tb_type] ) ) {
 		do_action( 'frm_xml_import_' . $tb_type, $args );
 		continue;
 	}
 
 	//no records
-	if ( ! isset( $records[ $tb_type ] ) ) {
+	if ( ! isset( $records[$tb_type] ) ) {
 		continue;
 	}
 
-	$item_ids = $records[ $tb_type ];
+	$item_ids = $records[$tb_type];
 	if ( in_array( $tb_type, array( 'styles', 'actions' ), true ) ) {
 		include( dirname( __FILE__ ) . '/posts_xml.php' );
 	} elseif ( file_exists( dirname( __FILE__ ) . '/' . $tb_type . '_xml.php' ) ) {
@@ -26,7 +26,7 @@ 
 		include( FrmProAppHelper::plugin_path() . '/classes/views/xml/' . $tb_type . '_xml.php' );
 	}
 
-	unset( $item_ids, $records[ $tb_type ], $tb_type );
+	unset( $item_ids, $records[$tb_type], $tb_type );
 }
 
 ?>

classes/models/FrmEntryValues.php

Spacing +5 added lines, -5 removed lines

@@ -136,12 +136,12 @@ 
 	 * @return array
 	 */
 	private function prepare_array_property( $index, $atts ) {
-		if ( isset( $atts[ $index ] ) && ! empty( $atts[ $index ] ) ) {
+		if ( isset( $atts[$index] ) && ! empty( $atts[$index] ) ) {
 
-			if ( is_array( $atts[ $index ] ) ) {
-				$property = $atts[ $index ];
+			if ( is_array( $atts[$index] ) ) {
+				$property = $atts[$index];
 			} else {
-				$property = explode( ',', $atts[ $index ] );
+				$property = explode( ',', $atts[$index] );
 			}
 		} else {
 			$property = array();
@@ -274,6 +274,6 @@ 
 	 * @param stdClass $field
 	 */
 	protected function add_field_values( $field ) {
-		$this->field_values[ $field->id ] = new FrmFieldValue( $field, $this->entry );
+		$this->field_values[$field->id] = new FrmFieldValue( $field, $this->entry );
 	}
 }