e-ark-cvs Mailing List for eArk
Brought to you by:
vboctor
Menu
▾
▴
e-ark-cvs — List for notifications for CVS commits.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(87) |
Sep
(54) |
Oct
(3) |
Nov
(3) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(7) |
Feb
(13) |
Mar
(109) |
Apr
(153) |
May
(12) |
Jun
|
Jul
|
Aug
(11) |
Sep
(3) |
Oct
(5) |
Nov
(18) |
Dec
|
| 2005 |
Jan
|
Feb
(7) |
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
(37) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(47) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Victor B. <vb...@us...> - 2008-09-29 06:59:55
|
Update of /cvsroot/e-ark/e-ark In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29285 Modified Files: alpha_parishioners_report_page.php voters_report_page.php Log Message: Some parishioners not showing on alphabetical / voters reports due to date_of_decease being set to '00-00-0000' rather than '??-??-????'. Index: voters_report_page.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/voters_report_page.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** voters_report_page.php 1 Aug 2008 01:13:52 -0000 1.4 --- voters_report_page.php 29 Sep 2008 06:59:48 -0000 1.5 *************** *** 37,41 **** $query = "SELECT p.parishioner_id as parishioner_id, fm.member_id as family_member_id, f.family_id as family_id, s.post_code as post_code FROM $t_core_parishioners p, $t_core_families f, $t_core_family_members fm, $t_core_addresses as a, $t_core_suburbs as s ! WHERE ( p.approved = 1 ) AND ( p.date_of_decease = '????-??-??' ) AND ( fm.parishioner_id = p.parishioner_id ) AND ( f.family_id = fm.family_id ) AND ( f.address_id = a.address_id ) AND ( s.suburb_id = a.suburb_id )"; --- 37,41 ---- $query = "SELECT p.parishioner_id as parishioner_id, fm.member_id as family_member_id, f.family_id as family_id, s.post_code as post_code FROM $t_core_parishioners p, $t_core_families f, $t_core_family_members fm, $t_core_addresses as a, $t_core_suburbs as s ! WHERE ( p.approved = 1 ) AND ( ( p.date_of_decease = '0000-00-00' ) OR ( p.date_of_decease = '????-??-??' ) ) AND ( fm.parishioner_id = p.parishioner_id ) AND ( f.family_id = fm.family_id ) AND ( f.address_id = a.address_id ) AND ( s.suburb_id = a.suburb_id )"; Index: alpha_parishioners_report_page.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/alpha_parishioners_report_page.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** alpha_parishioners_report_page.php 14 May 2006 12:43:40 -0000 1.4 --- alpha_parishioners_report_page.php 29 Sep 2008 06:59:47 -0000 1.5 *************** *** 36,40 **** $query = "SELECT p.parishioner_id as parishioner_id, fm.member_id as family_member_id, f.family_id as family_id FROM $t_core_parishioners p, $t_core_families f, $t_core_family_members fm ! WHERE ( p.approved = 1 ) AND ( p.date_of_decease = '????-??-??' ) AND ( fm.parishioner_id = p.parishioner_id ) AND ( f.family_id = fm.family_id )"; --- 36,40 ---- $query = "SELECT p.parishioner_id as parishioner_id, fm.member_id as family_member_id, f.family_id as family_id FROM $t_core_parishioners p, $t_core_families f, $t_core_family_members fm ! WHERE ( p.approved = 1 ) AND ( ( p.date_of_decease = '????-??-??' ) || ( p.date_of_decease = '0000-00-00' ) ) AND ( fm.parishioner_id = p.parishioner_id ) AND ( f.family_id = fm.family_id )"; |
|
From: Victor B. <vb...@us...> - 2008-08-09 13:02:39
|
Update of /cvsroot/e-ark/e-ark/src In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29824 Modified Files: date_inc.php Log Message: Reverted date to use ??? for nulls rather than 000. Index: date_inc.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/src/date_inc.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** date_inc.php 3 Aug 2008 10:43:39 -0000 1.6 --- date_inc.php 9 Aug 2008 13:02:34 -0000 1.7 *************** *** 227,231 **** { if ( $this->_day === null ) ! return '00'; return sprintf( '%02d', $this->_day ); --- 227,231 ---- { if ( $this->_day === null ) ! return '??'; return sprintf( '%02d', $this->_day ); *************** *** 235,239 **** { if ( $this->_month === null ) ! return '00'; return sprintf( '%02d', $this->_month ); --- 235,239 ---- { if ( $this->_month === null ) ! return '??'; return sprintf( '%02d', $this->_month ); *************** *** 243,247 **** { if ( $this->_month === null || $this->_month == 0 ) ! return '000'; $months = array( 'JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', --- 243,247 ---- { if ( $this->_month === null || $this->_month == 0 ) ! return '???'; $months = array( 'JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', *************** *** 254,258 **** { if ( $this->_year === null ) ! return '0000'; return sprintf( '%04d', $this->_year ); --- 254,258 ---- { if ( $this->_year === null ) ! return '????'; return sprintf( '%04d', $this->_year ); |
|
From: Victor B. <vb...@us...> - 2008-08-09 13:01:52
|
Update of /cvsroot/e-ark/e-ark/src In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv29347 Modified Files: database_inc.php family_inc.php Log Message: Fixes for some PHP5 warnings. Index: database_inc.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/src/database_inc.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** database_inc.php 14 May 2006 12:43:40 -0000 1.25 --- database_inc.php 9 Aug 2008 13:01:47 -0000 1.26 *************** *** 173,177 **** { $fields = $rs->fields; ! $family = &new Family; $family->set_id( $fields['family_id'] ); $family->set_last_name( $fields['last_name'] ); --- 173,177 ---- { $fields = $rs->fields; ! $family = new Family; $family->set_id( $fields['family_id'] ); $family->set_last_name( $fields['last_name'] ); *************** *** 298,302 **** { $fields = $rs->fields; ! $family_member = &new FamilyMember; $family_member->set_id( $fields['member_id'] ); // $family_member->set_family_id( $fields['family_id'] ); --- 298,302 ---- { $fields = $rs->fields; ! $family_member = new FamilyMember; $family_member->set_id( $fields['member_id'] ); // $family_member->set_family_id( $fields['family_id'] ); *************** *** 372,376 **** { $fields = $rs->fields; ! $parishioner = &new Parishioner; $parishioner->set_id( $fields['parishioner_id'] ); $parishioner->set_title( $fields['title'] ); --- 372,376 ---- { $fields = $rs->fields; ! $parishioner = new Parishioner; $parishioner->set_id( $fields['parishioner_id'] ); $parishioner->set_title( $fields['title'] ); *************** *** 505,509 **** { $fields = $rs->fields; ! $priest = &new Priest; $priest->set_id( $fields['priest_id'] ); $priest->set_parishioner_id( $fields['parishioner_id'] ); --- 505,509 ---- { $fields = $rs->fields; ! $priest = new Priest; $priest->set_id( $fields['priest_id'] ); $priest->set_parishioner_id( $fields['parishioner_id'] ); *************** *** 568,572 **** return $this->_addresses_cache[$db_address_id]; ! $address = &new Address; $address->set_id( $p_address_id ); --- 568,572 ---- return $this->_addresses_cache[$db_address_id]; ! $address = new Address; $address->set_id( $p_address_id ); *************** *** 689,693 **** { $fields = $rs->fields; ! $parish = &new Parish; $parish->set_id( $fields['parish_id'] ); $parish->set_name( $fields['name'] ); --- 689,693 ---- { $fields = $rs->fields; ! $parish = new Parish; $parish->set_id( $fields['parish_id'] ); $parish->set_name( $fields['name'] ); Index: family_inc.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/src/family_inc.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** family_inc.php 14 May 2006 12:43:40 -0000 1.28 --- family_inc.php 9 Aug 2008 13:01:47 -0000 1.29 *************** *** 546,550 **** ! $birthday = &new Date; $birthday->Set( $p_yob, $p_mob, $p_dob ); --- 546,550 ---- ! $birthday = new Date; $birthday->Set( $p_yob, $p_mob, $p_dob ); *************** *** 629,637 **** //# Create Dates //#---------------------------------------------------------------------------------------------- ! $decease = &new Date; $decease->Set( $p_yodec, $p_modec, $p_dodec); ! $annul = &new Date; $annul->Set( $p_yoannul, $p_moannul, $p_doannul); ! $birthday = &new Date; $birthday->Set( $p_yob, $p_mob, $p_dob ); --- 629,637 ---- //# Create Dates //#---------------------------------------------------------------------------------------------- ! $decease = new Date; $decease->Set( $p_yodec, $p_modec, $p_dodec); ! $annul = new Date; $annul->Set( $p_yoannul, $p_moannul, $p_doannul); ! $birthday = new Date; $birthday->Set( $p_yob, $p_mob, $p_dob ); |
|
From: Victor B. <vb...@us...> - 2008-08-09 11:57:19
|
Update of /cvsroot/e-ark/e-ark In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28707 Modified Files: suburbs_report_page.php visitation_report_page.php Log Message: Fixing errors in reports. Index: visitation_report_page.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/visitation_report_page.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** visitation_report_page.php 14 May 2006 12:43:40 -0000 1.4 --- visitation_report_page.php 9 Aug 2008 11:57:15 -0000 1.5 *************** *** 46,50 **** $t_result = $diocese_db->execute( $query ); ! $t_families = array(); while ( !$t_result->EOF ) --- 46,51 ---- $t_result = $diocese_db->execute( $query ); ! $t_families = array(); ! $t_families_details = array(); while ( !$t_result->EOF ) Index: suburbs_report_page.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/suburbs_report_page.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** suburbs_report_page.php 14 May 2006 12:43:40 -0000 1.4 --- suburbs_report_page.php 9 Aug 2008 11:57:15 -0000 1.5 *************** *** 266,270 **** } // end while ! $suburbs = mu_sort( $suburbs, 'name,state,post_code', ORDER_ASC ); # Execute the template --- 266,272 ---- } // end while ! if ( count( $suburbs ) > 0 ) { ! $suburbs = mu_sort( $suburbs, 'name,state,post_code', ORDER_ASC ); ! } # Execute the template |
|
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; |
|
From: Victor B. <vb...@us...> - 2008-08-03 10:43:44
|
Update of /cvsroot/e-ark/e-ark/src In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv3649/src Modified Files: date_inc.php Log Message: Misc. fixes to get the forms working with register_globals = OFF. Index: date_inc.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/src/date_inc.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** date_inc.php 17 Sep 2005 13:08:26 -0000 1.5 --- date_inc.php 3 Aug 2008 10:43:39 -0000 1.6 *************** *** 227,231 **** { if ( $this->_day === null ) ! return '??'; return sprintf( '%02d', $this->_day ); --- 227,231 ---- { if ( $this->_day === null ) ! return '00'; return sprintf( '%02d', $this->_day ); *************** *** 235,239 **** { if ( $this->_month === null ) ! return '??'; return sprintf( '%02d', $this->_month ); --- 235,239 ---- { if ( $this->_month === null ) ! return '00'; return sprintf( '%02d', $this->_month ); *************** *** 242,247 **** function MonthToMMM() { ! if ( $this->_month === null ) ! return '???'; $months = array( 'JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', --- 242,247 ---- function MonthToMMM() { ! if ( $this->_month === null || $this->_month == 0 ) ! return '000'; $months = array( 'JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', *************** *** 254,258 **** { if ( $this->_year === null ) ! return '????'; return sprintf( '%04d', $this->_year ); --- 254,258 ---- { if ( $this->_year === null ) ! return '0000'; return sprintf( '%04d', $this->_year ); *************** *** 268,271 **** --- 268,274 ---- return null; + if ( (int)$p_str == 0 ) + return null; + return (integer) $p_str; } |
|
From: Victor B. <vb...@us...> - 2008-08-01 01:15:16
|
Update of /cvsroot/e-ark/e-ark/src In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv31983 Modified Files: error_inc.php Log Message: Changed the error handling to "halt" for all types of errors. This is to force the display of the stack trace on errors. Index: error_inc.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/src/error_inc.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** error_inc.php 14 May 2006 12:43:40 -0000 1.4 --- error_inc.php 1 Aug 2008 01:15:12 -0000 1.5 *************** *** 37,46 **** $t_error_type = 'SYSTEM WARNING'; $t_error_description = $p_error; ! $t_method = 'inline'; break; case E_NOTICE: $t_error_type = 'SYSTEM NOTICE'; $t_error_description = $p_error; ! $t_method = 'inline'; break; case E_USER_ERROR: --- 37,46 ---- $t_error_type = 'SYSTEM WARNING'; $t_error_description = $p_error; ! $t_method = 'halt'; break; case E_NOTICE: $t_error_type = 'SYSTEM NOTICE'; $t_error_description = $p_error; ! $t_method = 'halt'; break; case E_USER_ERROR: *************** *** 52,56 **** $t_error_type = "APPLICATION WARNING"; $t_error_description = $p_error; ! $t_method = 'inline'; break; case E_USER_NOTICE: --- 52,56 ---- $t_error_type = "APPLICATION WARNING"; $t_error_description = $p_error; ! $t_method = 'halt'; break; case E_USER_NOTICE: *************** *** 58,62 **** $t_error_type = 'DEBUG'; $t_error_description = $p_error; ! $t_method = 'inline'; break; default: --- 58,62 ---- $t_error_type = 'DEBUG'; $t_error_description = $p_error; ! $t_method = 'halt'; break; default: |
|
From: Victor B. <vb...@us...> - 2008-08-01 01:13:58
|
Update of /cvsroot/e-ark/e-ark/templates In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv31113/templates Modified Files: voter_parishioner_report_print.tpl Log Message: Fixed a system warning in voters report + updated cut off date. Index: voter_parishioner_report_print.tpl =================================================================== RCS file: /cvsroot/e-ark/e-ark/templates/voter_parishioner_report_print.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** voter_parishioner_report_print.tpl 19 Sep 2005 11:46:51 -0000 1.2 --- voter_parishioner_report_print.tpl 1 Aug 2008 01:13:51 -0000 1.3 *************** *** 14,18 **** {/if} Election of Board Of Deacons (Church Committee)<br /> ! Registered members who are entitled to vote on 06-NOV-05 </h2> --- 14,18 ---- {/if} Election of Board Of Deacons (Church Committee)<br /> ! Registered members who are entitled to vote on 02-NOV-08 </h2> |
|
From: Victor B. <vb...@us...> - 2008-08-01 01:13:58
|
Update of /cvsroot/e-ark/e-ark In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv31113 Modified Files: voters_report_page.php Log Message: Fixed a system warning in voters report + updated cut off date. Index: voters_report_page.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/voters_report_page.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** voters_report_page.php 14 May 2006 12:43:40 -0000 1.3 --- voters_report_page.php 1 Aug 2008 01:13:52 -0000 1.4 *************** *** 4,8 **** # eArk # ! # Copyright (C) 2003-2004 e-Ark Team - Diocese of Sydney and Affiliated Regions # # This program is distributed under the terms and conditions of the GPL --- 4,8 ---- # eArk # ! # Copyright (C) 2003-2008 e-Ark Team - Diocese of Sydney and Affiliated Regions # # This program is distributed under the terms and conditions of the GPL *************** *** 29,33 **** $diocese_db->connect(); ! $t_core_parishioners = table( 'core_parishioners' ); $t_core_families = table( 'core_families' ); $t_core_family_members = table( 'core_family_members' ); --- 29,33 ---- $diocese_db->connect(); ! $t_core_parishioners = table( 'core_parishioners' ); $t_core_families = table( 'core_families' ); $t_core_family_members = table( 'core_family_members' ); *************** *** 40,47 **** ( fm.parishioner_id = p.parishioner_id ) AND ( f.family_id = fm.family_id ) AND ( f.address_id = a.address_id ) AND ( s.suburb_id = a.suburb_id )"; ! if ( access_limited_to_one_parish() ) ! $f_parish_id = access_get_parish_id(); ! else if ( $f_parish_id != 0 ) { $query .= " AND ( p.primary_parish_id = " . (int)$f_parish_id . ')'; --- 40,47 ---- ( fm.parishioner_id = p.parishioner_id ) AND ( f.family_id = fm.family_id ) AND ( f.address_id = a.address_id ) AND ( s.suburb_id = a.suburb_id )"; ! if ( access_limited_to_one_parish() ) ! $f_parish_id = access_get_parish_id(); ! if ( $f_parish_id != 0 ) { $query .= " AND ( p.primary_parish_id = " . (int)$f_parish_id . ')'; *************** *** 66,70 **** $t_result = $diocese_db->execute( $query ); ! $t_parishioners_details = array(); $t_last_parishioner = null; --- 66,70 ---- $t_result = $diocese_db->execute( $query ); ! $t_parishioners_details = array(); $t_last_parishioner = null; *************** *** 75,100 **** $t_parishioner = $diocese_db->parishioner_load( $t_parishioner_id ); ! $t_age = $t_parishioner->get_age( '2005-11-06' ); if ( ( $t_age !== false ) && ( $t_age >= 18 ) ) { ! $t_parishioner_details = array(); ! $t_parishioner_details["Id"] = $t_parishioner->get_id(); ! $t_parishioner_details["Surname"] = $t_parishioner->get_last_name(); ! $t_parishioner_details["FirstName"] = $t_parishioner->get_first_name(); ! $t_post_code = $t_result->fields['post_code']; ! if ( is_numeric( $t_post_code ) && strlen( $t_post_code ) == 4 ) ! $t_parishioner_details["PostCode"] = $t_result->fields['post_code']; # $t_address->get_post_code(); ! else ! $t_parishioner_details["PostCode"] = '????'; ! $t_parishioner_details["Age"] = $t_age; ! # filter out the duplicates ! if ( ( $t_last_parishioner === null ) || ! ( $t_last_parishioner['Surname'] != $t_parishioner_details['Surname'] ) || ! ( $t_last_parishioner['FirstName'] != $t_parishioner_details['FirstName']) || ! ( $t_last_parishioner['PostCode'] != $t_parishioner_details['PostCode'] ) ) $t_parishioners_details[] = $t_parishioner_details; --- 75,100 ---- $t_parishioner = $diocese_db->parishioner_load( $t_parishioner_id ); ! $t_age = $t_parishioner->get_age( '2008-11-02' ); if ( ( $t_age !== false ) && ( $t_age >= 18 ) ) { ! $t_parishioner_details = array(); ! $t_parishioner_details["Id"] = $t_parishioner->get_id(); ! $t_parishioner_details["Surname"] = $t_parishioner->get_last_name(); ! $t_parishioner_details["FirstName"] = $t_parishioner->get_first_name(); ! $t_post_code = $t_result->fields['post_code']; ! if ( is_numeric( $t_post_code ) && strlen( $t_post_code ) == 4 ) ! $t_parishioner_details["PostCode"] = $t_result->fields['post_code']; # $t_address->get_post_code(); ! else ! $t_parishioner_details["PostCode"] = '????'; ! $t_parishioner_details["Age"] = $t_age; ! # filter out the duplicates ! if ( ( $t_last_parishioner === null ) || ! ( $t_last_parishioner['Surname'] != $t_parishioner_details['Surname'] ) || ! ( $t_last_parishioner['FirstName'] != $t_parishioner_details['FirstName']) || ! ( $t_last_parishioner['PostCode'] != $t_parishioner_details['PostCode'] ) ) $t_parishioners_details[] = $t_parishioner_details; |
|
From: Victor B. <vb...@us...> - 2008-08-01 01:08:24
|
Update of /cvsroot/e-ark/e-ark/src In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/src Modified Files: config_defaults_inc.php Log Message: Upgrading ADODB from 4.80 to 4.99. Index: config_defaults_inc.php =================================================================== RCS file: /cvsroot/e-ark/e-ark/src/config_defaults_inc.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** config_defaults_inc.php 14 May 2006 12:47:14 -0000 1.20 --- config_defaults_inc.php 1 Aug 2008 01:03:50 -0000 1.21 *************** *** 64,68 **** //---------------------------------------------------------------------- ! $cfg_adodb_path = $cfg_packages_path . 'adodb-4.80' . DIRECTORY_SEPARATOR; //---------------------------------------------------------------------- --- 64,68 ---- //---------------------------------------------------------------------- ! $cfg_adodb_path = $cfg_packages_path . 'adodb-4.99' . DIRECTORY_SEPARATOR; //---------------------------------------------------------------------- |
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/xsl In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/xsl Removed Files: convert-0.1-0.2.xsl convert-0.1-0.3.xsl convert-0.2-0.1.xsl convert-0.2-0.3.xsl remove-0.2.xsl remove-0.3.xsl Log Message: Upgrading ADODB from 4.80 to 4.99. --- convert-0.1-0.3.xsl DELETED --- --- convert-0.2-0.1.xsl DELETED --- --- remove-0.3.xsl DELETED --- --- remove-0.2.xsl DELETED --- --- convert-0.2-0.3.xsl DELETED --- --- convert-0.1-0.2.xsl DELETED --- |
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/tests In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/tests Removed Files: benchmark.php client.php pdo.php rr.htm test-active-record.php test-active-recs2.php test-datadict.php test-perf.php test-pgblob.php test-php5.php test-xmlschema.php test.php test2.php test3.php test4.php test5.php test_rs_array.php testcache.php testdatabases.inc.php testgenid.php testmssql.php testoci8.php testoci8cursor.php testpaging.php testpear.php testsessions.php time.php tmssql.php xmlschema-mssql.xml xmlschema.xml Log Message: Upgrading ADODB from 4.80 to 4.99. --- testsessions.php DELETED --- --- testoci8cursor.php DELETED --- --- test.php DELETED --- --- testoci8.php DELETED --- --- rr.htm DELETED --- --- testpaging.php DELETED --- --- test2.php DELETED --- --- testmssql.php DELETED --- --- test-active-recs2.php DELETED --- --- testdatabases.inc.php DELETED --- --- tmssql.php DELETED --- --- testgenid.php DELETED --- --- testpear.php DELETED --- --- test-php5.php DELETED --- --- testcache.php DELETED --- --- xmlschema-mssql.xml DELETED --- --- test-pgblob.php DELETED --- --- test_rs_array.php DELETED --- --- test-xmlschema.php DELETED --- --- benchmark.php DELETED --- --- test-perf.php DELETED --- --- test5.php DELETED --- --- test-active-record.php DELETED --- --- xmlschema.xml DELETED --- --- test-datadict.php DELETED --- --- test4.php DELETED --- --- pdo.php DELETED --- --- test3.php DELETED --- --- client.php DELETED --- --- time.php DELETED --- |
|
From: Victor B. <vb...@us...> - 2008-08-01 01:07:42
|
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/session/old In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/session/old Removed Files: adodb-cryptsession.php adodb-session-clob.php adodb-session.php crypt.inc.php Log Message: Upgrading ADODB from 4.80 to 4.99. --- adodb-session.php DELETED --- --- adodb-cryptsession.php DELETED --- --- crypt.inc.php DELETED --- --- adodb-session-clob.php DELETED --- |
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/session In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/session Removed Files: adodb-compress-bzip2.php adodb-compress-gzip.php adodb-cryptsession.php adodb-encrypt-mcrypt.php adodb-encrypt-md5.php adodb-encrypt-secret.php adodb-encrypt-sha1.php adodb-sess.txt adodb-session-clob.php adodb-session.php adodb-sessions.mysql.sql adodb-sessions.oracle.clob.sql adodb-sessions.oracle.sql crypt.inc.php session_schema.xml Log Message: Upgrading ADODB from 4.80 to 4.99. --- adodb-session.php DELETED --- --- adodb-compress-gzip.php DELETED --- --- adodb-cryptsession.php DELETED --- --- adodb-sessions.mysql.sql DELETED --- --- adodb-sessions.oracle.clob.sql DELETED --- --- adodb-encrypt-sha1.php DELETED --- --- crypt.inc.php DELETED --- --- adodb-session-clob.php DELETED --- --- adodb-encrypt-md5.php DELETED --- --- adodb-sessions.oracle.sql DELETED --- --- adodb-sess.txt DELETED --- --- adodb-encrypt-mcrypt.php DELETED --- --- adodb-encrypt-secret.php DELETED --- --- session_schema.xml DELETED --- --- adodb-compress-bzip2.php DELETED --- |
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/perf In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/perf Removed Files: perf-db2.inc.php perf-informix.inc.php perf-mssql.inc.php perf-mysql.inc.php perf-oci8.inc.php perf-postgres.inc.php Log Message: Upgrading ADODB from 4.80 to 4.99. --- perf-db2.inc.php DELETED --- --- perf-informix.inc.php DELETED --- --- perf-mysql.inc.php DELETED --- --- perf-postgres.inc.php DELETED --- --- perf-mssql.inc.php DELETED --- --- perf-oci8.inc.php DELETED --- |
|
From: Victor B. <vb...@us...> - 2008-08-01 01:07:24
|
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/pear In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/pear Removed Files: readme.Auth.txt Log Message: Upgrading ADODB from 4.80 to 4.99. --- readme.Auth.txt DELETED --- |
|
From: Victor B. <vb...@us...> - 2008-08-01 01:07:23
|
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/pear/Auth/Container In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/pear/Auth/Container Removed Files: ADOdb.php Log Message: Upgrading ADODB from 4.80 to 4.99. --- ADOdb.php DELETED --- |
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/lang In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/lang Removed Files: adodb-ar.inc.php adodb-bg.inc.php adodb-bgutf8.inc.php adodb-ca.inc.php adodb-cn.inc.php adodb-cz.inc.php adodb-da.inc.php adodb-de.inc.php adodb-en.inc.php adodb-es.inc.php adodb-esperanto.inc.php adodb-fr.inc.php adodb-hu.inc.php adodb-it.inc.php adodb-nl.inc.php adodb-pl.inc.php adodb-pt-br.inc.php adodb-ro.inc.php adodb-ru1251.inc.php adodb-sv.inc.php adodb-uk1251.inc.php Log Message: Upgrading ADODB from 4.80 to 4.99. --- adodb-hu.inc.php DELETED --- --- adodb-pt-br.inc.php DELETED --- --- adodb-uk1251.inc.php DELETED --- --- adodb-bg.inc.php DELETED --- --- adodb-sv.inc.php DELETED --- --- adodb-es.inc.php DELETED --- --- adodb-ar.inc.php DELETED --- --- adodb-cn.inc.php DELETED --- --- adodb-pl.inc.php DELETED --- --- adodb-cz.inc.php DELETED --- --- adodb-bgutf8.inc.php DELETED --- --- adodb-da.inc.php DELETED --- --- adodb-ru1251.inc.php DELETED --- --- adodb-de.inc.php DELETED --- --- adodb-fr.inc.php DELETED --- --- adodb-ro.inc.php DELETED --- --- adodb-nl.inc.php DELETED --- --- adodb-ca.inc.php DELETED --- --- adodb-en.inc.php DELETED --- --- adodb-it.inc.php DELETED --- --- adodb-esperanto.inc.php DELETED --- |
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/drivers In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/drivers Removed Files: adodb-access.inc.php adodb-ado.inc.php adodb-ado5.inc.php adodb-ado_access.inc.php adodb-ado_mssql.inc.php adodb-borland_ibase.inc.php adodb-csv.inc.php adodb-db2.inc.php adodb-fbsql.inc.php adodb-firebird.inc.php adodb-ibase.inc.php adodb-informix.inc.php adodb-informix72.inc.php adodb-ldap.inc.php adodb-mssql.inc.php adodb-mssqlpo.inc.php adodb-mysql.inc.php adodb-mysqli.inc.php adodb-mysqlt.inc.php adodb-netezza.inc.php adodb-oci8.inc.php adodb-oci805.inc.php adodb-oci8po.inc.php adodb-odbc.inc.php adodb-odbc_db2.inc.php adodb-odbc_mssql.inc.php adodb-odbc_oracle.inc.php adodb-odbtp.inc.php adodb-odbtp_unicode.inc.php adodb-oracle.inc.php adodb-pdo.inc.php adodb-pdo_mssql.inc.php adodb-pdo_mysql.inc.php adodb-pdo_oci.inc.php adodb-pdo_pgsql.inc.php adodb-postgres.inc.php adodb-postgres64.inc.php adodb-postgres7.inc.php adodb-postgres8.inc.php adodb-proxy.inc.php adodb-sapdb.inc.php adodb-sqlanywhere.inc.php adodb-sqlite.inc.php adodb-sqlitepo.inc.php adodb-sybase.inc.php adodb-sybase_ase.inc.php adodb-vfp.inc.php Log Message: Upgrading ADODB from 4.80 to 4.99. --- adodb-odbc_oracle.inc.php DELETED --- --- adodb-mssqlpo.inc.php DELETED --- --- adodb-netezza.inc.php DELETED --- --- adodb-ado_access.inc.php DELETED --- --- adodb-postgres64.inc.php DELETED --- --- adodb-proxy.inc.php DELETED --- --- adodb-sqlanywhere.inc.php DELETED --- --- adodb-informix72.inc.php DELETED --- --- adodb-fbsql.inc.php DELETED --- --- adodb-vfp.inc.php DELETED --- --- adodb-sapdb.inc.php DELETED --- --- adodb-odbc.inc.php DELETED --- --- adodb-sqlite.inc.php DELETED --- --- adodb-csv.inc.php DELETED --- --- adodb-oci8.inc.php DELETED --- --- adodb-postgres7.inc.php DELETED --- --- adodb-ibase.inc.php DELETED --- --- adodb-postgres8.inc.php DELETED --- --- adodb-oracle.inc.php DELETED --- --- adodb-odbc_db2.inc.php DELETED --- --- adodb-pdo_pgsql.inc.php DELETED --- --- adodb-oci805.inc.php DELETED --- --- adodb-sybase_ase.inc.php DELETED --- --- adodb-odbtp_unicode.inc.php DELETED --- --- adodb-sybase.inc.php DELETED --- --- adodb-odbtp.inc.php DELETED --- --- adodb-ado.inc.php DELETED --- --- adodb-borland_ibase.inc.php DELETED --- --- adodb-postgres.inc.php DELETED --- --- adodb-informix.inc.php DELETED --- --- adodb-mssql.inc.php DELETED --- --- adodb-pdo.inc.php DELETED --- --- adodb-pdo_mssql.inc.php DELETED --- --- adodb-pdo_mysql.inc.php DELETED --- --- adodb-sqlitepo.inc.php DELETED --- --- adodb-db2.inc.php DELETED --- --- adodb-pdo_oci.inc.php DELETED --- --- adodb-mysqlt.inc.php DELETED --- --- adodb-access.inc.php DELETED --- --- adodb-ado5.inc.php DELETED --- --- adodb-mysql.inc.php DELETED --- --- adodb-oci8po.inc.php DELETED --- --- adodb-ldap.inc.php DELETED --- --- adodb-odbc_mssql.inc.php DELETED --- --- adodb-mysqli.inc.php DELETED --- --- adodb-firebird.inc.php DELETED --- --- adodb-ado_mssql.inc.php DELETED --- |
|
From: Victor B. <vb...@us...> - 2008-08-01 01:06:26
|
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/docs In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/docs Removed Files: docs-active-record.htm docs-adodb.htm docs-datadict.htm docs-oracle.htm docs-perf.htm docs-session.htm old-changelog.htm readme.htm tips_portable_sql.htm tute.htm Log Message: Upgrading ADODB from 4.80 to 4.99. --- docs-oracle.htm DELETED --- --- docs-perf.htm DELETED --- --- docs-adodb.htm DELETED --- --- tips_portable_sql.htm DELETED --- --- old-changelog.htm DELETED --- --- docs-session.htm DELETED --- --- docs-datadict.htm DELETED --- --- docs-active-record.htm DELETED --- --- tute.htm DELETED --- --- readme.htm DELETED --- |
|
From: Victor B. <vb...@us...> - 2008-08-01 01:06:18
|
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/datadict In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/datadict Removed Files: datadict-access.inc.php datadict-db2.inc.php datadict-firebird.inc.php datadict-generic.inc.php datadict-ibase.inc.php datadict-informix.inc.php datadict-mssql.inc.php datadict-mysql.inc.php datadict-oci8.inc.php datadict-postgres.inc.php datadict-sapdb.inc.php datadict-sybase.inc.php Log Message: Upgrading ADODB from 4.80 to 4.99. --- datadict-oci8.inc.php DELETED --- --- datadict-ibase.inc.php DELETED --- --- datadict-db2.inc.php DELETED --- --- datadict-informix.inc.php DELETED --- --- datadict-mysql.inc.php DELETED --- --- datadict-mssql.inc.php DELETED --- --- datadict-firebird.inc.php DELETED --- --- datadict-access.inc.php DELETED --- --- datadict-generic.inc.php DELETED --- --- datadict-sybase.inc.php DELETED --- --- datadict-sapdb.inc.php DELETED --- --- datadict-postgres.inc.php DELETED --- |
|
From: Victor B. <vb...@us...> - 2008-08-01 01:06:04
|
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/cute_icons_for_site In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/cute_icons_for_site Removed Files: adodb.gif adodb2.gif Log Message: Upgrading ADODB from 4.80 to 4.99. --- adodb.gif DELETED --- --- adodb2.gif DELETED --- |
|
From: Victor B. <vb...@us...> - 2008-08-01 01:06:00
|
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80/contrib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80/contrib Removed Files: toxmlrpc.inc.php Log Message: Upgrading ADODB from 4.80 to 4.99. --- toxmlrpc.inc.php DELETED --- |
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.80 In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.80 Removed Files: adodb-active-record.inc.php adodb-csvlib.inc.php adodb-datadict.inc.php adodb-error.inc.php adodb-errorhandler.inc.php adodb-errorpear.inc.php adodb-exceptions.inc.php adodb-iterator.inc.php adodb-lib.inc.php adodb-pager.inc.php adodb-pear.inc.php adodb-perf.inc.php adodb-php4.inc.php adodb-time.inc.php adodb-xmlschema.inc.php adodb-xmlschema03.inc.php adodb.inc.php license.txt pivottable.inc.php readme.txt rsfilter.inc.php server.php toexport.inc.php tohtml.inc.php xmlschema.dtd xmlschema03.dtd Log Message: Upgrading ADODB from 4.80 to 4.99. --- adodb-pear.inc.php DELETED --- --- adodb-datadict.inc.php DELETED --- --- adodb-errorhandler.inc.php DELETED --- --- readme.txt DELETED --- --- tohtml.inc.php DELETED --- --- adodb-time.inc.php DELETED --- --- adodb-pager.inc.php DELETED --- --- xmlschema03.dtd DELETED --- --- adodb-perf.inc.php DELETED --- --- adodb-active-record.inc.php DELETED --- --- adodb-iterator.inc.php DELETED --- --- pivottable.inc.php DELETED --- --- adodb-xmlschema03.inc.php DELETED --- --- xmlschema.dtd DELETED --- --- adodb-errorpear.inc.php DELETED --- --- adodb-lib.inc.php DELETED --- --- adodb-csvlib.inc.php DELETED --- --- toexport.inc.php DELETED --- --- adodb-error.inc.php DELETED --- --- adodb.inc.php DELETED --- --- adodb-xmlschema.inc.php DELETED --- --- adodb-php4.inc.php DELETED --- --- rsfilter.inc.php DELETED --- --- server.php DELETED --- --- license.txt DELETED --- --- adodb-exceptions.inc.php DELETED --- |
Update of /cvsroot/e-ark/e-ark/packages/adodb-4.99/xsl In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25796/packages/adodb-4.99/xsl Added Files: convert-0.1-0.2.xsl convert-0.1-0.3.xsl convert-0.2-0.1.xsl convert-0.2-0.3.xsl remove-0.2.xsl remove-0.3.xsl Log Message: Upgrading ADODB from 4.80 to 4.99. --- NEW FILE: convert-0.1-0.3.xsl --- <?xml version="1.0" encoding="UTF-8"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > <xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/> <!-- Schema --> <xsl:template match="/"> <xsl:comment> ADODB XMLSchema http://adodb-xmlschema.sourceforge.net </xsl:comment> <xsl:element name="schema"> <xsl:attribute name="version">0.3</xsl:attribute> <xsl:apply-templates select="schema/table|schema/sql"/> </xsl:element> </xsl:template> <!-- Table --> <xsl:template match="table"> <xsl:variable name="table_name" select="@name"/> <xsl:element name="table"> <xsl:attribute name="name"><xsl:value-of select="$table_name"/></xsl:attribute> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@version) > 0"> <xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="descr[1]"/> <xsl:choose> <xsl:when test="count(DROP) > 0"> <xsl:element name="DROP"/> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="field"/> </xsl:otherwise> </xsl:choose> <xsl:apply-templates select="constraint"/> <xsl:apply-templates select="../index[@table=$table_name]"/> </xsl:element> </xsl:template> <!-- Field --> <xsl:template match="field"> <xsl:element name="field"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> <xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute> <xsl:if test="string-length(@size) > 0"> <xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute> </xsl:if> <xsl:choose> <xsl:when test="string-length(@opts) = 0"/> <xsl:when test="@opts = 'UNSIGNED'"> <xsl:element name="UNSIGNED"/> </xsl:when> <xsl:when test="contains(@opts,'UNSIGNED')"> <xsl:attribute name="opts"> <xsl:value-of select="concat(substring-before(@opts,'UNSIGNED'),substring-after(@opts,'UNSIGNED'))"/> </xsl:attribute> <xsl:element name="UNSIGNED"/> </xsl:when> <xsl:otherwise> <xsl:attribute name="opts"><xsl:value-of select="@opts"/></xsl:attribute> </xsl:otherwise> </xsl:choose> <xsl:choose> <xsl:when test="count(PRIMARY) > 0"> <xsl:element name="PRIMARY"/> </xsl:when> <xsl:when test="count(KEY) > 0"> <xsl:element name="KEY"/> </xsl:when> <xsl:when test="count(NOTNULL) > 0"> <xsl:element name="NOTNULL"/> </xsl:when> </xsl:choose> <xsl:choose> <xsl:when test="count(AUTO) > 0"> <xsl:element name="AUTO"/> </xsl:when> <xsl:when test="count(AUTOINCREMENT) > 0"> <xsl:element name="AUTOINCREMENT"/> </xsl:when> </xsl:choose> <xsl:choose> <xsl:when test="count(DEFAULT) > 0"> <xsl:element name="DEFAULT"> <xsl:attribute name="value"> <xsl:value-of select="DEFAULT[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> <xsl:when test="count(DEFDATE) > 0"> <xsl:element name="DEFDATE"> <xsl:attribute name="value"> <xsl:value-of select="DEFDATE[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> <xsl:when test="count(DEFTIMESTAMP) > 0"> <xsl:element name="DEFTIMESTAMP"> <xsl:attribute name="value"> <xsl:value-of select="DEFTIMESTAMP[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> </xsl:choose> <xsl:if test="count(NOQUOTE) > 0"> <xsl:element name="NOQUOTE"/> </xsl:if> <xsl:apply-templates select="constraint"/> </xsl:element> </xsl:template> <!-- Constraint --> <xsl:template match="constraint"> <xsl:element name="constraint"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- Index --> <xsl:template match="index"> <xsl:element name="index"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> <xsl:apply-templates select="descr[1]"/> <xsl:if test="count(CLUSTERED) > 0"> <xsl:element name="CLUSTERED"/> </xsl:if> <xsl:if test="count(BITMAP) > 0"> <xsl:element name="BITMAP"/> </xsl:if> <xsl:if test="count(UNIQUE) > 0"> <xsl:element name="UNIQUE"/> </xsl:if> <xsl:if test="count(FULLTEXT) > 0"> <xsl:element name="FULLTEXT"/> </xsl:if> <xsl:if test="count(HASH) > 0"> <xsl:element name="HASH"/> </xsl:if> <xsl:choose> <xsl:when test="count(DROP) > 0"> <xsl:element name="DROP"/> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="col"/> </xsl:otherwise> </xsl:choose> </xsl:element> </xsl:template> <!-- Index Column --> <xsl:template match="col"> <xsl:element name="col"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- SQL QuerySet --> <xsl:template match="sql"> <xsl:element name="sql"> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@key) > 0"> <xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@prefixmethod) > 0"> <xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="descr[1]"/> <xsl:apply-templates select="query"/> </xsl:element> </xsl:template> <!-- Query --> <xsl:template match="query"> <xsl:element name="query"> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- Description --> <xsl:template match="descr"> <xsl:element name="descr"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> </xsl:stylesheet> --- NEW FILE: convert-0.2-0.1.xsl --- <?xml version="1.0" encoding="UTF-8"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > <xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/> <!-- Schema --> <xsl:template match="/"> <xsl:comment> ADODB XMLSchema http://adodb-xmlschema.sourceforge.net </xsl:comment> <xsl:element name="schema"> <xsl:attribute name="version">0.1</xsl:attribute> <xsl:apply-templates select="schema/table|schema/sql"/> </xsl:element> </xsl:template> <!-- Table --> <xsl:template match="table"> <xsl:variable name="table_name" select="@name"/> <xsl:element name="table"> <xsl:attribute name="name"><xsl:value-of select="$table_name"/></xsl:attribute> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@version) > 0"> <xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="descr[1]"/> <xsl:choose> <xsl:when test="count(DROP) > 0"> <xsl:element name="DROP"/> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="field"/> </xsl:otherwise> </xsl:choose> <xsl:apply-templates select="constraint"/> </xsl:element> <xsl:apply-templates select="index"/> </xsl:template> <!-- Field --> <xsl:template match="field"> <xsl:element name="field"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> <xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute> <xsl:if test="string-length(@size) > 0"> <xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute> </xsl:if> <xsl:choose> <xsl:when test="count(PRIMARY) > 0"> <xsl:element name="PRIMARY"/> </xsl:when> <xsl:when test="count(KEY) > 0"> <xsl:element name="KEY"/> </xsl:when> <xsl:when test="count(NOTNULL) > 0"> <xsl:element name="NOTNULL"/> </xsl:when> </xsl:choose> <xsl:choose> <xsl:when test="count(AUTO) > 0"> <xsl:element name="AUTO"/> </xsl:when> <xsl:when test="count(AUTOINCREMENT) > 0"> <xsl:element name="AUTOINCREMENT"/> </xsl:when> </xsl:choose> <xsl:choose> <xsl:when test="count(DEFAULT) > 0"> <xsl:element name="DEFAULT"> <xsl:attribute name="value"> <xsl:value-of select="DEFAULT[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> <xsl:when test="count(DEFDATE) > 0"> <xsl:element name="DEFDATE"> <xsl:attribute name="value"> <xsl:value-of select="DEFDATE[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> <xsl:when test="count(DEFTIMESTAMP) > 0"> <xsl:element name="DEFDTIMESTAMP"> <xsl:attribute name="value"> <xsl:value-of select="DEFTIMESTAMP[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> </xsl:choose> <xsl:if test="count(NOQUOTE) > 0"> <xsl:element name="NOQUOTE"/> </xsl:if> <xsl:apply-templates select="constraint"/> </xsl:element> </xsl:template> <!-- Constraint --> <xsl:template match="constraint"> <xsl:element name="constraint"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- Index --> <xsl:template match="index"> <xsl:element name="index"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> <xsl:attribute name="table"><xsl:value-of select="../@name"/></xsl:attribute> <xsl:apply-templates select="descr[1]"/> <xsl:if test="count(CLUSTERED) > 0"> <xsl:element name="CLUSTERED"/> </xsl:if> <xsl:if test="count(BITMAP) > 0"> <xsl:element name="BITMAP"/> </xsl:if> <xsl:if test="count(UNIQUE) > 0"> <xsl:element name="UNIQUE"/> </xsl:if> <xsl:if test="count(FULLTEXT) > 0"> <xsl:element name="FULLTEXT"/> </xsl:if> <xsl:if test="count(HASH) > 0"> <xsl:element name="HASH"/> </xsl:if> <xsl:choose> <xsl:when test="count(DROP) > 0"> <xsl:element name="DROP"/> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="col"/> </xsl:otherwise> </xsl:choose> </xsl:element> </xsl:template> <!-- Index Column --> <xsl:template match="col"> <xsl:element name="col"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- SQL QuerySet --> <xsl:template match="sql"> <xsl:element name="sql"> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@key) > 0"> <xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@prefixmethod) > 0"> <xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="descr[1]"/> <xsl:apply-templates select="query"/> </xsl:element> </xsl:template> <!-- Query --> <xsl:template match="query"> <xsl:element name="query"> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- Description --> <xsl:template match="descr"> <xsl:element name="descr"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> </xsl:stylesheet> --- NEW FILE: remove-0.3.xsl --- <?xml version="1.0" encoding="UTF-8"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > <xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/> <!-- Schema --> <xsl:template match="/"> <xsl:comment> ADODB XMLSchema http://adodb-xmlschema.sourceforge.net </xsl:comment> <xsl:comment> Uninstallation Schema </xsl:comment> <xsl:element name="schema"> <xsl:attribute name="version">0.3</xsl:attribute> <xsl:apply-templates select="schema/table"> <xsl:sort select="position()" data-type="number" order="descending"/> </xsl:apply-templates> </xsl:element> </xsl:template> <!-- Table --> <xsl:template match="table"> <xsl:if test="count(DROP) = 0"> <xsl:element name="table"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@version) > 0"> <xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="descr[1]"/> <xsl:element name="DROP"/> </xsl:element> </xsl:if> </xsl:template> <!-- Description --> <xsl:template match="descr"> <xsl:element name="descr"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> </xsl:stylesheet> --- NEW FILE: remove-0.2.xsl --- <?xml version="1.0" encoding="UTF-8"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > <xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/> <!-- Schema --> <xsl:template match="/"> <xsl:comment> ADODB XMLSchema http://adodb-xmlschema.sourceforge.net </xsl:comment> <xsl:comment> Uninstallation Schema </xsl:comment> <xsl:element name="schema"> <xsl:attribute name="version">0.2</xsl:attribute> <xsl:apply-templates select="schema/table"> <xsl:sort select="position()" data-type="number" order="descending"/> </xsl:apply-templates> </xsl:element> </xsl:template> <!-- Table --> <xsl:template match="table"> <xsl:if test="count(DROP) = 0"> <xsl:element name="table"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@version) > 0"> <xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="descr[1]"/> <xsl:element name="DROP"/> </xsl:element> </xsl:if> </xsl:template> <!-- Description --> <xsl:template match="descr"> <xsl:element name="descr"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> </xsl:stylesheet> --- NEW FILE: convert-0.2-0.3.xsl --- <?xml version="1.0" encoding="UTF-8"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > <xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/> <!-- Schema --> <xsl:template match="/"> <xsl:comment> ADODB XMLSchema http://adodb-xmlschema.sourceforge.net </xsl:comment> <xsl:element name="schema"> <xsl:attribute name="version">0.3</xsl:attribute> <xsl:apply-templates select="schema/table|schema/sql"/> </xsl:element> </xsl:template> <!-- Table --> <xsl:template match="table"> <xsl:element name="table"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@version) > 0"> <xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="descr[1]"/> <xsl:choose> <xsl:when test="count(DROP) > 0"> <xsl:element name="DROP"/> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="field"/> </xsl:otherwise> </xsl:choose> <xsl:apply-templates select="constraint"/> <xsl:apply-templates select="opt"/> <xsl:apply-templates select="index"/> <xsl:apply-templates select="data"/> </xsl:element> </xsl:template> <!-- Field --> <xsl:template match="field"> <xsl:element name="field"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> <xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute> <xsl:if test="string-length(@size) > 0"> <xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute> </xsl:if> <xsl:choose> <xsl:when test="string-length(@opts) = 0"> <xsl:if test="count(UNSIGNED) > 0"> <xsl:element name="UNSIGNED"/> </xsl:if> </xsl:when> <xsl:when test="@opts = 'UNSIGNED'"> <xsl:element name="UNSIGNED"/> </xsl:when> <xsl:when test="contains(@opts,'UNSIGNED')"> <xsl:attribute name="opts"> <xsl:value-of select="concat(substring-before(@opts,'UNSIGNED'),substring-after(@opts,'UNSIGNED'))"/> </xsl:attribute> <xsl:element name="UNSIGNED"/> </xsl:when> <xsl:otherwise> <xsl:attribute name="opts"><xsl:value-of select="@opts"/></xsl:attribute> <xsl:if test="count(UNSIGNED) > 0"> <xsl:element name="UNSIGNED"/> </xsl:if> </xsl:otherwise> </xsl:choose> <xsl:apply-templates select="descr[1]"/> <xsl:choose> <xsl:when test="count(PRIMARY) > 0"> <xsl:element name="PRIMARY"/> </xsl:when> <xsl:when test="count(KEY) > 0"> <xsl:element name="KEY"/> </xsl:when> <xsl:when test="count(NOTNULL) > 0"> <xsl:element name="NOTNULL"/> </xsl:when> </xsl:choose> <xsl:choose> <xsl:when test="count(AUTO) > 0"> <xsl:element name="AUTO"/> </xsl:when> <xsl:when test="count(AUTOINCREMENT) > 0"> <xsl:element name="AUTOINCREMENT"/> </xsl:when> </xsl:choose> <xsl:choose> <xsl:when test="count(DEFAULT) > 0"> <xsl:element name="DEFAULT"> <xsl:attribute name="value"> <xsl:value-of select="DEFAULT[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> <xsl:when test="count(DEFDATE) > 0"> <xsl:element name="DEFDATE"> <xsl:attribute name="value"> <xsl:value-of select="DEFDATE[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> <xsl:when test="count(DEFTIMESTAMP) > 0"> <xsl:element name="DEFTIMESTAMP"> <xsl:attribute name="value"> <xsl:value-of select="DEFTIMESTAMP[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> </xsl:choose> <xsl:if test="count(NOQUOTE) > 0"> <xsl:element name="NOQUOTE"/> </xsl:if> <xsl:apply-templates select="constraint"/> <xsl:apply-templates select="opt"/> </xsl:element> </xsl:template> <!-- Constraint --> <xsl:template match="constraint"> <xsl:element name="constraint"> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- Opt --> <xsl:template match="opt"> <xsl:element name="opt"> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- Index --> <xsl:template match="index"> <xsl:element name="index"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> <xsl:apply-templates select="descr[1]"/> <xsl:if test="count(CLUSTERED) > 0"> <xsl:element name="CLUSTERED"/> </xsl:if> <xsl:if test="count(BITMAP) > 0"> <xsl:element name="BITMAP"/> </xsl:if> <xsl:if test="count(UNIQUE) > 0"> <xsl:element name="UNIQUE"/> </xsl:if> <xsl:if test="count(FULLTEXT) > 0"> <xsl:element name="FULLTEXT"/> </xsl:if> <xsl:if test="count(HASH) > 0"> <xsl:element name="HASH"/> </xsl:if> <xsl:choose> <xsl:when test="count(DROP) > 0"> <xsl:element name="DROP"/> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="col"/> </xsl:otherwise> </xsl:choose> </xsl:element> </xsl:template> <!-- Index Column --> <xsl:template match="col"> <xsl:element name="col"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- SQL QuerySet --> <xsl:template match="sql"> <xsl:element name="sql"> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@key) > 0"> <xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@prefixmethod) > 0"> <xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="descr[1]"/> <xsl:apply-templates select="query"/> </xsl:element> </xsl:template> <!-- Query --> <xsl:template match="query"> <xsl:element name="query"> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- Description --> <xsl:template match="descr"> <xsl:element name="descr"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- Data --> <xsl:template match="data"> <xsl:element name="data"> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="descr[1]"/> <xsl:apply-templates select="row"/> </xsl:element> </xsl:template> <!-- Data Row --> <xsl:template match="row"> <xsl:element name="row"> <xsl:apply-templates select="f"/> </xsl:element> </xsl:template> <!-- Data Field --> <xsl:template match="f"> <xsl:element name="f"> <xsl:if test="string-length(@name) > 0"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> </xsl:if> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> </xsl:stylesheet> --- NEW FILE: convert-0.1-0.2.xsl --- <?xml version="1.0" encoding="UTF-8"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > <xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/> <!-- Schema --> <xsl:template match="/"> <xsl:comment> ADODB XMLSchema http://adodb-xmlschema.sourceforge.net </xsl:comment> <xsl:element name="schema"> <xsl:attribute name="version">0.2</xsl:attribute> <xsl:apply-templates select="schema/table|schema/sql"/> </xsl:element> </xsl:template> <!-- Table --> <xsl:template match="table"> <xsl:variable name="table_name" select="@name"/> <xsl:element name="table"> <xsl:attribute name="name"><xsl:value-of select="$table_name"/></xsl:attribute> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@version) > 0"> <xsl:attribute name="version"><xsl:value-of select="@version"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="descr[1]"/> <xsl:choose> <xsl:when test="count(DROP) > 0"> <xsl:element name="DROP"/> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="field"/> </xsl:otherwise> </xsl:choose> <xsl:apply-templates select="constraint"/> <xsl:apply-templates select="../index[@table=$table_name]"/> </xsl:element> </xsl:template> <!-- Field --> <xsl:template match="field"> <xsl:element name="field"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> <xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute> <xsl:if test="string-length(@size) > 0"> <xsl:attribute name="size"><xsl:value-of select="@size"/></xsl:attribute> </xsl:if> <xsl:choose> <xsl:when test="count(PRIMARY) > 0"> <xsl:element name="PRIMARY"/> </xsl:when> <xsl:when test="count(KEY) > 0"> <xsl:element name="KEY"/> </xsl:when> <xsl:when test="count(NOTNULL) > 0"> <xsl:element name="NOTNULL"/> </xsl:when> </xsl:choose> <xsl:choose> <xsl:when test="count(AUTO) > 0"> <xsl:element name="AUTO"/> </xsl:when> <xsl:when test="count(AUTOINCREMENT) > 0"> <xsl:element name="AUTOINCREMENT"/> </xsl:when> </xsl:choose> <xsl:choose> <xsl:when test="count(DEFAULT) > 0"> <xsl:element name="DEFAULT"> <xsl:attribute name="value"> <xsl:value-of select="DEFAULT[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> <xsl:when test="count(DEFDATE) > 0"> <xsl:element name="DEFDATE"> <xsl:attribute name="value"> <xsl:value-of select="DEFDATE[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> <xsl:when test="count(DEFTIMESTAMP) > 0"> <xsl:element name="DEFTIMESTAMP"> <xsl:attribute name="value"> <xsl:value-of select="DEFTIMESTAMP[1]/@value"/> </xsl:attribute> </xsl:element> </xsl:when> </xsl:choose> <xsl:if test="count(NOQUOTE) > 0"> <xsl:element name="NOQUOTE"/> </xsl:if> <xsl:apply-templates select="constraint"/> </xsl:element> </xsl:template> <!-- Constraint --> <xsl:template match="constraint"> <xsl:element name="constraint"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- Index --> <xsl:template match="index"> <xsl:element name="index"> <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute> <xsl:apply-templates select="descr[1]"/> <xsl:if test="count(CLUSTERED) > 0"> <xsl:element name="CLUSTERED"/> </xsl:if> <xsl:if test="count(BITMAP) > 0"> <xsl:element name="BITMAP"/> </xsl:if> <xsl:if test="count(UNIQUE) > 0"> <xsl:element name="UNIQUE"/> </xsl:if> <xsl:if test="count(FULLTEXT) > 0"> <xsl:element name="FULLTEXT"/> </xsl:if> <xsl:if test="count(HASH) > 0"> <xsl:element name="HASH"/> </xsl:if> <xsl:choose> <xsl:when test="count(DROP) > 0"> <xsl:element name="DROP"/> </xsl:when> <xsl:otherwise> <xsl:apply-templates select="col"/> </xsl:otherwise> </xsl:choose> </xsl:element> </xsl:template> <!-- Index Column --> <xsl:template match="col"> <xsl:element name="col"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- SQL QuerySet --> <xsl:template match="sql"> <xsl:element name="sql"> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@key) > 0"> <xsl:attribute name="key"><xsl:value-of select="@key"/></xsl:attribute> </xsl:if> <xsl:if test="string-length(@prefixmethod) > 0"> <xsl:attribute name="prefixmethod"><xsl:value-of select="@prefixmethod"/></xsl:attribute> </xsl:if> <xsl:apply-templates select="descr[1]"/> <xsl:apply-templates select="query"/> </xsl:element> </xsl:template> <!-- Query --> <xsl:template match="query"> <xsl:element name="query"> <xsl:if test="string-length(@platform) > 0"> <xsl:attribute name="platform"><xsl:value-of select="@platform"/></xsl:attribute> </xsl:if> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> <!-- Description --> <xsl:template match="descr"> <xsl:element name="descr"> <xsl:value-of select="normalize-space(text())"/> </xsl:element> </xsl:template> </xsl:stylesheet> |
1 message has been excluded from this view by a project administrator.
