[e-ark-cvs] e-ark census_page.php, 1.21, 1.22 family_admin.php, 1.3, 1.4 parishioner_admin.php, 1.6
Brought to you by:
vboctor
Menu
▾
▴
[e-ark-cvs] e-ark census_page.php, 1.21, 1.22 family_admin.php, 1.3, 1.4 parishioner_admin.php, 1.6, 1.7
|
From: Victor B. <vb...@us...> - 2008-08-03 10:43:45
|
Update of /cvsroot/e-ark/e-ark In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv3649 Modified Files: census_page.php family_admin.php parishioner_admin.php Log Message: Misc. fixes to get the forms working with register_globals = OFF. Index: census_page.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/census_page.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** census_page.php 14 May 2006 12:43:40 -0000 1.21 --- census_page.php 3 Aug 2008 10:43:35 -0000 1.22 *************** *** 47,50 **** --- 47,53 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.22 2008/08/03 10:43:35 vboctor + # Misc. fixes to get the forms working with register_globals = OFF. + # # Revision 1.21 2006/05/14 12:43:40 vboctor # - Fixed warnings reported by newer version of PHP. *************** *** 188,193 **** $t_src_path = dirname( __FILE__ ).DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR; // Path to 'src' - $t_arguments=$option; // Get current option argument - $t_error=$error; // Get current error argument require_once( $t_src_path . 'common_inc.php' ); // Perform check and instantiate standard classes require_once( $t_src_path . 'parish_inc.php' ); // Parish related class and methods --- 191,194 ---- *************** *** 197,206 **** require_once( $t_src_path . 'database_inc.php' ); // Database Access functionality require_once( $t_src_path . 'family_member_inc.php' ); // Family Member functionality - $option=$t_arguments; // Map previous option arguement to option - $error=$t_error; // Map previous error arguement to error - - --- 198,205 ---- require_once( $t_src_path . 'database_inc.php' ); // Database Access functionality require_once( $t_src_path . 'family_member_inc.php' ); // Family Member functionality + $option = gpc_get_int( 'option', 1 ); + $error = gpc_get_string( 'error', '' ); *************** *** 244,247 **** --- 243,256 ---- case 2: + $last_name = gpc_get_string( 'last_name' ); + $street = gpc_get_string( 'street' ); + $suburb_name = gpc_get_string( 'suburb_name' ); + $home_phone = gpc_get_string( 'home_phone' ); + $home_phone2 = gpc_get_string( 'home_phone2' ); + $home_fax = gpc_get_string( 'home_fax' ); + $post_code = gpc_get_string( 'post_code' ); + $state_id = gpc_get_int( 'state_id' ); + $family_members = gpc_get_int( 'family_members' ); + $parish = gpc_get_int( 'parish' ); //#-------------------------------------------------------------------- *************** *** 287,290 **** --- 296,323 ---- case 3: + $title = gpc_get_string_array( 'title' ); + $first_name = gpc_get_string_array( 'first_name' ); + $middle_name = gpc_get_string_array( 'middle_name' ); + $last_name = gpc_get_string_array( 'last_name' ); + $email = gpc_get_string_array( 'email' ); + $occupation = gpc_get_string_array( 'occupation' ); + $mobile_phone = gpc_get_string_array( 'mobile_phone' ); + $gender = gpc_get_string_array( 'gender' ); + $dob = gpc_get_string_array( 'dob' ); + $mob = gpc_get_string_array( 'mob' ); + $yob = gpc_get_string_array( 'yob' ); + $role = gpc_get_string_array( 'role' ); + $street = gpc_get_string( 'street' ); + $suburb_name = gpc_get_string( 'suburb_name' ); + $home_phone = gpc_get_string( 'home_phone' ); + $home_phone2 = gpc_get_string( 'home_phone2' ); + $home_fax = gpc_get_string( 'home_fax' ); + $post_code = gpc_get_string( 'post_code' ); + $state_id = gpc_get_int( 'state_id' ); + $family_members = gpc_get_int( 'family_members' ); + $parish = gpc_get_int( 'parish' ); + $primary_parish_id = gpc_get_int_array( 'primary_parish_id' ); + $secondary_parish_id = gpc_get_int_array( 'secondary_parish_id' ); + $name="census_page_success"; // Add Data to Database, and show results family_add_data(&$template,&$diocese_db,$name,$last_name,$home_phone,$home_phone2,$home_fax,$street,$suburb_name,$post_code,$state_id,$parish,$title,$first_name,$middle_name,$last_name,$email,$occupation,$mobile_phone,$gender,$dob,$mob,$yob,$primary_parish_id,$secondary_parish_id,$role,$family_members); Index: parishioner_admin.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/parishioner_admin.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** parishioner_admin.php 14 May 2006 12:43:40 -0000 1.6 --- parishioner_admin.php 3 Aug 2008 10:43:37 -0000 1.7 *************** *** 23,26 **** --- 23,29 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.7 2008/08/03 10:43:37 vboctor + # Misc. fixes to get the forms working with register_globals = OFF. + # # Revision 1.6 2006/05/14 12:43:40 vboctor # - Fixed warnings reported by newer version of PHP. *************** *** 75,78 **** --- 78,83 ---- require_once( $src_path . 'gpc_api_inc.php' ); require_once( $src_path . 'access_api_inc.php' ); + + $f_option = gpc_get_string( 'option' ); //-------------------------------------------------------- *************** *** 92,112 **** // Direct Page functionality //-------------------------------------------------------- ! switch ($option) { case 'delete': ! ! if($family_id == '') // Family_id exists ! { ! trigger_error("Family_id is invalid",E_USER_ERROR); ! exit; ! } ! if($parishioner_id == '') // parishioner_id exists ! { ! trigger_error("parishioner_id is invalid",E_USER_ERROR); ! exit; ! } ! if($YES=='Y') // Check that deletion confirmed { ! family_delete_parishioner( $parishioner_id, $family_id ); // Delete parishioner } --- 97,110 ---- // Direct Page functionality //-------------------------------------------------------- ! switch ( $f_option ) { case 'delete': ! $f_family_id = gpc_get_int( 'family_id' ); ! $f_parishioner_id = gpc_get_int( 'parishioner_id' ); ! $f_yes = gpc_get_string( 'YES' ); ! ! if( $f_yes == 'Y' ) // Check that deletion confirmed { ! family_delete_parishioner( $f_parishioner_id, $f_family_id ); // Delete parishioner } *************** *** 114,123 **** // Redirect to family_view_page to display details about the added family //-------------------------------------------------------- ! $t_url = 'family_view_page.php?family_id=' . $family_id ; header_redirect( $t_url ); - break; case 'add': //#---------------------------------------------------------------------------------------------- --- 112,123 ---- // Redirect to family_view_page to display details about the added family //-------------------------------------------------------- ! $t_url = 'family_view_page.php?family_id=' . $f_family_id; header_redirect( $t_url ); break; case 'add': + $f_family_id = gpc_get_int( 'family_id' ); + $f_family_name = gpc_get_string( 'family_name' ); + $f_home_number = gpc_get_string( 'home_number' ); //#---------------------------------------------------------------------------------------------- *************** *** 148,152 **** $template->assign( 'secondary_parish_ids', $t_secondary_parish_ids ); // Assign values for 'secondary_parish_ids' $template->assign( 'secondary_parish_names', $t_secondary_parish_names ); // Assign values for 'secondary_parish_names' ! $template->assign( 'family_name', $family_name ); // Assign values for 'family_name' $template->assign( 'role_ids', $t_role_ids ); // Assign values for 'role_ids' $template->assign( 'role_names', $t_role_names ); // Assign values for 'role_names' --- 148,152 ---- $template->assign( 'secondary_parish_ids', $t_secondary_parish_ids ); // Assign values for 'secondary_parish_ids' $template->assign( 'secondary_parish_names', $t_secondary_parish_names ); // Assign values for 'secondary_parish_names' ! $template->assign( 'family_name', $f_family_name ); // Assign values for 'family_name' $template->assign( 'role_ids', $t_role_ids ); // Assign values for 'role_ids' $template->assign( 'role_names', $t_role_names ); // Assign values for 'role_names' *************** *** 169,180 **** $template->assign( 'secondary_parish_id', 'secondary_parish_id[]' ); // Assign Field Name $template->assign( 'role', 'role[]' ); // Assign Field Name ! $template->assign( 'home_number', $home_number ); // Assign Field Name //#---------------------------------------------------------------------------------------------- ! access_ensure_to_family( $family_id ); ! $family = $diocese_db->family_load( $family_id ); if ( $family === false ) { ! $template->assign( 'family_id', $family_id ); $template->run( 'family_not_found' ); exit; --- 169,181 ---- $template->assign( 'secondary_parish_id', 'secondary_parish_id[]' ); // Assign Field Name $template->assign( 'role', 'role[]' ); // Assign Field Name ! $template->assign( 'home_number', $f_home_number ); // Assign Field Name ! $template->assign( 'defaultgender', 'M' ); //#---------------------------------------------------------------------------------------------- ! access_ensure_to_family( $f_family_id ); ! $family = $diocese_db->family_load( $f_family_id ); if ( $family === false ) { ! $template->assign( 'family_id', $f_family_id ); $template->run( 'family_not_found' ); exit; *************** *** 182,186 **** $template->assign( 'family', $family); $template->assign( 'standalone', $cfg_standalone ); ! $template->assign( 'family_id', $family_id ); $template->assign( 'action_page', $_SERVER['PHP_SELF'] ); $template->run('family_add_member'); // Execute template --- 183,187 ---- $template->assign( 'family', $family); $template->assign( 'standalone', $cfg_standalone ); ! $template->assign( 'family_id', $f_family_id ); $template->assign( 'action_page', $_SERVER['PHP_SELF'] ); $template->run('family_add_member'); // Execute template *************** *** 188,224 **** case 'commit': $approved = $cfg_standalone ? 0 : 1; ! family_add_parishioner( $family_id,$yob[0], $mob[0], $dob[0], $title[0], $first_name[0], $middle_name[0], $last_name[0], $email[0], $occupation[0], $gender[0],$mobile_phone[0], $primary_parish_id[0], $secondary_parish_id[0], $role[0], $approved, $home_number); ! //-------------------------------------------------------- ! // Redirect to family_view_page to display details about the added family ! //-------------------------------------------------------- ! $t_url = 'family_view_page.php?family_id=' . $family_id ; header_redirect( $t_url ); break; case 'edit': ! if($family_id == '') // Family_id exists ! { ! trigger_error("Family_id is invalid",E_USER_ERROR); ! exit; ! } ! if($parishioner_id == '') // parishioner_id exists ! { ! trigger_error("parishioner_id is invalid",E_USER_ERROR); ! exit; ! } access_ensure_not_standalone(); - $parishioner_id = gpc_get_int( 'parishioner_id', 0 ); - $parishioner = FALSE; // if valid id, then load info from database ! if ( Parishioner::is_valid_id( $parishioner_id ) && ( $parishioner_id != 0 ) ) { $diocese_db->connect(); ! $parishioner = $diocese_db->parishioner_load( $parishioner_id ); } --- 189,233 ---- case 'commit': + $f_family_id = gpc_get_int( 'family_id' ); + $f_dob = gpc_get_string_array( 'dob' ); + $f_mob = gpc_get_string_array( 'mob' ); + $f_yob = gpc_get_string_array( 'yob' ); + $f_title = gpc_get_string_array( 'title' ); + $f_first_name = gpc_get_string_array( 'first_name' ); + $f_middle_name = gpc_get_string_array( 'middle_name' ); + $f_last_name = gpc_get_string_array( 'last_name' ); + $f_email = gpc_get_string_array( 'email' ); + $f_occupation = gpc_get_string_array( 'occupation' ); + $f_gender = gpc_get_string_array( 'gender' ); + $f_mobile_phone = gpc_get_string_array( 'mobile_phone' ); + $f_primary_parish_id = gpc_get_int_array( 'primary_parish_id' ); + $f_secondary_parish_id = gpc_get_int_array( 'secondary_parish_id' ); + $f_role = gpc_get_string_array( 'role' ); + $f_home_number = gpc_get_string( 'home_number' ); + $approved = $cfg_standalone ? 0 : 1; ! family_add_parishioner( $f_family_id, $f_yob[0], $f_mob[0], $f_dob[0], $f_title[0], $f_first_name[0], $f_middle_name[0], $f_last_name[0], $f_email[0], $f_occupation[0], ! $f_gender[0], $f_mobile_phone[0], $f_primary_parish_id[0], $f_secondary_parish_id[0], $f_role[0], $approved, $f_home_number); ! //-------------------------------------------------------- ! // Redirect to family_view_page to display details about the added family ! //-------------------------------------------------------- ! $t_url = 'family_view_page.php?family_id=' . $f_family_id; header_redirect( $t_url ); break; case 'edit': ! $f_family_id = gpc_get_int( 'family_id' ); ! $f_parishioner_id = gpc_get_int( 'parishioner_id' ); access_ensure_not_standalone(); $parishioner = FALSE; // if valid id, then load info from database ! if ( Parishioner::is_valid_id( $f_parishioner_id ) && ( $f_parishioner_id != 0 ) ) { $diocese_db->connect(); ! $parishioner = $diocese_db->parishioner_load( $f_parishioner_id ); } *************** *** 226,230 **** if ( $parishioner === FALSE ) # if parishioner not found { ! $template->assign( 'parishioner_id', $parishioner_id ); $template->run( 'parishioner_not_found' ); exit; --- 235,239 ---- if ( $parishioner === FALSE ) # if parishioner not found { ! $template->assign( 'parishioner_id', $f_sparishioner_id ); $template->run( 'parishioner_not_found' ); exit; *************** *** 279,284 **** $template->assign( 'primary_parish_id', 'primary_parish_id[]' ); // Assign Field Name $template->assign( 'secondary_parish_id', 'secondary_parish_id[]' ); // Assign Field Name ! $template->assign( 'family_id', $family_id ); // Assign Field Name ! $template->assign( 'parishioner_id', $parishioner_id ); //#---------------------------------------------------------------------------------------------- --- 288,293 ---- $template->assign( 'primary_parish_id', 'primary_parish_id[]' ); // Assign Field Name $template->assign( 'secondary_parish_id', 'secondary_parish_id[]' ); // Assign Field Name ! $template->assign( 'family_id', $f_family_id ); // Assign Field Name ! $template->assign( 'parishioner_id', $f_parishioner_id ); //#---------------------------------------------------------------------------------------------- *************** *** 289,294 **** case 'update': ! ! family_update_parishioner( $family_id,$parishioner_id,$title[0],$first_name[0],$middle_name[0],$last_name[0],$dodec,$modec,$yodec,$dob[0],$mob[0],$yob[0],$mobile_phone[0],$day_time_phone,$email[0],$occupation[0],$doannul,$moannul,$yoannul,$primary_parish_id[0],$secondary_parish_id[0],$gender[0]); //-------------------------------------------------------- --- 298,327 ---- case 'update': ! $f_family_id = gpc_get_int( 'family_id' ); ! $f_parishioner_id = gpc_get_int( 'parishioner_id' ); ! $f_title = gpc_get_string_array( 'title' ); ! $f_first_name = gpc_get_string_array( 'first_name' ); ! $f_middle_name = gpc_get_string_array( 'middle_name' ); ! $f_last_name = gpc_get_string_array( 'last_name' ); ! $f_dodec = gpc_get_string( 'dodec' ); ! $f_modec = gpc_get_string( 'modec' ); ! $f_yodec = gpc_get_string( 'yodec' ); ! $f_dob = gpc_get_string_array( 'dob' ); ! $f_mob = gpc_get_string_array( 'mob' ); ! $f_yob = gpc_get_string_array( 'yob' ); ! $f_mobile_phone = gpc_get_string_array( 'mobile_phone' ); ! $f_day_time_phone = gpc_get_string( 'day_time_phone' ); ! $f_email = gpc_get_string_array( 'email' ); ! $f_occupation = gpc_get_string_array( 'occupation' ); ! $f_doannul = gpc_get_string( 'doannul' ); ! $f_moannul = gpc_get_string( 'moannul' ); ! $f_yoannul = gpc_get_string( 'yoannul' ); ! $f_primary_parish_id = gpc_get_int_array( 'primary_parish_id' ); ! $f_secondary_parish_id = gpc_get_int_array( 'secondary_parish_id' ); ! $f_gender = gpc_get_string_array( 'gender' ); ! ! family_update_parishioner( $f_family_id, $f_parishioner_id, $f_title[0], $f_first_name[0], $f_middle_name[0], $f_last_name[0], ! $f_dodec, $f_modec, $f_yodec, $f_dob[0], $f_mob[0], $f_yob[0], $f_mobile_phone[0], $f_day_time_phone, $f_email[0], $f_occupation[0], ! $f_doannul, $f_moannul,$f_yoannul, $f_primary_parish_id[0], $f_secondary_parish_id[0], $f_gender[0] ); //-------------------------------------------------------- *************** *** 296,300 **** //-------------------------------------------------------- ! $t_url = 'parishioner_view_page.php?parishioner_id=' . $parishioner_id ; header_redirect( $t_url ); break; --- 329,333 ---- //-------------------------------------------------------- ! $t_url = 'parishioner_view_page.php?parishioner_id=' . $f_parishioner_id; header_redirect( $t_url ); break; Index: family_admin.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/family_admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** family_admin.php 14 May 2006 12:43:40 -0000 1.3 --- family_admin.php 3 Aug 2008 10:43:36 -0000 1.4 *************** *** 23,26 **** --- 23,29 ---- # ----------------------------------------------------------------------- # $Log$ + # Revision 1.4 2008/08/03 10:43:36 vboctor + # Misc. fixes to get the forms working with register_globals = OFF. + # # Revision 1.3 2006/05/14 12:43:40 vboctor # - Fixed warnings reported by newer version of PHP. *************** *** 76,79 **** --- 79,85 ---- require_once( $src_path . 'gpc_api_inc.php' ); require_once( $src_path . 'access_api_inc.php' ); + + $f_option = gpc_get_string( 'option' ); + $f_family_id = gpc_get_int( 'family_id' ); //-------------------------------------------------------- *************** *** 93,107 **** // Direct Page functionality //-------------------------------------------------------- ! switch ($option) { case 'edit': ! access_ensure_to_family( $family_id ); ! $family = $diocese_db->family_load( $family_id ); if ( $family === false ) { ! $template->assign( 'family_id', $family_id ); $template->run( 'family_not_found' ); exit; --- 99,113 ---- // Direct Page functionality //-------------------------------------------------------- ! switch ( $f_option ) { case 'edit': ! access_ensure_to_family( $f_family_id ); ! $family = $diocese_db->family_load( $f_family_id ); if ( $family === false ) { ! $template->assign( 'family_id', $f_family_id ); $template->run( 'family_not_found' ); exit; *************** *** 143,151 **** $template->assign( 'parish_ids', $t_parish_ids ); // Assign values for 'parish_ids' $template->assign( 'parish_names', $t_parish_names ); // Assign values for 'parish_names' ! $template->assign( 'family_id', $family_id); // Assign value for family_id //#---------------------------------------------------------------------------------------------- $template->assign( 'standalone', $cfg_standalone ); ! $template->assign( 'family_id', $family_id ); $template->assign( 'action_page', $_SERVER['PHP_SELF'] ); $template->run('family_edit'); // Execute template --- 149,157 ---- $template->assign( 'parish_ids', $t_parish_ids ); // Assign values for 'parish_ids' $template->assign( 'parish_names', $t_parish_names ); // Assign values for 'parish_names' ! $template->assign( 'family_id', $f_family_id); // Assign value for family_id //#---------------------------------------------------------------------------------------------- $template->assign( 'standalone', $cfg_standalone ); ! $template->assign( 'family_id', $f_family_id ); $template->assign( 'action_page', $_SERVER['PHP_SELF'] ); $template->run('family_edit'); // Execute template *************** *** 153,169 **** case 'commit': ! $state_initials = state_get_field( $state_id, 'initials' ); ! family_update( $family_id, $last_name, $home_phone, $home_phone2, $home_fax, $parish, ! $street, $suburb_name, $state_initials, $post_code ); //-------------------------------------------------------- // Redirect to family_view_page to display details about the added family //-------------------------------------------------------- ! $t_url = 'family_view_page.php?family_id=' . $family_id ; header_redirect( $t_url ); break; default: ! echo "$option"; trigger_error("Illegal Action",E_USER_ERROR); exit; --- 159,185 ---- case 'commit': ! $f_state_id = gpc_get_int( 'state_id' ); ! $f_last_name = gpc_get_string( 'last_name' ); ! $f_home_phone = gpc_get_string( 'home_phone' ); ! $f_home_phone2 = gpc_get_string( 'home_phone2' ); ! $f_home_fax = gpc_get_string( 'home_fax' ); ! $f_parish_id = gpc_get_int( 'parish' ); ! $f_street = gpc_get_string( 'street' ); ! $f_suburb_name = gpc_get_string( 'suburb_name' ); ! $f_post_code = gpc_get_int( 'post_code' ); ! ! $state_initials = state_get_field( $f_state_id, 'initials' ); ! family_update( $f_family_id, $f_last_name, $f_home_phone, $f_home_phone2, $f_home_fax, $f_parish_id, ! $f_street, $f_suburb_name, $state_initials, $f_post_code ); //-------------------------------------------------------- // Redirect to family_view_page to display details about the added family //-------------------------------------------------------- ! $t_url = 'family_view_page.php?family_id=' . $f_family_id ; header_redirect( $t_url ); break; default: ! echo $f_option; trigger_error("Illegal Action",E_USER_ERROR); exit; |