updated release notes for 3.14.0 beta

[koha.git] / admin / roadtype.pl

diff --git a/admin/roadtype.pl b/admin/roadtype.pl
index f0eff57..6dd4a16 100755 (executable)
--- a/admin/roadtype.pl
+++ b/admin/roadtype.pl
@@ -13,48 +13,37 @@
 # 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;
-use C4::Search;
-use HTML::Template;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+
 
 sub StringSearch  {
-       my ($env,$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, management => 1},
+                 flagsrequired => {parameters => 'parameters_remaining_permissions'},
                             debug => 1,
                             });
 
@@ -91,16 +80,16 @@ if ($op eq 'add_form') {
        my $sth;
        
        if ($input->param('roadtypeid') ){
-               $sth=$dbh->prepare("replace roadtype (roadtypeid,road_type) values (?,?) ");
-               $sth->execute(map { $input->param($_) } ('roadtypeid','road_type'));
+               $sth=$dbh->prepare("UPDATE roadtype SET road_type=? WHERE roadtypeid=?");
+               $sth->execute($input->param('road_type'),$input->param('roadtypeid'));
        
        }
        else{   
-               $sth=$dbh->prepare("replace roadtype (road_type) values (?)");
-               $sth->execute(map { $input->param($_) } ('road_type'));
+               $sth=$dbh->prepare("INSERT INTO roadtype (road_type) VALUES (?)");
+               $sth->execute($input->param('road_type'));
        }
        $sth->finish;
-       print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=roadtype.pl\"></html>";
+    print $input->redirect("/cgi-bin/koha/admin/roadtype.pl");
        exit;
 
 # END $OP eq ADD_VALIDATE
@@ -109,21 +98,13 @@ 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(      
-                               city_name       =>      ( $data->{'road_type'}),
+                               road_type       =>      ( $data->{'road_type'}),
                                );
 
 
@@ -141,26 +122,8 @@ if ($op eq 'add_form') {
                                                                                                        # END $OP eq DELETE_CONFIRMED
 } else { # DEFAULT
        $template->param(else => 1);
-       my $env;
-       my @loop;
-       my ($count,$results)=StringSearch($env,$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
-output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file
+output_html_with_http_headers $input, $cookie, $template->output;