From a95dfb28bae54fe2bbb5405c74e8b1787acc605e Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Wed, 6 Apr 2005 13:55:30 +0000
Subject: [PATCH] fix for #756

---
 admin/printers.pl                             |   2 +-
 .../default/en/parameters/printers.tmpl       | 366 ++++++++----------
 2 files changed, 172 insertions(+), 196 deletions(-)

diff --git a/admin/printers.pl b/admin/printers.pl
index dd0506dba7..5c5c39c2a6 100755
--- a/admin/printers.pl
+++ b/admin/printers.pl
@@ -125,7 +125,7 @@ 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 printername,printqueue,printtype from printers where printername=");
+	my $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printername=?");
 	$sth->execute($searchfield);
 	my $data=$sth->fetchrow_hashref;
 	$sth->finish;
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
index 79f990404b..3f90963a4f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl
@@ -1,205 +1,181 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<!-- TMPL_IF NAME="add_form" -->
-        <script language="javascript" type="text/javascript">
-	function _(s) { return s } // dummy function for gettext
-        /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        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.printername.value.length==0) {
-                        _alertString += "\n- " + _("printer name missing");
-                }
-                if (f.printqueue.value.length==0) {
-                        _alertString += "\n- " + _("Queue missing");
-                }
-                if (_alertString.length==0) {
-                        document.Aform.submit();
-                } else {
-                        alertString2  = _("Form not submitted because of the following problem(s)");
-                        alertString2 += "\n------------------------------------------------------------------------------------\n";
-                        alertString2 += _alertString;
-                        alert(alertString2);
-                }
-        }
-        </script>
-
-	<!-- TMPL_IF NAME="searchfield" -->
-		<h1>Modify printer</h1>
-	<!-- TMPL_ELSE -->
-		<h1>Add printer</h1>
+<div id="mainbloc">
+		<h1>Printer admin</h1>
+	<!-- TMPL_IF NAME="add_form" -->
+			<script language="javascript" type="text/javascript">
+		function _(s) { return s } // dummy function for gettext
+			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+			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.printername.value.length==0) {
+							_alertString += "\n- " + _("printer name missing");
+					}
+					if (f.printqueue.value.length==0) {
+							_alertString += "\n- " + _("Queue missing");
+					}
+					if (_alertString.length==0) {
+							document.Aform.submit();
+					} else {
+							alertString2  = _("Form not submitted because of the following problem(s)");
+							alertString2 += "\n------------------------------------------------------------------------------------\n";
+							alertString2 += _alertString;
+							alert(alertString2);
+					}
+			}
+			</script>
+	<div id="bloc25">
+		<!-- TMPL_IF NAME="searchfield" -->
+			<h2 class="parameters">Modify printer</h2>
+		<!-- TMPL_ELSE -->
+			<h2 class="parameters">Add printer</h2>
+		<!-- /TMPL_IF -->
+	
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+				<input type="hidden" name="op" value="add_validate">
+				<!-- TMPL_IF NAME="searchfield" -->
+						<p><label>Printer Name</label><input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" --></p>
+				<!-- TMPL_ELSE -->
+						<p><label>Printer Name</label><input type="text" name="printername" size="50" maxlength="50"></p>
+				<!-- /TMPL_IF -->
+				<p><label>Queue</label><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </p>
+				<p><label>Type</label><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </p>
+				<p><input type="button" value="OK" onclick="Check(this.form)" class="button"></p>
+			</form>
+	</div>
 	<!-- /TMPL_IF -->
-
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-        <input type="hidden" name="op" value="add_validate">
-        
-
-	<table>
-
-	<!-- TMPL_IF NAME="searchfield" -->
-		<tr>
-			<td>Printer Name</td>
-			<td>
-				<input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
-			</td>
-		</tr>
-	<!-- TMPL_ELSE -->
-		<tr>
-			<td>Printer Name</td>
-			<td>
-				<input type="text" name="printername" size="50" maxlength="50">
-			</td>
-		</tr>
+	
+	<!-- TMPL_IF NAME="add_validate" -->
+		Data recorded
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK" class="button">
+			</form>
 	<!-- /TMPL_IF -->
-
-        	<tr>
-			<td>Queue</td>
-			<td><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </td>
-		</tr>
-        	<tr>
-			<td>Type</td>
-			<td><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </td>
-		</tr>
-        	<tr>
-			<td> </td>
-			<td><input type="button" value="OK" onclick="Check(this.form)"></td>
-		</tr>
-        </table>
-        </form>
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="add_validate" -->
-	Data recorded
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="submit" value="OK">
-        </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirm" -->
-	<table border="0" cellspacing="0" cellpadding="5">
-		<tr bgcolor="#99cc33">
-			<td background="/images/background-mem.gif"><b>Printer</b></td>
-			<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
-		</tr>
-
-        	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-			<input type="hidden" name="op" value="delete_confirmed">
-			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
-        
-		<tr>
-			<td>Queue</td>
-			<td><!-- TMPL_VAR NAME="printqueue" --></td>
-		</tr>
-        	<tr>
-			<td>Type</td>
-			<td><!-- TMPL_VAR NAME="printtype" --></td>
-		</tr>
-        	<tr>
-			<td colspan="2" align="center">CONFIRM DELETION</td>
-		</tr>
-        	<tr>
-			<td>
-				<input type="submit" value="YES">
-				</form>
-			</td>
-			<td>
+	
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="/images/background-mem.gif"><b>Printer</b></td>
+				<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
+			</tr>
+	
 				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-				<input type="submit" value="NO">
-				</form>
-			</td>
-		</tr>
-	</table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="delete_confirmed" -->
-	Data deleted
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="submit" value="OK">
-	</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="else" -->
-	<h2>Printer admin</h2>
-        <form action="<!-- TMPL_VAR NAME="script_name">" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
-                <input type="reset" name="reset" value="clr">
-        </form>
-
-	<!-- TMPL_IF NAME="searchfield" -->
-		You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+			
+			<tr>
+				<td>Queue</td>
+				<td><!-- TMPL_VAR NAME="printqueue" --></td>
+			</tr>
+				<tr>
+				<td>Type</td>
+				<td><!-- TMPL_VAR NAME="printtype" --></td>
+			</tr>
+				<tr>
+				<td colspan="2" align="center">CONFIRM DELETION</td>
+			</tr>
+				<tr>
+				<td>
+					<input type="submit" value="YES">
+					</form>
+				</td>
+				<td>
+					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="NO">
+					</form>
+				</td>
+			</tr>
+		</table>
 	<!-- /TMPL_IF -->
-
-	<table border="0" cellspacing="0" cellpadding="5">
-		<tr bgcolor="#99cc33">
-			<td background="/images/background-mem.gif"><b>Name</b></td>
-			<td background="/images/background-mem.gif"><b>Queue</b></td>
-			<td background="/images/background-mem.gif"><b>Type</b></td>
-			<td background="/images/background-mem.gif"> </td>
-			<td background="/images/background-mem.gif"> </td>
-		</tr>
-		<!-- TMPL_LOOP NAME="loop" -->
-		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-			<td><!-- TMPL_VAR NAME="printername" --></td>
-			<td><!-- TMPL_VAR NAME="printqueue" --></td>
-			<td><!-- TMPL_VAR NAME="printtype" --></td>
-			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Edit</a></td>
-                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Delete</a></td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="add_form">
 	
-	<!-- TMPL_IF NAME="offsetgtzero" -->
-		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+		Data deleted
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK">
+		</form>
 	<!-- /TMPL_IF -->
-
-	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-	<!-- TMPL_IF NAME="ltcount" -->
-		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
-	<!-- /TMPL_iF -->
-
-        <br>
-	<input type="submit" class="button" value="Add printer" alt="Add printer">
-	<br>
-        </form>
-
-<!-- /TMPL_IF -->
-
+	
+	<!-- TMPL_IF NAME="else" -->
+			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
+					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
+					<input type="reset" name="reset" value="clr">
+			</form>
+	
+		<!-- TMPL_IF NAME="searchfield" -->
+			You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
+		<!-- /TMPL_IF -->
+	
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="/images/background-mem.gif"><b>Name</b></td>
+				<td background="/images/background-mem.gif"><b>Queue</b></td>
+				<td background="/images/background-mem.gif"><b>Type</b></td>
+				<td background="/images/background-mem.gif"> </td>
+				<td background="/images/background-mem.gif"> </td>
+			</tr>
+			<!-- TMPL_LOOP NAME="loop" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+				<td><!-- TMPL_VAR NAME="printername" --></td>
+				<td><!-- TMPL_VAR NAME="printqueue" --></td>
+				<td><!-- TMPL_VAR NAME="printtype" --></td>
+				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Edit</a></td>
+							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Delete</a></td>
+			</tr>
+			<!-- /TMPL_LOOP -->
+		</table>
+	
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_form">
+		
+		<!-- TMPL_IF NAME="offsetgtzero" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
+		<!-- /TMPL_IF -->
+	
+		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+	
+		<!-- TMPL_IF NAME="ltcount" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
+		<!-- /TMPL_iF -->
+	
+			<br>
+		<input type="submit" class="button" value="Add printer" alt="Add printer">
+		<br>
+			</form>
+	
+	<!-- /TMPL_IF -->
+</div>
 
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
-- 
2.39.5