diff --git a/rsvp.module b/rsvp.module index b499600..7be0e51 100644 --- a/rsvp.module +++ b/rsvp.module @@ -3021,18 +3021,6 @@ function rsvp_addedit_form(&$form_state, $node = NULL, $rsvp = NULL) { else { //rsvp is set. load node for rsvp if not available. $operation = 'edit'; - - //change mode if we have a setting - if (isset($_GET['disp'])) { - if ($_GET['disp'] == 'extended') { - rsvpSetSessionVar('rsvp_addedit_extended_'.$rsvp->rid, true); - } - elseif ($_GET['disp'] == 'basic') { - rsvpSetSessionVar('rsvp_addedit_extended_'.$rsvp->rid, false); - } - } - - $extended = rsvpGetSessionVar('rsvp_addedit_extended_'.$rsvp->rid, false); //load node. if node can not be loaded, the node has been deleted. if (is_null($node)) { @@ -3040,16 +3028,10 @@ function rsvp_addedit_form(&$form_state, $node = NULL, $rsvp = NULL) { if ($node == false) $node = NULL; } - - $title = t('Invitation: %invitation', array('%invitation' => $rsvp->name)); - if ($extended == false) { - $extended_content = t('[Basic options|!extended]', array('!extended'=> l(t('Extended options'), 'rsvp/'. $rsvp->rid . '/edit', array('query' => 'disp=extended')))); - } - else { - $extended_content = t('[!basic|Extended options]', array('!basic'=> l(t('Basic options'), 'rsvp/'. $rsvp->rid . '/edit', array('query' => 'disp=basic')))); - } } + $title = t('Invitation: %invitation', array('%invitation' => $rsvp->name)); + // Set the breadcrumb trail. drupal_set_breadcrumb(array(l(t('Home'), NULL), l($node->title, 'node/'. $node->nid . '/rsvp'))); drupal_set_title($title); @@ -3086,14 +3068,6 @@ function rsvp_addedit_form(&$form_state, $node = NULL, $rsvp = NULL) { '#prefix' => '
', '#suffix' => '
', ); - - if (!is_null($extended_content)) { - $form['rsvp_addedit_form']['header']['extended_content'] = array( - '#value' => $extended_content, - '#prefix' => '
', - '#suffix' => '
', - ); - } $form['rsvp_addedit_form']['name'] = array( '#type' => 'textfield', @@ -3173,92 +3147,118 @@ function rsvp_addedit_form(&$form_state, $node = NULL, $rsvp = NULL) { $form['rsvp_addedit_form']['body']['format']['#suffix'] = ''; - if ($extended == true) { - $form['rsvp_addedit_form']['rsvp_field_6'] = array( - '#type' => 'fieldset', - '#title' => t('Invitations style options'), - '#prefix' => '
', - '#suffix' => '
', - ); - - $form['rsvp_addedit_form']['rsvp_field_6']['theme'] = rsvp_form_element_theme($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_6']['stylesheet'] = rsvp_form_element_stylesheet($rsvp->theme, $rsvp->stylesheet, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_6']['image'] = rsvp_form_element_image($rsvp->image, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_6']['backgroundimage'] = rsvp_form_element_backgroundimage($rsvp->backgroundimage, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_6']['iconset'] = rsvp_form_element_iconset($rsvp->iconset, $inside_fieldset); - - $moderator_user = user_load($rsvp->uid_moderator); - $form['rsvp_addedit_form']['moderator_name'] = array( - '#type' => 'textfield', - '#title' => t('Moderator'), - '#size' => 30, - '#maxlength' => 30, - '#autocomplete_path' => 'user/autocomplete', - '#default_value' => $moderator_user->name, - '#description' => t('Grant moderator rights to an additional user to manage the invitation in your name.'), - '#prefix' => '
', - '#suffix' => '
', - ); - - $form['rsvp_addedit_form']['rsvp_view_roles'] = rsvp_form_element_rsvp_view_roles($rsvp, $field_attr); + $form['rsvp_addedit_form']['advanced_options'] = array( + '#type' => 'fieldset', + '#title' => t('Advanced options'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); - $form['rsvp_addedit_form']['open_invitation'] = rsvp_form_element_open_invitation($rsvp, $field_attr); - $form['rsvp_addedit_form']['max_guests'] = rsvp_form_element_max_guests($rsvp, $field_attr); - - - $form['rsvp_addedit_form']['rsvp_field_5'] = array( - '#type' => 'fieldset', - '#title' => t('Notification options'), - '#prefix' => '
', - '#suffix' => '
', - ); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_7'] = array( + '#type' => 'fieldset', + '#title' => t('Invite options'), + '#prefix' => '
', + '#suffix' => '
', + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_7']['rsvp_view_roles'] = rsvp_form_element_rsvp_view_roles($rsvp, $field_attr); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_7']['open_invitation'] = rsvp_form_element_open_invitation($rsvp, $field_attr); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_7']['max_guests'] = rsvp_form_element_max_guests($rsvp, $field_attr); + + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_6'] = array( + '#type' => 'fieldset', + '#title' => t('Invitations style options'), + '#prefix' => '
', + '#suffix' => '
', + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_6']['theme'] = rsvp_form_element_theme($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_6']['stylesheet'] = rsvp_form_element_stylesheet($rsvp->theme, $rsvp->stylesheet, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_6']['image'] = rsvp_form_element_image($rsvp->image, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_6']['backgroundimage'] = rsvp_form_element_backgroundimage($rsvp->backgroundimage, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_6']['iconset'] = rsvp_form_element_iconset($rsvp->iconset, $inside_fieldset); + + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_8'] = array( + '#type' => 'fieldset', + '#title' => t('Moderator options'), + '#prefix' => '
', + '#suffix' => '
', + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $moderator_user = user_load($rsvp->uid_moderator); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_8'] ['moderator_name'] = array( + '#type' => 'textfield', + '#title' => t('Moderator'), + '#size' => 30, + '#maxlength' => 30, + '#autocomplete_path' => 'user/autocomplete', + '#default_value' => $moderator_user->name, + '#description' => t('Grant moderator rights to an additional user to manage the invitation in your name.'), + '#prefix' => '
', + '#suffix' => '
', + ); + + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_5'] = array( + '#type' => 'fieldset', + '#title' => t('Notification options'), + '#prefix' => '
', + '#suffix' => '
', + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); - $form['rsvp_addedit_form']['rsvp_field_5']['send_conf_owner'] = rsvp_form_element_send_conf_owner($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_5']['send_conf_guest'] = rsvp_form_element_send_conf_guest($rsvp, $inside_fieldset); - //$form['rsvp_field_5']['send_privatemsg'] = rsvp_form_element_send_privatemsg($rsvp); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_5']['send_conf_owner'] = rsvp_form_element_send_conf_owner($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_5']['send_conf_guest'] = rsvp_form_element_send_conf_guest($rsvp, $inside_fieldset); + //$form['rsvp_field_5']['send_privatemsg'] = rsvp_form_element_send_privatemsg($rsvp); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_2'] = array( + '#type' => 'fieldset', + '#title' => t('Guest list options'), + '#prefix' => '
', + '#suffix' => '
', + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); - $form['rsvp_addedit_form']['rsvp_field_2'] = array( - '#type' => 'fieldset', - '#title' => t('Guest list options'), - '#prefix' => '
', - '#suffix' => '
', - ); - - $form['rsvp_addedit_form']['rsvp_field_2']['response_blind'] = rsvp_form_element_response_blind($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_2']['attendees_visible'] = rsvp_form_element_attendees_visible($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_2']['response_blind_node'] = rsvp_form_element_response_blind_node($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_2']['response_view_roles'] = rsvp_form_element_response_view_roles($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_2']['text_whoiscoming'] = rsvp_form_element_text_whoiscoming($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_2']['text_yes'] = rsvp_form_element_text_yes($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_2']['text_no'] = rsvp_form_element_text_no($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_2']['text_maybe'] = rsvp_form_element_text_maybe($rsvp, $inside_fieldset); - + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_2']['response_blind'] = rsvp_form_element_response_blind($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_2']['attendees_visible'] = rsvp_form_element_attendees_visible($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_2']['response_blind_node'] = rsvp_form_element_response_blind_node($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_2']['response_view_roles'] = rsvp_form_element_response_view_roles($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_2']['text_whoiscoming'] = rsvp_form_element_text_whoiscoming($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_2']['text_yes'] = rsvp_form_element_text_yes($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_2']['text_no'] = rsvp_form_element_text_no($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_2']['text_maybe'] = rsvp_form_element_text_maybe($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_3'] = array( - '#type' => 'fieldset', - '#title' => t('Guest options'), - '#prefix' => '
', - '#suffix' => '
', - ); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_3'] = array( + '#type' => 'fieldset', + '#title' => t('Guest options'), + '#prefix' => '
', + '#suffix' => '
', + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); - $form['rsvp_addedit_form']['rsvp_field_3']['list_email'] = rsvp_form_element_list_email($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_3']['allow_invite'] = rsvp_form_element_allow_invite($rsvp, $inside_fieldset); - - $form['rsvp_addedit_form']['rsvp_field_4'] = array( - '#type' => 'fieldset', - '#title' => t('Reply options'), - '#prefix' => '
', - '#suffix' => '
', - ); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_3']['list_email'] = rsvp_form_element_list_email($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_3']['allow_invite'] = rsvp_form_element_allow_invite($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_4'] = array( + '#type' => 'fieldset', + '#title' => t('Reply options'), + '#prefix' => '
', + '#suffix' => '
', + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); - $form['rsvp_addedit_form']['rsvp_field_4']['disable_maybe'] = rsvp_form_element_disable_maybe($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_4']['reply_startdate_option'] = rsvp_form_element_reply_startdate_option($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_4']['reply_startdate'] = rsvp_form_element_reply_startdate($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_4']['reply_enddate_option'] = rsvp_form_element_reply_enddate_option($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_4']['reply_enddate'] = rsvp_form_element_reply_enddate($rsvp, $inside_fieldset); - $form['rsvp_addedit_form']['rsvp_field_4']['reply_blind_node'] = rsvp_form_element_reply_blind_node($rsvp, $inside_fieldset); - } + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_4']['disable_maybe'] = rsvp_form_element_disable_maybe($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_4']['reply_startdate_option'] = rsvp_form_element_reply_startdate_option($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_4']['reply_startdate'] = rsvp_form_element_reply_startdate($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_4']['reply_enddate_option'] = rsvp_form_element_reply_enddate_option($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_4']['reply_enddate'] = rsvp_form_element_reply_enddate($rsvp, $inside_fieldset); + $form['rsvp_addedit_form']['advanced_options']['rsvp_field_4']['reply_blind_node'] = rsvp_form_element_reply_blind_node($rsvp, $inside_fieldset); $form['rsvp_addedit_form']['rsvp'] = array('#type' => 'value', '#value' => $rsvp); $form['rsvp_addedit_form']['node'] = array('#type' => 'value', '#value' => $node); @@ -3281,7 +3281,6 @@ function rsvp_addedit_form(&$form_state, $node = NULL, $rsvp = NULL) { //$form['#validate'][] = 'rsvp_addedit_form_validate'; return $form; - } /**