[Koha-cvs] CVS: koha/admin systempreferences.pl,1.7,1.8

Mon Oct 7 11:35:50 CEST 2002

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv10445

Modified Files:
	systempreferences.pl 
Log Message:


Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** systempreferences.pl	5 Oct 2002 10:03:32 -0000	1.7
--- systempreferences.pl	7 Oct 2002 09:35:48 -0000	1.8
***************
*** 43,46 ****
--- 43,49 ----
  use C4::Output;
  use C4::Search;
+ use HTML::Template;
+ use C4::Context;
+ 
  
  sub StringSearch  {
***************
*** 59,63 ****
  	$cnt ++;
  	}
- 	#  $sth->execute;
  	$sth->finish;
  	return ($cnt,\@results);
--- 62,65 ----
***************
*** 72,84 ****
  my $script_name="/cgi-bin/koha/admin/systempreferences.pl";
  
  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');
  
  ################## ADD_FORM ##################################
  # called by default. Used to create form to add or  modify a record
--- 74,89 ----
  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;
  
+ 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
***************
*** 93,172 ****
  		$sth->finish;
  	}
- 	print <<printend
- 	<script>
- 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
- 	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);
- 		}
- 	}
- 	</SCRIPT>
- printend
- ;#/
  	if ($searchfield) {
! 		print "<h1>Modify pref</h1>";
  	} else {
! 		print "<h1>Add pref</h1>";
  	}
! 	print "<form action='$script_name' name=Aform method=post>";
! 	print "<input type=hidden name=op value='add_validate'>";
! 	print "<input type=hidden name=explanation value='".$data->{'explanation'}."'>";
! 	print "<table>";
  	if ($searchfield) {
! 		print "<tr><td>Variable</td><td><input type=hidden name=variable value='$searchfield'>$searchfield</td></tr>";
  	} else {
! 		print "<tr><td>Variable</td><td><input type=text name=variable size=255 maxlength=255></td></tr>";
  	}
- 	print "<tr><td>Value</td><td><input type=text name=value value='$data->{'value'}'></td></tr>";
- 	print "<tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>";
- 	print "</table>";
- 	print "</form>";
- ;
- 													# END $OP eq ADD_FORM
  ################## ADD_VALIDATE ##################################
  # called by add_form, used to insert/modify data in DB
--- 98,114 ----
  		$sth->finish;
  	}
  	if ($searchfield) {
! 		$template->param(action => "Modify pref");
  	} else {
! 		$template->param(action => "Add pref");
  	}
! 	$template->param(explanation => $data->{'explanation'},
! 							value => $data->{'value'},
! 							);
  	if ($searchfield) {
! 		$template->param(searchfield => "<input type=hidden name=variable value='$searchfield'>$searchfield");
  	} else {
! 		$template->param(searchfield => "<input type=text name=variable size=80 maxlength=80>");
  	}
  ################## ADD_VALIDATE ##################################
  # called by add_form, used to insert/modify data in DB
***************
*** 180,188 ****
  	$sth->execute;
  	$sth->finish;
- 	print "data recorded";
- 	print "<form action='$script_name' method=post>";
- 	print "<input type=submit value=OK>";
- 	print "</form>";
- 													# END $OP eq ADD_VALIDATE
  ################## DELETE_CONFIRM ##################################
  # called by default form, used to confirm deletion of data in DB
--- 122,125 ----
***************
*** 193,202 ****
  	my $data=$sth->fetchrow_hashref;
  	$sth->finish;
! 	print mktablehdr;
! 	print mktablerow(2,'#99cc33',bold('Variable'),bold("$searchfield"),'/images/background-mem.gif');
! 	print "<tr><td>Value</td><td>$data->{'value'}</td></tr>";
! 	print "<form action='$script_name' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=searchfield value='$searchfield'>";
! 	print "<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>";
! 	print "<tr><td><INPUT type=submit value='YES'></form></td><td><form action='$script_name' method=post><input type=submit value=NO></form></td></tr>";
  													# END $OP eq DELETE_CONFIRM
  ################## DELETE_CONFIRMED ##################################
--- 130,137 ----
  	my $data=$sth->fetchrow_hashref;
  	$sth->finish;
! 	$template->param(searchfield => $searchfield,
! 							Tvalue => $data->{'value'},
! 							);
! 
  													# END $OP eq DELETE_CONFIRM
  ################## DELETE_CONFIRMED ##################################
***************
*** 204,257 ****
  } 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 "<form action='$script_name' method=post>";
- 	print "<input type=submit value=OK>";
- 	print "</form>";
  													# 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", at inputs);
- 
  	if  ($searchfield ne '') {
! 		print "You Searched for <b>$searchfield<b><p>";
  	}
- 	print mktablehdr;
- 	print mktablerow(5,'#99cc33',bold('Variable'),bold('Value'),bold('Explanation'),
- 	'&nbsp;','&nbsp;','/images/background-mem.gif');
  	my $env;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
  	my $toggle="white";
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
  	  	if ($toggle eq 'white'){
! 	    		$toggle="#ffffcc";
  	  	} else {
! 	    		$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'));
! 	}
! 	print mktableft;
! 	print "<form action='$script_name' method=post>";
! 	print "<input type=hidden name=op value=add_form>";
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
! 		print mklink("$script_name?offset=".$prevpage,'&lt;&lt; Prev');
  	}
- 	print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
  	if ($offset+$pagesize<$count) {
  		my $nextpage =$offset+$pagesize;
! 		print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
  	}
- 	print "<br><input type=image src=\"/images/button-add-new.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
- 	print "</form>";
  } #---- END $OP eq DEFAULT
! print endmenu('admin');
! print endpage();
--- 139,179 ----
  } elsif ($op eq 'delete_confirmed') {
  	my $dbh = C4::Context->dbh;
  	my $sth=$dbh->prepare($reqdel);
  	$sth->execute;
  	$sth->finish;
  													# END $OP eq DELETE_CONFIRMED
  ################## DEFAULT ##################################
  } else { # DEFAULT
  	if  ($searchfield ne '') {
! 		 $template->param(searchfield => "You Searched for <b>$searchfield<b><p>");
  	}
  	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";
  	  	} else {
! 			$toggle="white";
  	  	}
! 		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);
! 	}
! 	$template->param(loop => \@loop_data);
  	if ($offset>0) {
  		my $prevpage = $offset-$pagesize;
! 		$template->param("<a href=$script_name?offset=".$prevpage.'&lt;&lt; Prev</a>');
  	}
  	if ($offset+$pagesize<$count) {
  		my $nextpage =$offset+$pagesize;
! 		$template->param("a href=$script_name?offset=".$nextpage.'Next &gt;&gt;</a>');
  	}
  } #---- END $OP eq DEFAULT
! 
! print "Content-Type: text/html\n\n", $template->output;