Changeset 302 for form

Show
Ignore:
Timestamp:
04/24/08 14:12:19 (7 months ago)
Author:
kevin
Message:

I had accidentally turned form notification off in the last commit. This fixes that and fixes a problem with some profile choice fields not being displayed properly.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • form/form.php

    r301 r302  
    5454                $body = form_save($result->data,$_SESSION['userid'],$preview); 
    5555                $body = '<p>'.$form->response_text.'</p>'.$body; 
    56                 /*if ($form->notification) { 
     56                if ($form->notification) { 
    5757                    $msg = "Someone has submitted the form '$title'\n\n" 
    5858                            ."To export the form results or turn form notification off, please login as a site administrator and visit:\n\n" 
    …… 
    6060                    $subject = "Form submission for '$title'"; 
    6161                    notify_user($form->owner, $subject, $msg); 
    62                 }*/ 
     62                } 
    6363            } 
    6464        } 

  • form/lib.php

    r291 r302  
    501501 
    502502function form_export_profile_data($field,$user_type,$registration_field_ids=array()) { 
    503     global $data; 
     503    global $CFG, $data; 
    504504     
    505505    // ignore non-profile fields 
    506506    $obj = new stdClass; 
    507507    $obj->name = $field->title; 
    508     if ($field->original_internal_name) { 
     508    if (isset($field->original_internal_name) && $field->original_internal_name) { 
    509509        $obj->internal_name = $field->original_internal_name;        // Short / unique internal name 
    510510    } else { 
    …… 
    537537    if ($field->field_type == 'choices') { 
    538538        $options1 = array(); 
    539         $field_options = get_records_sql("SELECT * FROM {$CFG->prefix}form_fields_choice WHERE field_id = {$field->ident} AND group_id = 1 ORDER BY ident ASC"); 
     539        $query = "SELECT * FROM {$CFG->prefix}form_fields_choice WHERE field_id = {$field->ident} AND group_id = 1 ORDER BY ident ASC"; 
     540        $field_options = get_records_sql($query); 
    540541        if ($field_options) { 
    541542            foreach($field_options AS $field_option) { 
    …… 
    549550        if ($field->choice_type == 'radio_group') { 
    550551            $options2 = array(); 
    551             $field_options = get_records_sql("SELECT * FROM {$CFG->prefix}form_fields_choice WHERE field_id = {$field->ident} AND group_id = 2 ORDER BY ident ASC"); 
     552            $query = "SELECT * FROM {$CFG->prefix}form_fields_choice WHERE field_id = {$field->ident} AND group_id = 2 ORDER BY ident ASC"; 
     553            $field_options = get_records_sql($query); 
    552554            if ($field_options) { 
    553555                foreach($field_options AS $field_option) { 
    …… 
    574576            prfext_display($obj->field_type,'profile_radio_group',$field->is_keyword_tag,$field->default_value,array($options1,$options2)); 
    575577        } else {  
     578            //prfext_choices($obj->field_type,$display_type,$field->default_value,$options1); 
    576579            prfext_display($obj->field_type,$display_type,$field->is_keyword_tag,$field->default_value,$options1); 
    577580        }