X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=labels%2Flabel-edit-profile.pl;h=59c6abcfd5c0d269d713604d43aa15a52b088572;hb=130e3d9c108fb35955ab9a9944e16946537aafe9;hp=e5d8bddb930929a9d422c74362c6abf889be9fc6;hpb=0645c95a36f140f06b5976f9096ef91d4a9a5f9c;p=koha.git

diff --git a/labels/label-edit-profile.pl b/labels/label-edit-profile.pl
index e5d8bddb93..59c6abcfd5 100755
--- a/labels/label-edit-profile.pl
+++ b/labels/label-edit-profile.pl
@@ -4,7 +4,7 @@
 # Parts Copyright 2009 Foundations Bible College.
 #
 # 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
@@ -14,23 +14,19 @@
 # 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 Sys::Syslog qw(syslog);
+
 use CGI;
-use HTML::Template::Pro;
-use Data::Dumper;
 
-use C4::Auth;
-use C4::Output;
-use C4::Context;
-use C4::Debug;
-use C4::Labels::Lib 1.000000 qw(get_all_templates get_unit_values);
-use C4::Labels::Profile 1.000000;
+use C4::Auth qw(get_template_and_user);
+use C4::Output qw(output_html_with_http_headers);
+use C4::Creators;
+use C4::Labels;
 
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -43,26 +39,28 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         debug           => 1,
     }
 );
-my $op = $cgi->param('op') || $ARGV[0] || '';
-my $profile_id = $cgi->param('profile_id') || $cgi->param('element_id') || $ARGV[1] || '';
-my $profile = '';
-my $template_list = '';
+
+my $op = $cgi->param('op');
+my $profile_id = $cgi->param('profile_id') || $cgi->param('element_id');
+my $profile = undef;
+my $template_list = undef;
 my @label_template = ();
+
 my $units = get_unit_values();
 
 if ($op eq 'edit') {
     $profile = C4::Labels::Profile->retrieve(profile_id => $profile_id);
-    $template_list = get_all_templates(field_list => 'template_id,template_code, profile_id');
+    $template_list = get_all_templates(table_name => 'creator_templates', field_list => 'template_id,template_code, profile_id');
 }
 elsif ($op eq 'save') {
     my @params = (
-        printer_name        => $cgi->param('printer_name'),
-        paper_bin           => $cgi->param('paper_bin'),
-        offset_horz         => $cgi->param('offset_horz'),
-        offset_vert         => $cgi->param('offset_vert'),
-        creep_horz          => $cgi->param('creep_horz'),
-        creep_vert          => $cgi->param('creep_vert'),
-        units               => $cgi->param('units'),
+        printer_name        => $cgi->param('printer_name') || 'DEFAULT PRINTER',
+        paper_bin           => $cgi->param('paper_bin') || 'Tray 1',
+        offset_horz         => $cgi->param('offset_horz') || 0,
+        offset_vert         => $cgi->param('offset_vert') || 0,
+        creep_horz          => $cgi->param('creep_horz') || 0,
+        creep_vert          => $cgi->param('creep_vert') || 0,
+        units               => $cgi->param('units') || 'POINT',
     );
     if ($profile_id) {   # if a label_id was passed in, this is an update to an existing layout
         $profile = C4::Labels::Profile->retrieve(profile_id => $profile_id);
@@ -81,7 +79,9 @@ else {  # if we get here, this is a new layout
 }
 
 if ($profile_id) {
-    @label_template = grep{($_->{'profile_id'} == $profile->get_attr('profile_id')) && ($_->{'template_id'} == $profile->get_attr('template_id'))} @$template_list;
+    @label_template = grep {
+        ($_->{'profile_id'} == $profile->get_attr('profile_id')) && ($_->{'template_id'} == $profile->get_attr('template_id'));
+        } @$template_list;
 }
 
 foreach my $unit (@$units) {