From 97fb83ca27d0428dfcff09f891ef4a86895ab724 Mon Sep 17 00:00:00 2001 From: tipaul Date: Mon, 7 Oct 2002 09:34:59 +0000 Subject: [PATCH] *** empty log message *** --- admin/marctagstructure.pl | 181 +++++++++++-------------------------- admin/systempreferences.pl | 154 ++++++++----------------------- 2 files changed, 89 insertions(+), 246 deletions(-) diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl index 7f35762383..70227cb63a 100755 --- a/admin/marctagstructure.pl +++ b/admin/marctagstructure.pl @@ -23,6 +23,8 @@ use CGI; use C4::Context; use C4::Output; use C4::Search; +use C4::Context; +use HTML::Template; sub StringSearch { my ($env,$searchstring,$type)=@_; @@ -52,14 +54,18 @@ my $reqdel="delete from marc_tag_structure where $pkfield='$searchfield'"; my $offset=$input->param('offset'); my $script_name="/cgi-bin/koha/admin/marctagstructure.pl"; +my $template = gettemplate("parameters/marctagstructure.tmpl",0); my $pagesize=20; my $op = $input->param('op'); $searchfield=~ s/\,//g; -print $input->header; -#start the page and read in includes -print startpage(); -print startmenu('admin'); +if ($op) { +$template->param(script_name => $script_name, + $op => 1); # we show only the TMPL_VAR names $op +} else { +$template->param(script_name => $script_name, + else => 1); # we show only the TMPL_VAR names $op +} ################## ADD_FORM ################################## # called by default. Used to create form to add or modify a record @@ -73,104 +79,36 @@ if ($op eq 'add_form') { $data=$sth->fetchrow_hashref; $sth->finish; } - print < - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function isNotNull(f,noalert) { - if (f.value.length ==0) { - return false; - } - return true; - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function toUC(f) { - var x=f.value.toUpperCase(); - f.value=x; - return true; - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function isNum(v,maybenull) { - var n = new Number(v.value); - if (isNaN(n)) { - return false; - } - if (maybenull==0 && v.value=='') { - return false; - } - return true; - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function isDate(f) { - var t = Date.parse(f.value); - if (isNaN(t)) { - return false; - } - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function Check(f) { - var ok=1; - var _alertString=""; - var alertString2; - if (f.tagfield.value.length==0) { - _alertString += "- tagfield missing\\n"; - } - if (f.repeatable.value!=0 && f.repeatable.value!=1) { - _alertString += "- repeatable must be 0 or 1\\n"; - } - if (f.mandatory.value!=0 && f.mandatory.value!=1) { - _alertString += "- mandatory must be 0 or 1\\n"; - } - if (_alertString.length==0) { - document.Aform.submit(); - } else { - alertString2 = "Form not submitted because of the following problem(s)\\n"; - alertString2 += "------------------------------------------------------------------------------------\\n\\n"; - alertString2 += _alertString; - alert(alertString2); - } - } - -printend -;#/ - if ($searchfield) { - print "

Modify tag

"; - } else { - print "

Add tag

"; - } - print "
"; - print ""; - print ""; if ($searchfield) { - print ""; + $template->param(action => "Modify tag", + searchfield => "$searchfield"); } else { - print ""; + $template->param(action => "Add tag", + searchfield => ""); } - print ""; - print ""; - print ""; - print ""; - print ""; - print "
Tag$searchfield
Tag
Value
Value
Value
Value
 
"; - print "
"; -; + $template->param(liblibrarian => $data->{'liblibrarian'}, + libopac => $data->{'libopac'}, + repeatable => $data->{'repeatable'}, + mandatory => $data->{'mandatory'}, + ); # END $OP eq ADD_FORM ################## ADD_VALIDATE ################################## # called by add_form, used to insert/modify data in DB } elsif ($op eq 'add_validate') { my $dbh = C4::Context->dbh; - my $query = "replace marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory) values ("; - $query.= $dbh->quote($input->param('tagfield')).","; - $query.= $dbh->quote($input->param('liblibrarian')).","; - $query.= $dbh->quote($input->param('libopac')).","; - $query.= $dbh->quote($input->param('repeatable')).","; - $query.= $dbh->quote($input->param('mandatory')).")"; - my $sth=$dbh->prepare($query); - $sth->execute; + my $sth=$dbh->prepare("replace marc_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory) values (?,?,?,?,?)"); + my $tagfield =$input->param('tagfield'); + my $liblibrarian = $input->param('liblibrarian'); + my $libopac =$input->param('libopac'); + my $repeatable =$input->param('repeatable'); + my $mandatory =$input->param('mandatory'); + $sth->execute($tagfield, + $liblibrarian, + $libopac, + $repeatable, + $mandatory + ); $sth->finish; - print "data recorded"; - print "
"; - print ""; - print "
"; # END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB @@ -180,68 +118,51 @@ printend $sth->execute; my $data=$sth->fetchrow_hashref; $sth->finish; - print mktablehdr; - print mktablerow(2,'#99cc33',bold('Tag'),bold("$searchfield"),'/images/background-mem.gif'); - print "liblibrarian$data->{'liblibrarian'}"; - print "
"; - print "CONFIRM DELETION"; - print "
"; + $template->param(liblibrarian => $data->{'liblibrarian'}, + searchfield => $searchfield, + ); # END $OP eq DELETE_CONFIRM ################## DELETE_CONFIRMED ################################## # called by delete_confirm, used to effectively confirm deletion of data in DB } elsif ($op eq 'delete_confirmed') { my $dbh = C4::Context->dbh; -# my $searchfield=$input->param('branchcode'); my $sth=$dbh->prepare($reqdel); $sth->execute; $sth->finish; - print "data deleted"; - print "
"; - print ""; - print "
"; # END $OP eq DELETE_CONFIRMED ################## DEFAULT ################################## } else { # DEFAULT - my @inputs=(["text","searchfield",$searchfield], - ["reset","reset","clr"]); - print mkheadr(2,'System preferences admin'); - print mkformnotable("$script_name",@inputs); - print <$searchfield

"; + $template->param(searchfield => "You Searched for $searchfield

"); } - print mktablehdr; - print mktablerow(5,'#99cc33',bold('Tag'),bold('Value'), - ' ',' ',' ','/images/background-mem.gif'); my $env; my ($count,$results)=StringSearch($env,$searchfield,'web'); my $toggle="white"; + my @loop_data = (); for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){ if ($toggle eq 'white'){ - $toggle="#ffffcc"; + $toggle="#ffffcc"; } else { - $toggle="white"; + $toggle="white"; } - print mktablerow(5,$toggle,$results->[$i]{'tagfield'},$results->[$i]{'liblibrarian'},mklink('','subfields_not_done'), - mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'tagfield'},'Edit'), - mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'tagfield'},'Delete')); + my %row_data; # get a fresh hash for the row data + $row_data{tagfield} = $results->[$i]{'tagfield'}; + $row_data{liblibrarian} = $results->[$i]{'liblibrarian'}; + $row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}; + $row_data{edit} = "$script_name?op=add_form&searchfield=".$results->[$i]{'tagfield'}; + $row_data{delete} = "$script_name?op=delete_confirm&searchfield=".$results->[$i]{'tagfield'}; + $row_data{bgcolor} = $toggle; + push(@loop_data, \%row_data); } - print mktableft; - print "

"; - print ""; + $template->param(loop => \@loop_data); if ($offset>0) { my $prevpage = $offset-$pagesize; - print mklink("$script_name?offset=".$prevpage,'<< Prev'); + $template->param(previous => "<< Prev'); } - print "      "; if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; - print mklink("$script_name?offset=".$nextpage,'Next >>'); + $template->param(next => "Next >>'); } - print "

"; - print ""; } #---- END $OP eq DEFAULT -print endmenu('admin'); -print endpage(); + +print "Content-Type: text/html\n\n", $template->output; diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 82ff6966a5..e6eea65984 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -42,6 +42,9 @@ use CGI; use C4::Context; use C4::Output; use C4::Search; +use HTML::Template; +use C4::Context; + sub StringSearch { my ($env,$searchstring,$type)=@_; @@ -58,7 +61,6 @@ sub StringSearch { push(@results,$data); $cnt ++; } - # $sth->execute; $sth->finish; return ($cnt,\@results); } @@ -71,15 +73,18 @@ my $reqdel="delete from systempreferences where $pkfield='$searchfield'"; my $offset=$input->param('offset'); my $script_name="/cgi-bin/koha/admin/systempreferences.pl"; +my $template = gettemplate("parameters/systempreferences.tmpl",0); my $pagesize=20; my $op = $input->param('op'); $searchfield=~ s/\,//g; -print $input->header; - -#start the page and read in includes -print startpage(); -print startmenu('admin'); +if ($op) { +$template->param(script_name => $script_name, + $op => 1); # we show only the TMPL_VAR names $op +} else { +$template->param(script_name => $script_name, + else => 1); # we show only the TMPL_VAR names $op +} ################## ADD_FORM ################################## # called by default. Used to create form to add or modify a record if ($op eq 'add_form') { @@ -92,82 +97,19 @@ if ($op eq 'add_form') { $data=$sth->fetchrow_hashref; $sth->finish; } - print < - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function isNotNull(f,noalert) { - if (f.value.length ==0) { - return false; - } - return true; - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function toUC(f) { - var x=f.value.toUpperCase(); - f.value=x; - return true; - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function isNum(v,maybenull) { - var n = new Number(v.value); - if (isNaN(n)) { - return false; - } - if (maybenull==0 && v.value=='') { - return false; - } - return true; - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function isDate(f) { - var t = Date.parse(f.value); - if (isNaN(t)) { - return false; - } - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function Check(f) { - var ok=1; - var _alertString=""; - var alertString2; - if (f.variable.value.length==0) { - _alertString += "- variable missing\\n"; - } - if (f.value.value.length==0) { - _alertString += "- value missing\\n"; - } - if (_alertString.length==0) { - document.Aform.submit(); - } else { - alertString2 = "Form not submitted because of the following problem(s)\\n"; - alertString2 += "------------------------------------------------------------------------------------\\n\\n"; - alertString2 += _alertString; - alert(alertString2); - } - } - -printend -;#/ if ($searchfield) { - print "

Modify pref

"; + $template->param(action => "Modify pref"); } else { - print "

Add pref

"; + $template->param(action => "Add pref"); } - print "
"; - print ""; - print ""; - print ""; + $template->param(explanation => $data->{'explanation'}, + value => $data->{'value'}, + ); if ($searchfield) { - print ""; + $template->param(searchfield => "$searchfield"); } else { - print ""; + $template->param(searchfield => ""); } - print ""; - print ""; - print "
Variable$searchfield
Variable
Value
 
"; - print "
"; -; - # END $OP eq ADD_FORM ################## ADD_VALIDATE ################################## # called by add_form, used to insert/modify data in DB } elsif ($op eq 'add_validate') { @@ -179,11 +121,6 @@ printend my $sth=$dbh->prepare($query); $sth->execute; $sth->finish; - print "data recorded"; - print "
"; - print ""; - print "
"; - # END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB } elsif ($op eq 'delete_confirm') { @@ -192,66 +129,51 @@ printend $sth->execute; my $data=$sth->fetchrow_hashref; $sth->finish; - print mktablehdr; - print mktablerow(2,'#99cc33',bold('Variable'),bold("$searchfield"),'/images/background-mem.gif'); - print "Value$data->{'value'}"; - print "
"; - print "CONFIRM DELETION"; - print "
"; + $template->param(searchfield => $searchfield, + Tvalue => $data->{'value'}, + ); + # END $OP eq DELETE_CONFIRM ################## DELETE_CONFIRMED ################################## # called by delete_confirm, used to effectively confirm deletion of data in DB } elsif ($op eq 'delete_confirmed') { my $dbh = C4::Context->dbh; -# my $searchfield=$input->param('branchcode'); my $sth=$dbh->prepare($reqdel); $sth->execute; $sth->finish; - print "data deleted"; - print "
"; - print ""; - print "
"; # END $OP eq DELETE_CONFIRMED ################## DEFAULT ################################## } else { # DEFAULT - my @inputs=(["text","searchfield",$searchfield], - ["reset","reset","clr"]); - print mkheadr(2,'System preferences admin'); - print mkformnotable("$script_name",@inputs); - if ($searchfield ne '') { - print "You Searched for $searchfield

"; + $template->param(searchfield => "You Searched for $searchfield

"); } - print mktablehdr; - print mktablerow(5,'#99cc33',bold('Variable'),bold('Value'),bold('Explanation'), - ' ',' ','/images/background-mem.gif'); my $env; my ($count,$results)=StringSearch($env,$searchfield,'web'); my $toggle="white"; + my @loop_data = (); for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){ if ($toggle eq 'white'){ - $toggle="#ffffcc"; + $toggle="#ffffcc"; } else { - $toggle="white"; + $toggle="white"; } - print mktablerow(5,$toggle,$results->[$i]{'variable'},$results->[$i]{'value'},$results->[$i]{'explanation'}, - mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'variable'},'Edit'), - mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'variable'},'Delete')); + my %row_data; # get a fresh hash for the row data + $row_data{variable} = $results->[$i]{'variable'}; + $row_data{value} = $results->[$i]{'value'}; + $row_data{explanation} = $results->[$i]{'explanation'}; + $row_data{edit} = "$script_name?op=add_form&searchfield=".$results->[$i]{'variable'}; + $row_data{delete} = "$script_name?op=delete_confirm&searchfield=".$results->[$i]{'variable'}; + push(@loop_data, \%row_data); } - print mktableft; - print "

"; - print ""; + $template->param(loop => \@loop_data); if ($offset>0) { my $prevpage = $offset-$pagesize; - print mklink("$script_name?offset=".$prevpage,'<< Prev'); + $template->param("'); } - print "      "; if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; - print mklink("$script_name?offset=".$nextpage,'Next >>'); + $template->param("a href=$script_name?offset=".$nextpage.'Next >>'); } - print "

"; - print ""; } #---- END $OP eq DEFAULT -print endmenu('admin'); -print endpage(); + +print "Content-Type: text/html\n\n", $template->output; -- 2.39.5