(bug #4358) fix sql query in C4::Members::GetAllIssues
[koha.git] / admin / branches.pl
index d8bee7e..f2bc827 100755 (executable)
 #!/usr/bin/perl
 
-#script to administer the aqbudget table
-#written 20/02/2002 by paul.poulain@free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# ALGO :
-# this script use an $op to know what to do.
-# if $op is empty or none of the above values,
-#      - the default screen is build (with all records, or filtered datas).
-#      - the   user can clic on add, modify or delete record.
-# if $op=add_form
-#      - if primkey exists, this is a modification,so we read the $primkey record
-#      - builds the add/modify form
-# if $op=add_validate
-#      - the user has just send datas, so we create/modify the record
-# if $op=delete_form
-#      - we show the record having primkey=$primkey and ask for deletion validation form
-# if $op=delete_confirm
-#      - we delete the record having primkey=$primkey
+# Copyright 2000-2002 Katipo Communications
+#
+# 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 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
+
+=head1 branches.pl
+
+ FIXME: individual fields in branch address need to be exported to templates,
+        in order to fix bug 180; need to notify translators
+FIXME: looped html (e.g., list of checkboxes) need to be properly
+        TMPL_LOOP'ized; doing this properly will fix bug 130; need to
+        notify translators
+ FIXME: need to implement the branch categories stuff
+ FIXME: there are too many TMPL_IF's; the proper way to do it is to have
+        separate templates for each individual action; need to notify
+        translators
+ FIXME: there are lots of error messages exported to the template; a lot
+        of these should be converted into exported booleans / counters etc
+        so that the error messages can be localized; need to notify translators
+
+ NOTE:  heading() should now be called like this:
+        1. Use heading() as before
+        2. $template->param('heading-LISPISHIZED-HEADING-p' => 1);
+        3. $template->param('use-heading-flags-p' => 1);
+        This ensures that both converted and unconverted templates work
+
+ Finlay working on this file from 26-03-2002
+ Reorganising this branches admin page.....
+=cut
 
 use strict;
-use C4::Output;
+use warnings;
 use CGI;
-use C4::Search;
-use C4::Database;
-
-sub StringSearch  {
-       my ($env,$searchstring,$type)=@_;
-       my $dbh = &C4Connect;
-       $searchstring=~ s/\'/\\\'/g;
-       my @data=split(' ',$searchstring);
-       my $count=@data;
-       my $query="Select branchcode,branchname,branchaddress1,branchaddress2,branchaddress3,branchphone,branchfax,branchemail,issuing from branches where (branchcode like \"$data[0]%\") order by branchcode";
-       my $sth=$dbh->prepare($query);
-       $sth->execute;
-       my @results;
-       my $cnt=0;
-       while (my $data=$sth->fetchrow_hashref){
-       push(@results,$data);
-       $cnt ++;
-       }
-       #  $sth->execute;
-       $sth->finish;
-       $dbh->disconnect;
-       return ($cnt,\@results);
+use C4::Auth;
+use C4::Context;
+use C4::Output;
+use C4::Koha;
+use C4::Branch;
+
+# Fixed variables
+my $script_name = "/cgi-bin/koha/admin/branches.pl";
+my $pagesize    = 20;
+
+################################################################################
+# Main loop....
+my $input        = new CGI;
+my $branchcode   = $input->param('branchcode');
+my $branchname   = $input->param('branchname');
+my $categorycode = $input->param('categorycode');
+my $op           = $input->param('op');
+
+if(!defined($op)){
+  $op = '';
 }
 
-my $input = new CGI;
-my $searchfield=$input->param('searchfield');
-my $pkfield="branchcode";
-my $reqsel="select branchcode,branchname,branchaddress1,branchaddress2,branchaddress3,branchphone,branchfax,branchemail,issuing from branches where branchcode='$searchfield'";
-my $reqdel="delete from branches where branchcode='$searchfield'";
-#my $branchcode=$input->param('branchcode');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/branches.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
-if ($op eq 'add_form') {
-       #---- if primkey exists, it's a modify action, so read values to modify...
-       my $data;
-       if ($searchfield) {
-               my $dbh = &C4Connect;
-               my $sth=$dbh->prepare("select branchcode,branchname,branchaddress1,branchaddress2,branchaddress3,branchphone,branchfax,branchemail,issuing  from branches where branchcode='$searchfield'");
-               $sth->execute;
-               $data=$sth->fetchrow_hashref;
-               $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.searchfield.value.length==0) {
-                       _alertString += "- branch code missing\\n";
-               }
-               if (f.branchname.value.length==0) {
-                       _alertString += "- branch name 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 branch</h1>";
-       } else {
-               print "<h1>Add branch</h1>";
-       }
-       print "<form action='$script_name' name=Aform method=post>";
-       print "<input type=hidden name=op value='add_validate'>";
-       print "<table>";
-       if ($searchfield) {
-               print "<tr><td>Branch code</td><td><input type=hidden name=searchfield value=$searchfield>$searchfield</td></tr>";
-       } else {
-               print "<tr><td>Branch code</td><td><input type=text name=searchfield size=5 maxlength=5 onBlur=toUC(this)></td></tr>";
-       }
-       print "<tr><td>Name</td><td><input type=text name=branchname size=40 maxlength=80 value='$data->{'branchname'}'>&nbsp;</td></tr>";
-       print "<tr><td>Adress</td><td><input type=text name=branchaddress1 value='$data->{'branchaddress1'}'></td></tr>";
-       print "<tr><td>&nbsp;</td><td><input type=text name=branchaddress2 value='$data->{'branchaddress2'}'></td></tr>";
-       print "<tr><td>&nbsp;</td><td><input type=text name=branchaddress3 value='$data->{'branchaddress3'}'></td></tr>";
-       print "<tr><td>Phone</td><td><input type=text name=branchphone value='$data->{'branchphone'}'></td></tr>";
-       print "<tr><td>Fax</td><td><input type=text name=branchfax value='$data->{'branchfax'}'></td></tr>";
-       print "<tr><td>E-mail</td><td><input type=text name=branchemail value='$data->{'branchemail'}'></td></tr>";
-       print "<tr><td>Issuing</td><td><input type=text name=issuing value='$data->{'issuing'}'></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
-} elsif ($op eq 'add_validate') {
-       my $dbh=C4Connect;
-       my $query = "replace branches (branchcode,branchname,branchaddress1,branchaddress2,branchaddress3,branchphone,branchfax,branchemail,issuing) values (";
-       $query.= $dbh->quote($input->param('branchcode')).",";
-       $query.= $dbh->quote($input->param('branchname')).",";
-       $query.= $dbh->quote($input->param('branchaddress1')).",";
-       $query.= $dbh->quote($input->param('branchaddress2')).",";
-       $query.= $dbh->quote($input->param('branchaddress3')).",";
-       $query.= $dbh->quote($input->param('branchphone')).",";
-       $query.= $dbh->quote($input->param('branchfax')).",";
-       $query.= $dbh->quote($input->param('branchemail')).",";
-       $query.= $dbh->quote($input->param('issuing')).")";
-       my $sth=$dbh->prepare($query);
-       $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
-} elsif ($op eq 'delete_confirm') {
-       my $dbh = &C4Connect;
-       my $sth=$dbh->prepare("select count(*) as total from borrowers where branchcode='$searchfield'");
-       $sth->execute;
-       my $total = $sth->fetchrow_hashref;
-       $sth->finish;
-       print "$reqsel";
-       my $sth=$dbh->prepare($reqsel);
-       $sth->execute;
-       my $data=$sth->fetchrow_hashref;
-       $sth->finish;
-       print mktablehdr;
-       print mktablerow(2,'#99cc33',bold('Branch code'),bold("$searchfield"),'/images/background-mem.gif');
-       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>Branch code</td><td>$data->{'branchcode'}</td></tr>";
-       print "<tr><td>&nbsp; name</td><td>$data->{'branchname'}</td></tr>";
-       print "<tr><td>&nbsp; adress</td><td>$data->{'branchaddress1'}</td></tr>";
-       print "<tr><td>&nbsp;</td><td>$data->{'branchaddress2'}</td></tr>";
-       print "<tr><td>&nbsp;</td><td>$data->{'branchaddress3'}</td></tr>";
-       print "<tr><td>&nbsp;phone</td><td>$data->{'branchphone'}</td></tr>";
-       print "<tr><td>&nbsp; fax</td><td>$data->{'branchfax'}</td></tr>";
-       print "<tr><td>&nbsp; e-mail</td><td>$data->{'branchemail'}</td></tr>";
-       print "<tr><td>&nbsp; issuing</td><td>$data->{'issuing'}</td></tr>";
-       if ($total->{'total'} >0) {
-               print "<tr><td colspan=2 align=center><b>This record is used $total->{'total'} times. Deletion not possible</b></td></tr>";
-               print "<tr><td colspan=2></form><form action='$script_name' method=post><input type=submit value=OK></form></td></tr>";
-       } else {
-               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 ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-       my $dbh=C4Connect;
-#      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,'branches admin');
-       print mkformnotable("$script_name",@inputs);
-       print <<printend
-
-printend
-       ;
-       if  ($searchfield ne '') {
-               print "You Searched for <b>$searchfield<b><p>";
-       }
-       print mktablehdr;
-       print mktablerow(9,'#99cc33',bold('Branch code'),bold('name'),bold('adress'),
-       bold('phone'),bold('fax'),bold('mail'),bold('issuing'),
-       '&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++){
-               #find out stats
-       #       my ($od,$issue,$fines)=categdata2($env,$results->[$i]{'borrowernumber'});
-       #       $fines=$fines+0;
-               if ($toggle eq 'white'){
-                       $toggle="#ffffcc";
-               } else {
-                       $toggle="white";
-               }
-               print mktablerow(9,$toggle,$results->[$i]{'branchcode'},$results->[$i]{'branchname'},
-               $results->[$i]{'branchaddress1'}.$results->[$i]{'branchaddress2'}.$results->[$i]{'branchaddress3'},
-               $results->[$i]{'branchphone'},,$results->[$i]{'branchfax'},,$results->[$i]{'branchmail'},,$results->[$i]{'issuing'},
-               mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'branchcode'},'Edit'),
-               mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'branchcode'},'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');
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "admin/branches.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { parameters => 1},
+        debug           => 1,
+    }
+);
+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
+}
+$template->param( action => $script_name );
+if ( $op eq 'add' ) {
+
+    # If the user has pressed the "add new branch" button.
+    $template->param( 'heading-branches-add-branch-p' => 1 );
+    editbranchform($branchcode,$template);
+
+}
+elsif ( $op eq 'edit' ) {
+
+    # if the user has pressed the "edit branch settings" button.
+    $template->param( 'heading-branches-add-branch-p' => 0,
+                        'add' => 1, );
+    editbranchform($branchcode,$template);
+}
+elsif ( $op eq 'add_validate' ) {
+
+    # confirm settings change...
+    my $params = $input->Vars;
+    unless ( $params->{'branchcode'} && $params->{'branchname'} ) {
+        $template->param( else => 1 );
+        default("MESSAGE1",$template);
+    }
+    else {
+        my $error = ModBranch($params);
+        # if error saving, stay on edit and rise error
+        if ($error) {
+            # copy input parameters back to form
+            # FIXME - doing this doesn't preserve any branch group selections, but good enough for now
+            $template->param(%$params);
+            $template->param(branch_name => $params->{branchname});
+            $template->param( 'heading-branches-add-branch-p' => 1, 'add' => 1, "ERROR$error" => 1 );
+        } else {
+            $template->param( else => 1);
+            default("MESSAGE2",$template);
+        }
+    }
+}
+elsif ( $op eq 'delete' ) {
+    # if the user has pressed the "delete branch" button.
+    
+    # check to see if the branchcode is being used in the database somewhere....
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare("select count(*) from items where holdingbranch=? or homebranch=?");
+    $sth->execute( $branchcode, $branchcode );
+    my ($total) = $sth->fetchrow_array;
+    $sth->finish;
+    
+    my $message;
+
+    if ($total) {
+        $message = "MESSAGE7";
+    }
+   
+    if ($message) {
+        $template->param( else => 1 );
+        default($message,$template);
+    }
+    else {
+        $template->param( branchname     => $branchname );
+        $template->param( delete_confirm => 1 );
+        $template->param( branchcode     => $branchcode );
+    }
+}
+elsif ( $op eq 'delete_confirmed' ) {
+
+    # actually delete branch and return to the main screen....
+    DelBranch($branchcode);
+    $template->param( else => 1 );
+    default("MESSAGE3",$template);
+}
+elsif ( $op eq 'editcategory' ) {
+
+    # If the user has pressed the "add new category" or "modify" buttons.
+    $template->param( 'heading-branches-edit-category-p' => 1 );
+    editcatform($categorycode,$template);
+}
+elsif ( $op eq 'addcategory_validate' ) {
+
+    # confirm settings change...
+    my $params = $input->Vars;
+    unless ( $params->{'categorycode'} && $params->{'categoryname'} ) {
+        $template->param( else => 1 );
+        default("MESSAGE4",$template);
+    }
+    else {
+        ModBranchCategoryInfo($params);
+        $template->param( else => 1 );
+        default("MESSAGE5",$template);
+    }
+}
+elsif ( $op eq 'delete_category' ) {
+
+    # if the user has pressed the "delete branch" button.
+    my $message = "MESSAGE8" if CheckBranchCategorycode($categorycode);
+    if ($message) {
+        $template->param( else => 1 );
+        default($message,$template);
+    }
+    else {
+        $template->param( delete_category => 1 );
+        $template->param( categorycode    => $categorycode );
+    }
+}
+elsif ( $op eq 'categorydelete_confirmed' ) {
+
+    # actually delete branch and return to the main screen....
+    DelBranchCategory($categorycode);
+    $template->param( else => 1 );
+    default("MESSAGE6",$template);
+
+}
+else {
+
+    # if no operation has been set...
+    default("",$template);
+}
+
+################################################################################
+#
+# html output functions....
+
+sub default {
+    my ($message,$innertemplate) = @_;
+    $innertemplate->param( 'heading-branches-p' => 1 );
+    $innertemplate->param( "$message"           => 1 );
+    $innertemplate->param( action               => $script_name );
+    branchinfotable("",$innertemplate);
+}
+
+sub editbranchform {
+    my ($branchcode,$innertemplate) = @_;
+    # initiate the scrolling-list to select the printers
+    my $printers = GetPrinters();
+    my @printerloop;
+    my $printercount = 0;
+    my $oldprinter;
+    my $CGIprinter;
+    
+    my $data;
+
+    if ($branchcode) {
+        $data = GetBranchInfo($branchcode);
+        $data = $data->[0];
+
+        # get the old printer of the branch
+        $oldprinter = $data->{'branchprinter'};
+
+        #      printer loop
+        foreach my $thisprinter ( keys %$printers ) {
+
+            my $selected = 1
+              if $oldprinter and ( $oldprinter eq $printers->{$thisprinter} );
+
+            my %row = (
+                value         => $thisprinter,
+                selected      => $selected,
+                branchprinter => $printers->{$thisprinter}->{'printqueue'},
+            );
+            push @printerloop, \%row;
+        }
+
+        $innertemplate->param( 
+             printerloop    => \@printerloop,
+             branchcode     => $data->{'branchcode'},
+             branch_name    => $data->{'branchname'},
+             branchaddress1 => $data->{'branchaddress1'},
+             branchaddress2 => $data->{'branchaddress2'},
+             branchaddress3 => $data->{'branchaddress3'},
+             branchphone    => $data->{'branchphone'},
+             branchfax      => $data->{'branchfax'},
+             branchemail    => $data->{'branchemail'},
+             branchip       => $data->{'branchip'} 
+        );
+    }
+    else {    #case of an add branch select printer
+        foreach my $thisprinter ( keys %$printers ) {
+            my %row = (
+                value         => $thisprinter,
+                branchprinter => $printers->{$thisprinter}->{'printqueue'},
+            );
+            push @printerloop, \%row;
+        }
+        $innertemplate->param( printerloop => \@printerloop );
+    }
+
+    # make the checkboxs.....
+    #
+    # We export a "categoryloop" array to the template, each element of which
+    # contains separate 'categoryname', 'categorycode', 'codedescription', and
+    # 'checked' fields. The $checked field is either '' or 'checked'
+    # (see bug 130)
+    #
+    my $catinfo = GetBranchCategory();
+    my $catcheckbox;
+
+    #    print DEBUG "catinfo=".cvs($catinfo)."\n";
+    my @categoryloop = ();
+    foreach my $cat (@$catinfo) {
+        my $checked = "";
+        my $tmp     = quotemeta( $cat->{'categorycode'} );
+        if ( grep { /^$tmp$/ } @{ $data->{'categories'} } ) {
+            $checked = "checked=\"checked\"";
+        }
+        push @categoryloop,
+          {
+            categoryname    => $cat->{'categoryname'},
+            categorycode    => $cat->{'categorycode'},
+            categorytype    => $cat->{'categorytype'},
+            codedescription => $cat->{'codedescription'},
+            checked         => $checked,
+          };
+    }
+    $innertemplate->param( categoryloop => \@categoryloop );
+
+    # {{{ Leave this here until bug 130 is completely resolved in the templates
+    for my $obsolete ( 'categoryname', 'categorycode', 'codedescription' ) {
+        $innertemplate->param(
+            $obsolete => 'Your template is out of date (bug 130)' );
+    }
+
+    # }}}
+}
+
+sub editcatform {
+
+    # prepares the edit form...
+    my ($categorycode,$innertemplate) = @_;
+    warn "cat : $categorycode";
+    my $data;
+       my @cats;
+    $innertemplate->param( categorytype => \@cats);
+       if ($categorycode) {
+        $data = GetBranchCategory($categorycode);
+        $data = $data->[0];
+        $innertemplate->param( categorycode    => $data->{'categorycode'} ,
+                                       categoryname    => $data->{'categoryname'},
+                                       codedescription => $data->{'codedescription'} ,
+                                               );
+    }
+       for my $ctype (GetCategoryTypes()) {
+               push @cats , { type => $ctype , selected => ($data->{'categorytype'} eq $ctype) };
        }
-       print "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-       if ($offset+$pagesize<$count) {
-               my $nextpage =$offset+$pagesize;
-               print mklink("$script_name?offset=".$nextpage,'Next &gt;&gt;');
+}
+
+sub deleteconfirm {
+
+    # message to print if the
+    my ($branchcode) = @_;
+}
+
+sub branchinfotable {
+
+# makes the html for a table of branch info from reference to an array of hashs.
+
+    my ($branchcode,$innertemplate) = @_;
+    my $branchinfo;
+    if ($branchcode) {
+        $branchinfo = GetBranchInfo($branchcode);
+    }
+    else {
+        $branchinfo = GetBranchInfo();
+    }
+    my $toggle;
+    my $i = 0;
+    my @loop_data = ();
+    foreach my $branch (@$branchinfo) {
+        ( $i % 2 ) ? ( $toggle = 1 ) : ( $toggle = 0 );
+
+        #
+        # We export the following fields to the template. These are not
+        # pre-composed as a single "address" field because the template
+        # might (and should) escape what is exported here. (See bug 180)
+        #
+        # - color
+        # - branch_name     (Note: not "branchname")
+        # - branch_code     (Note: not "branchcode")
+        # - address         (containing a static error message)
+        # - branchaddress1 \
+        # - branchaddress2  |
+        # - branchaddress3  | comprising the old "address" field
+        # - branchphone     |
+        # - branchfax       |
+        # - branchemail    /
+        # - address-empty-p (1 if no address information, 0 otherwise)
+        # - categories      (containing a static error message)
+        # - category_list   (loop containing "categoryname")
+        # - no-categories-p (1 if no categories set, 0 otherwise)
+        # - value
+        # - action
+        #
+        my %row = ();
+
+        # Handle address fields separately
+        my $address_empty_p = 1;
+        for my $field (
+            'branchaddress1', 'branchaddress2',
+            'branchaddress3', 'branchphone',
+            'branchfax',      'branchemail',
+            'branchip',       'branchprinter'
+          )
+        {
+            $row{$field} = $branch->{$field};
+            if ( $branch->{$field} ) {
+                $address_empty_p = 0;
+            }
+        }
+        $row{'address-empty-p'} = $address_empty_p;
+
+        # {{{ Leave this here until bug 180 is completely resolved in templates
+        $row{'address'} = 'Your template is out of date (see bug 180)';
+
+        # }}}
+
+        # Handle categories
+        my $no_categories_p = 1;
+        my @categories;
+        foreach my $cat ( @{ $branch->{'categories'} } ) {
+            my ($catinfo) = @{ GetBranchCategory($cat) };
+            push @categories, { 'categoryname' => $catinfo->{'categoryname'} };
+            $no_categories_p = 0;
+        }
+
+        # {{{ Leave this here until bug 180 is completely resolved in templates
+        $row{'categories'} = 'Your template is out of date (see bug 180)';
+
+        # }}}
+        $row{'category_list'}   = \@categories;
+        $row{'no-categories-p'} = $no_categories_p;
+
+        # Handle all other fields
+        $row{'branch_name'} = $branch->{'branchname'};
+        $row{'branch_code'} = $branch->{'branchcode'};
+        $row{'toggle'}      = $toggle;
+        $row{'value'}       = $branch->{'branchcode'};
+        $row{'action'}      = '/cgi-bin/koha/admin/branches.pl';
+
+        push @loop_data, {%row};
+        $i++;
+    }
+    my @branchcategories = ();
+       for my $ctype ( GetCategoryTypes() ) {
+       my $catinfo = GetBranchCategories(undef,$ctype);
+       my @categories;
+               foreach my $cat (@$catinfo) {
+               push @categories,
+                 {
+                   categoryname    => $cat->{'categoryname'},
+                   categorycode    => $cat->{'categorycode'},
+                   codedescription => $cat->{'codedescription'},
+                   categorytype => $cat->{'categorytype'},
+                 };
+       }
+       push @branchcategories, { categorytype => $ctype , $ctype => 1 , catloop => \@categories};
        }
-       print "<br><input type=image src=\"/images/button-add-member.gif\"  WIDTH=188  HEIGHT=44  ALT=\"Add budget\" BORDER=0 ></a><br>";
-       print "</form>";
-} #---- END $OP eq DEFAULT
-print endmenu('admin');
-print endpage();
+    $innertemplate->param(
+        branches         => \@loop_data,
+        branchcategories => \@branchcategories
+    );
+
+}
+
+# FIXME logic seems wrong   ##  sub is not used.
+sub branchcategoriestable {
+    my $innertemplate = shift;
+    #Needs to be implemented...
+
+    my $categoryinfo = GetBranchCategory();
+    my $color;
+    foreach my $cat (@$categoryinfo) {
+        $innertemplate->param( categoryname    => $cat->{'categoryname'} );
+        $innertemplate->param( categorycode    => $cat->{'categorycode'} );
+        $innertemplate->param( codedescription => $cat->{'codedescription'} );
+    }
+}
+
+output_html_with_http_headers $input, $cookie, $template->output;
+
+# Local Variables:
+# tab-width: 8
+# End: