X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=labels%2Flabel-edit-template.pl;h=c06a9f10ffa5294f4a9b499131242d7ebccdcbc7;hb=0646478be01a63fa0b6dc666f23a915ceefd5619;hp=f367a65eca30ff8d7956d05d9b2253fc2697bb4e;hpb=60b6c187c46614431f109512c740a3bcf077f342;p=koha.git

diff --git a/labels/label-edit-template.pl b/labels/label-edit-template.pl
index f367a65eca..c06a9f10ff 100755
--- a/labels/label-edit-template.pl
+++ b/labels/label-edit-template.pl
@@ -5,23 +5,23 @@
 #
 # 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
@@ -31,7 +31,7 @@ use C4::Labels;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "labels/label-edit-template.tmpl",
+        template_name   => "labels/label-edit-template.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
@@ -61,22 +61,22 @@ if ($op eq 'edit') {
     }
 }
 elsif ($op eq 'save') {
-    my @params = (      profile_id      => $cgi->param('profile_id'),
-                        template_code   => $cgi->param('template_code') || 'DEFAULT_TEMPLATE',
-                        template_desc   => $cgi->param('template_desc') || 'Default description',
-                        page_width      => $cgi->param('page_width') || 0,
-                        page_height     => $cgi->param('page_height') || 0,
-                        label_width     => $cgi->param('label_width') || 0,
-                        label_height    => $cgi->param('label_height') || 0,
-                        top_text_margin => $cgi->param('top_text_margin') || 0,
-                        left_text_margin=> $cgi->param('left_text_margin') || 0,
-                        top_margin      => $cgi->param('top_margin') || 0,
-                        left_margin     => $cgi->param('left_margin') || 0,
-                        cols            => $cgi->param('cols') || 0,
-                        rows            => $cgi->param('rows') || 0,
-                        col_gap         => $cgi->param('col_gap') || 0,
-                        row_gap         => $cgi->param('row_gap') || 0,
-                        units           => $cgi->param('units') || 'POINT',
+    my @params = (      profile_id      => scalar $cgi->param('profile_id'),
+                        template_code   => scalar $cgi->param('template_code') || 'DEFAULT_TEMPLATE',
+                        template_desc   => scalar $cgi->param('template_desc') || 'Default description',
+                        page_width      => scalar $cgi->param('page_width') || 0,
+                        page_height     => scalar $cgi->param('page_height') || 0,
+                        label_width     => scalar $cgi->param('label_width') || 0,
+                        label_height    => scalar $cgi->param('label_height') || 0,
+                        top_text_margin => scalar $cgi->param('top_text_margin') || 0,
+                        left_text_margin=> scalar $cgi->param('left_text_margin') || 0,
+                        top_margin      => scalar $cgi->param('top_margin') || 0,
+                        left_margin     => scalar $cgi->param('left_margin') || 0,
+                        cols            => scalar $cgi->param('cols') || 0,
+                        rows            => scalar $cgi->param('rows') || 0,
+                        col_gap         => scalar $cgi->param('col_gap') || 0,
+                        row_gap         => scalar $cgi->param('row_gap') || 0,
+                        units           => scalar $cgi->param('units') || 'POINT',
                         );
     if ($template_id) {   # if a template_id was passed in, this is an update to an existing template
         $label_template = C4::Labels::Template->retrieve(template_id => $template_id);
@@ -87,7 +87,7 @@ elsif ($op eq 'save') {
                 $old_profile->set_attr(template_id => 0);
                 $old_profile->save();
             }
-            my $new_profile = C4::Labels::Profile->retrieve(profile_id => $cgi->param('profile_id'));
+            my $new_profile = C4::Labels::Profile->retrieve(profile_id => scalar $cgi->param('profile_id'));
             $new_profile->set_attr(template_id => $label_template->get_attr('template_id'));
             $new_profile->save();
         }
@@ -106,7 +106,7 @@ elsif ($op eq 'save') {
         $label_template = C4::Labels::Template->new(@params);
         my $template_id = $label_template->save();
         if ($cgi->param('profile_id')) {
-            my $profile = C4::Labels::Profile->retrieve(profile_id => $cgi->param('profile_id'));
+            my $profile = C4::Labels::Profile->retrieve(profile_id => scalar $cgi->param('profile_id'));
             $profile->set_attr(template_id => $template_id) if $template_id != $profile->get_attr('template_id');
             $profile->save();
         }