updated release notes for 3.14.0 beta

[koha.git] / admin / roadtype.pl

diff --git a/admin/roadtype.pl b/admin/roadtype.pl
index 5441eb9..6dd4a16 100755 (executable)
--- a/admin/roadtype.pl
+++ b/admin/roadtype.pl
@@ -13,11 +13,13 @@
 # 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+use warnings;
+
 use CGI;
 use C4::Context;
 use C4::Output;
@@ -25,34 +27,23 @@ use C4::Auth;
 
 
 sub StringSearch  {
-       my ($searchstring,$type)=@_;
-       my $dbh = C4::Context->dbh;
-       $searchstring=~ s/\'/\\\'/g;
-       my @data=split(' ',$searchstring);
-       my $count=@data;
-       my $sth=$dbh->prepare("Select * from roadtype where (road_type like ?)");
-       $sth->execute("$data[0]%");
-       my @results;
-       while (my $data=$sth->fetchrow_hashref){
-       push(@results,$data);
-       }
-       #  $sth->execute;
-       $sth->finish;
-       return (scalar(@results),\@results);
+    my $sth = C4::Context->dbh->prepare("Select * from roadtype where (road_type like ?) ORDER BY road_type");
+    $sth->execute((shift || '') . '%');
+    return $sth->fetchall_arrayref({});
 }
 
 my $input = new CGI;
 my $searchfield=$input->param('road_type');
 my $script_name="/cgi-bin/koha/admin/roadtype.pl";
 my $roadtypeid=$input->param('roadtypeid');
-my $op = $input->param('op');
+my $op = $input->param('op') || '';
 
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "admin/roadtype.tmpl",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {parameters => 1},
+                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
                             debug => 1,
                             });
 
@@ -107,18 +98,10 @@ if ($op eq 'add_form') {
 } elsif ($op eq 'delete_confirm') {
        $template->param(delete_confirm => 1);
        my $dbh = C4::Context->dbh;
-       my $sth=$dbh->prepare("select count(*) as total from borrowers,roadtype where borrowers.streettype=roadtype.road_type and roadtypeid=?");
-       $sth->execute($roadtypeid);
-       my $total = $sth->fetchrow_hashref;
-       $sth->finish;
-       $template->param(total => $total->{'total'});   
        my $sth2=$dbh->prepare("select roadtypeid,road_type from roadtype where  roadtypeid=?");
        $sth2->execute($roadtypeid);
        my $data=$sth2->fetchrow_hashref;
        $sth2->finish;
-       if ($total->{'total'} >0) {
-               $template->param(totalgtzero => 1);
-       }
 
         $template->param(      
                                road_type       =>      ( $data->{'road_type'}),
@@ -139,24 +122,7 @@ if ($op eq 'add_form') {
                                                                                                        # END $OP eq DELETE_CONFIRMED
 } else { # DEFAULT
        $template->param(else => 1);
-       my @loop;
-       my ($count,$results)=StringSearch($searchfield,'web');
-       my $toggle = 0;
-       for (my $i=0; $i < $count; $i++){
-               my %row = (roadtypeid => $results->[$i]{'roadtypeid'},
-                               road_type => $results->[$i]{'road_type'},
-                               toggle => $toggle );    
-               push @loop, \%row;
-               if ( $toggle eq 0 )
-               {
-                       $toggle = 1;
-               }
-               else
-               {
-                       $toggle = 0;
-               }
-       }
-       $template->param(loop => \@loop);
+       $template->param(loop => StringSearch($searchfield));
 
 
 } #---- END $OP eq DEFAULT