← All changes | classes/models/FrmForm.php +13 -40 6.5.2 → 6.0 View file →

		@@ -6,9 +6,9 @@
6	6	class FrmForm {
7	7
8	8	/**
9	9	* @param array $values
10		- * @return int|bool id on success or false on failure.
	10	+ * @return int|boolean id on success or false on failure
11	11	*/
12	12	public static function create( $values ) {
13	13	global $wpdb;
14	14
		@@ -284,8 +284,13 @@
284	284	$options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' );
285	285	$options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' );
286	286	$options['submit_html'] = ( isset( $values['options']['submit_html'] ) && '' !== $values['options']['submit_html'] ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' );
287	287
	288	+ if ( ! empty( $options['success_url'] ) && ! empty( $args['form_id'] ) ) {
	289	+ $options['success_url'] = FrmFormsHelper::maybe_add_sanitize_url_attr( $options['success_url'], (int) $args['form_id'] );
	290	+ $values['options']['success_url'] = $options['success_url'];
	291	+ }
	292	+
288	293	/**
289	294	* Allows modifying form options before updating or creating.
290	295	*
291	296	* @since 5.4 Added the third param.
		@@ -365,18 +370,8 @@
365	370	'field_options' => $field->field_options,
366	371	'default_value' => isset( $values[ 'default_value_' . $field_id ] ) ? FrmAppHelper::maybe_json_encode( $values[ 'default_value_' . $field_id ] ) : '',
367	372	);
368	373
369		- if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options'][ 'options_' . $field_id ] ) && is_array( $values['field_options'][ 'options_' . $field_id ] ) ) {
370		- foreach ( $values['field_options'][ 'options_' . $field_id ] as $option_key => $option ) {
371		- if ( is_array( $option ) ) {
372		- foreach ( $option as $key => $item ) {
373		- $values['field_options'][ 'options_' . $field_id ][ $option_key ][ $key ] = FrmAppHelper::kses( $item, 'all' );
374		- }
375		- }
376		- }
377		- }
378		-
379	374	self::prepare_field_update_values( $field, $values, $new_field );
380	375
381	376	FrmField::update( $field_id, $new_field );
382	377
		@@ -687,12 +682,10 @@
687	682	}
688	683
689	684	$query_key = is_numeric( $id ) ? 'id' : 'form_key';
690	685	$r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
	686	+ $r = stripslashes( $r );
691	687
692		- // An empty form name can result in a null value.
693		- $r = is_null( $r ) ? '' : stripslashes( $r );
694		-
695	688	return $r;
696	689	}
697	690
698	691	/**
		@@ -814,13 +807,9 @@
814	807	/**
815	808	* Get all published forms
816	809	*
817	810	* @since 2.0
818		- *
819		- * @param array $query
820		- * @param int $limit
821		- * @param string $inc_children
822		- * @return array|object of forms A single form object would be passed if $limit was set to 1.
	811	+ * @return array of forms
823	812	*/
824	813	public static function get_published_forms( $query = array(), $limit = 999, $inc_children = 'exclude' ) {
825	814	$query['is_template'] = 0;
826	815	$query['status'] = array( null, '', 'published' );
		@@ -1120,39 +1109,23 @@
1120	1109	return admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id );
1121	1110	}
1122	1111
1123	1112	/**
1124		- * Check if the "Submit this form with AJAX" setting is toggled on.
1125		- *
1126		- * @since 6.2
1127		- *
1128		- * @param stdClass $form
1129		- * @return bool
1130		- */
1131		- public static function is_ajax_on( $form ) {
1132		- return ! empty( $form->options['ajax_submit'] );
1133		- }
1134		-
1135		- /**
1136		- * @deprecated 2.03.05 This is still referenced in a few add ons (API, locations).
	1113	+ * @deprecated 3.0
1137	1114	* @codeCoverageIgnore
1138	1115	*
1139	1116	* @param string $key
	1117	+ *
1140	1118	* @return int form id
1141	1119	*/
1142	1120	public static function getIdByKey( $key ) {
1143		- _deprecated_function( __FUNCTION__, '2.03.05', 'FrmForm::get_id_by_key' );
1144		- return self::get_id_by_key( $key );
	1121	+ return FrmFormDeprecated::getIdByKey( $key );
1145	1122	}
1146	1123
1147	1124	/**
1148		- * @deprecated 2.03.05 This is still referenced in the API add on as of v1.13.
	1125	+ * @deprecated 3.0
1149	1126	* @codeCoverageIgnore
1150		- *
1151		- * @param string|int $id
1152		- * @return string
1153	1127	*/
1154	1128	public static function getKeyById( $id ) {
1155		- _deprecated_function( __FUNCTION__, '2.03.05', 'FrmForm::get_key_by_id' );
1156		- return self::get_key_by_id( $id );
	1129	+ return FrmFormDeprecated::getKeyById( $id );
1157	1130	}
1158	1131	}