improve code organization in subs_form_validate() (3aaab872) · Commits · project / subs

subs.pages.inc

+5 −4

Original line number	Diff line number	Diff line
		@@ -207,12 +207,13 @@ function subs_form($form, &$form_state, $subscription) {
		*/
		function subs_form_validate(&$form, &$form_state) {
		$subscription = $form_state['subscription'];
		$values =& $form_state['values'];

		// If we have a "uid" field submitted, the subscription is being created on
		// behalf of a user.
		if (isset($form_state['values']['uid'])) {
		if (isset($values['uid'])) {
		// Check whether we have a valid user.
		if ($user = user_load_by_name($form_state['values']['uid'])) {
		if ($user = user_load_by_name($values['uid'])) {
		// If we're creating a new subscription, check whether the current user
		// has permissions.
		if (isset($subscription->is_new)) {
		@@ -238,10 +239,10 @@ function subs_form_validate(&$form, &$form_state) {
		form_set_value($form['uid'], $user->uid, $form_state);
		}

		if (isset($form_state['values']['status'])) {
		if (isset($values['status'])) {
		// Make sure we have a valid status.
		$options = subs_status_options_list();
		if (!array_key_exists($form_state['values']['status'], $options)) {
		if (!array_key_exists($values['status'], $options)) {
		form_set_error('status', t('Invalid subscription status.'));
		}
		}