summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2021-01-28 20:30:10 -0500
committerSolomon Peachy <pizza@shaftnet.org>2021-01-28 20:30:10 -0500
commit1aed81debf809c9c0d4b2f9620d98b6bf10a8bd2 (patch)
tree4cc1d95436d5002329cb4e2d702c0c7e5dd6f315
parent06c0408d6c4656f37608659ee5ccf8ece85a5c95 (diff)
downloadpo-1aed81debf809c9c0d4b2f9620d98b6bf10a8bd2.tar.gz
po-1aed81debf809c9c0d4b2f9620d98b6bf10a8bd2.tar.bz2
po-1aed81debf809c9c0d4b2f9620d98b6bf10a8bd2.zip
[fix] Printing to remote hosts was broken with newer CUPS
-rw-r--r--CHANGES1
-rw-r--r--src/include/print.printer.php3
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index b50a0c1..f75e6cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -46,6 +46,7 @@ v2.38 (Unreleased)
[fix] PHP7-related error when importing images with an XMP/RDF 'Subject' tag
[fix] Use hash of various parameters for scaled image filenames
[fix] Get rid of support for magic_quotes_gpc; This means we now require PHP 5.4 or newer!
+ [fix] Fix printing on remote hosts with newer CUPS
v2.37.1 (December 3, 2012)
diff --git a/src/include/print.printer.php b/src/include/print.printer.php
index b5c3ddc..d0cc885 100644
--- a/src/include/print.printer.php
+++ b/src/include/print.printer.php
@@ -171,10 +171,11 @@ function photo_print_single($database, $single) {
}
# Set up printing.
- $cmdline = "$sys_lp -d '$printer[queue_name]' ";
+ $cmdline = "$sys_lp";
if ($printer['hostname']) {
$cmdline .= " -h $printer[hostname] ";
}
+ $cmdline .= " -d '$printer[queue_name]' ";
$cmdline .= " -t '$single[photo]:$single[version]:$original_name' ";
$cmdline .= " -o PageSize=$printer[pagesize] -o PageRegion=$printer[pagesize] -o ImageableArea=$printer[pagesize] -o PaperDimension=$printer[pagesize] ";
foreach ($printer['options'] as $opt) {