[Koha-cvs] CVS: koha/admin systempreferences.pl,1.26,1.27

[Paul POULAIN]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23908/admin

Modified Files:
	systempreferences.pl 
Log Message:
synch'ing 2.2 and head

Index: systempreferences.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** systempreferences.pl	28 Jul 2005 08:38:15 -0000	1.26
--- systempreferences.pl	4 Aug 2005 12:13:35 -0000	1.27
***************
*** 49,52 ****
--- 49,81 ----
  use C4::Context;
  
+ my %tabsysprefs;
+ $tabsysprefs{acquisitions}="Acquisitions";
+ $tabsysprefs{gist}="Acquisitions";
+ $tabsysprefs{authoritysep}="Authorities";
+ $tabsysprefs{ISBD}="Catalogue";
+ $tabsysprefs{marc}="Catalogue";
+ $tabsysprefs{marcflavour}="Catalogue";
+ $tabsysprefs{SubscriptionHistory}="Catalogue";
+ $tabsysprefs{maxoutstanding}="Circulation";
+ $tabsysprefs{printcirculationslips}="Circulation";
+ $tabsysprefs{ReturnBeforeExpiry}="Circulation";
+ $tabsysprefs{suggestion}="Acquisitions";
+ $tabsysprefs{automembernum}="Members";
+ $tabsysprefs{noissuescharge}="Circulation";
+ $tabsysprefs{opacthemes}="OPAC";
+ $tabsysprefs{opaclanguages}="OPAC";
+ $tabsysprefs{LibraryName}="OPAC";
+ $tabsysprefs{opacstylesheet}="OPAC";
+ $tabsysprefs{BiblioDefaultView}="OPAC";
+ $tabsysprefs{hidelostitem}="OPAC";
+ $tabsysprefs{KohaAdmin}="Admin";
+ $tabsysprefs{checkdigit}="Admin";
+ $tabsysprefs{dateformat}="Admin";
+ $tabsysprefs{insecure}="Admin";
+ $tabsysprefs{ldapinfos}="Admin";
+ $tabsysprefs{ldapserver}="Admin";
+ $tabsysprefs{itemcallnumber}="Catalogue";
+ $tabsysprefs{maxreserves}="Circulation";
+ $tabsysprefs{virtualshelves}="OPAC";
  
  my %tabsysprefs;
***************
*** 95,104 ****
  				while (my $data=$sth->fetchrow_hashref){
  					push(@results,$data);
! 					$cnt ++;
  				}
  				$sth->finish;
  			}
  		}
! 	}else {
  		my $strsth ="Select variable,value,explanation,type,options from systempreferences where variable not in (";  
  		foreach my $syspref (keys %tabsysprefs){
--- 124,133 ----
  				while (my $data=$sth->fetchrow_hashref){
  					push(@results,$data);
! 					$cnt++;
  				}
  				$sth->finish;
  			}
  		}
! 	} else {
  		my $strsth ="Select variable,value,explanation,type,options from systempreferences where variable not in (";  
  		foreach my $syspref (keys %tabsysprefs){
***************
*** 112,116 ****
  		while (my $data=$sth->fetchrow_hashref){
  			push(@results,$data);
! 			$cnt ++;
  		}
  		$sth->finish;
--- 141,145 ----
  		while (my $data=$sth->fetchrow_hashref){
  			push(@results,$data);
! 			$cnt++;
  		}
  		$sth->finish;
***************
*** 334,340 ****
  	my $tab=$input->param('tab');
  	
- 	if  ($searchfield ne '') {
- 		 $template->param(searchfield => "<p>You Searched for <strong>$searchfield</strong></p>");
- 	}
  	my $env;
  	my ($count,$results)=StringSearch($env,$searchfield,$tab);
--- 363,366 ----
***************
*** 342,350 ****
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 		if ($toggle eq 0){
  			$toggle=1;
! 		} else {
  			$toggle=0;
! 		}
  		my %row_data;  # get a fresh hash for the row data
  		$row_data{variable} = $results->[$i]{'variable'};
--- 368,376 ----
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 0){
  			$toggle=1;
! 	  	} else {
  			$toggle=0;
! 	  	}
  		my %row_data;  # get a fresh hash for the row data
  		$row_data{variable} = $results->[$i]{'variable'};
***************
*** 356,359 ****
--- 382,386 ----
  		push(@loop_data, \%row_data);
  	}
+ 	$tab=($tab?$tab:"Others");
  	$template->param(loop => \@loop_data, $tab => 1);
  	if ($offset>0) {