X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmembers-home.pl;h=5e474bb9e99cf6797b3d42b09b4fc95b05cd1436;hb=13ca4962068b184f803b6588e53e39209a77f2b6;hp=04fc557045ac43f295466add0b03d64c86da3974;hpb=3452d0f2673ef7c110829329c5ff29848d0c7e81;p=koha-ffzg.git

diff --git a/members/members-home.pl b/members/members-home.pl
index 04fc557045..5e474bb9e9 100755
--- a/members/members-home.pl
+++ b/members/members-home.pl
@@ -1,65 +1,76 @@
 #!/usr/bin/perl
 
+# Parts Copyright Biblibre 2010
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
 use C4::Context;
 use C4::Members;
-use C4::Branch;
-use C4::Category;
+use Koha::Patron::Modifications;
+use Koha::Libraries;
+use Koha::List::Patron;
+use Koha::Patron::Categories;
 
 my $query = new CGI;
-my $quicksearch = $query->param('quicksearch');
 my $branch = $query->param('branchcode');
-my ($template, $loggedinuser, $cookie);
-my $template_name;
 
-if($quicksearch){
-($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
-                 query => $query,
-                 type => "intranet",
-                 authnotrequired => 0,
-                 flagsrequired => {borrowers => 1},
-                 debug => 1,
-                 });
-} else {
-($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/member.tmpl",
+$branch = q{} unless defined $branch;
+
+my ($template, $loggedinuser, $cookie)
+    = get_template_and_user({template_name => "members/member.tt",
                  query => $query,
                  type => "intranet",
                  authnotrequired => 0,
                  flagsrequired => {borrowers => 1},
                  debug => 1,
                  });
+
+my $no_add = 0;
+if( Koha::Libraries->search->count < 1){
+    $no_add = 1;
+    $template->param(no_branches => 1);
 }
-my @categories=C4::Category->all;
-$template->param(
-    branchloop=>(defined $branch?GetBranchesLoop($branch):GetBranchesLoop()),
-	categories=>\@categories,
-);
+
+my @categories = Koha::Patron::Categories->search_limited;
+if(scalar(@categories) < 1){
+    $no_add = 1;
+    $template->param(no_categories => 1);
+}
+else {
+    $template->param(categories=>\@categories);
+}
+
+
+my $pending_borrower_modifications =
+  Koha::Patron::Modifications->pending_count( $branch );
+
 $template->param( 
-        "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
+        no_add => $no_add,
+        pending_borrower_modifications => $pending_borrower_modifications,
             );
-my @letters = map { {letter => $_} } ( 'A' .. 'Z');
-$template->param( letters => \@letters );
+
+$template->param(
+    alphabet => C4::Context->preference('alphabet') || join (' ', 'A' .. 'Z'),
+    patron_lists => [ GetPatronLists() ],
+    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;