[prev in list] [next in list] [prev in thread] [next in thread]
List: cups-commit
Subject: [cups.commit] [CUPS] r8801 - in branches/branch-1.4: . backend
From: cups-dev () easysw ! com
Date: 2009-08-29 6:05:15
Message-ID: 9572-cups.commit () news ! easysw ! com
[Download RAW message or body]
Author: mike
Date: 2009-08-28 23:05:14 -0700 (Fri, 28 Aug 2009)
New Revision: 8801
Log:
Mirror fixes from trunk.
Modified:
branches/branch-1.4/CHANGES.txt
branches/branch-1.4/backend/ipp.c
branches/branch-1.4/cgi-bin/admin.c
branches/branch-1.4/cups/adminutil.c
branches/branch-1.4/cups/request.c
branches/branch-1.4/doc/help/spec-ipp.html
branches/branch-1.4/man/lprm.man
branches/branch-1.4/ppdc/ppdc-driver.cxx
branches/branch-1.4/scheduler/cups-driverd.cxx
branches/branch-1.4/scheduler/dirsvc.c
branches/branch-1.4/scheduler/ipp.c
branches/branch-1.4/scheduler/job.c
branches/branch-1.4/scheduler/printers.c
branches/branch-1.4/templates/de/modify-class.tmpl
branches/branch-1.4/templates/es/modify-class.tmpl
branches/branch-1.4/templates/eu/modify-class.tmpl
branches/branch-1.4/templates/ja/modify-class.tmpl
branches/branch-1.4/templates/modify-class.tmpl
branches/branch-1.4/templates/pl/modify-class.tmpl
branches/branch-1.4/templates/ru/modify-class.tmpl
Modified: branches/branch-1.4/CHANGES.txt
===================================================================
--- branches/branch-1.4/CHANGES.txt 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/CHANGES.txt 2009-08-29 06:05:14 UTC (rev 8801)
@@ -3,6 +3,7 @@
CHANGES IN CUPS V1.4.1
+ - Documention fixes (STR #3296)
- DNS-SD registrations for raw queues had an empty "ty" key (STR #3299)
- The JPEG and BMP MIME type rules were broken (STR #3284)
- cupsGetNamedDest returned the default printer when the named
@@ -12,6 +13,25 @@
- The configure check for dns-sd.h was broken (STR #3297)
- The "Query Printer for Default Options" page did not go away if the
query job was held (STR #3302)
+ - Boolean options did not show up as selected in the web interface
+ (STR #3303)
+ - The scheduler did not cache or report driver information files
+ correctly, leading to a variety of issues (STR #3283, STR #3297,
+ STR #3305)
+ - cupsDoIORequest() did not abort on permanent errors (STR #3311)
+ - Modifying a class in the web interface did not work (STR #3312)
+ - BrowseLocalProtocols could be cleared when changing the sharing
+ setting (STR #3287)
+ - The scheduler could return an empty supported document format
+ (STR #3308)
+ - The PPD compiler generated invalid PPD files when the locale used
+ something other than "." for the decimal point (STR #3300)
+ - The IPP backend did not handle some non-comforming IPP printer
+ implementations (STR #3262)
+ - The scheduler leaked three file descriptors to each job filter
+ (STR #3263)
+ - The scheduler now uses a default CUPS-Get-Devices timeout of 15
+ seconds (STR #3307)
CHANGES IN CUPS V1.4.0
Modified: branches/branch-1.4/backend/ipp.c
===================================================================
--- branches/branch-1.4/backend/ipp.c 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/backend/ipp.c 2009-08-29 06:05:14 UTC (rev 8801)
@@ -1239,6 +1239,19 @@
break;
}
}
+ else
+ {
+ /*
+ * If the printer does not return a job-state attribute, it does not
+ * conform to the IPP specification - break out immediately and fail
+ * the job...
+ */
+
+ fputs("DEBUG: No job-state available from printer - stopping queue.\n",
+ stderr);
+ ipp_status = IPP_INTERNAL_ERROR;
+ break;
+ }
}
ippDelete(response);
@@ -1317,6 +1330,8 @@
if (ipp_status == IPP_NOT_AUTHORIZED)
return (CUPS_BACKEND_AUTH_REQUIRED);
+ else if (ipp_status == IPP_INTERNAL_ERROR)
+ return (CUPS_BACKEND_STOP);
else if (ipp_status > IPP_OK_CONFLICT)
return (CUPS_BACKEND_FAILED);
else
Modified: branches/branch-1.4/cgi-bin/admin.c
===================================================================
--- branches/branch-1.4/cgi-bin/admin.c 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/cgi-bin/admin.c 2009-08-29 06:05:14 UTC (rev 8801)
@@ -634,6 +634,15 @@
return;
}
+ if (!name)
+ {
+ cgiStartHTML(title);
+ cgiSetVariable("ERROR", cgiText(_("Missing form variable!")));
+ cgiCopyTemplateLang("error.tmpl");
+ cgiEndHTML();
+ return;
+ }
+
for (ptr = name; *ptr; ptr ++)
if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || *ptr == '#')
break;
@@ -668,8 +677,7 @@
request = ippNewRequest(CUPS_ADD_CLASS);
httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "ipp", NULL,
- "localhost", 0, "/classes/%s",
- cgiGetVariable("PRINTER_NAME"));
+ "localhost", 0, "/classes/%s", name);
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
NULL, uri);
Modified: branches/branch-1.4/cups/adminutil.c
===================================================================
--- branches/branch-1.4/cups/adminutil.c 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/cups/adminutil.c 2009-08-29 06:05:14 UTC (rev 8801)
@@ -1553,7 +1553,7 @@
const char *remotep = cupsGetOption("BrowseRemoteProtocols",
num_settings, settings);
- if (!localp)
+ if (!localp || !localp[0])
localp = cupsGetOption("BrowseLocalProtocols", cupsd_num_settings,
cupsd_settings);
Modified: branches/branch-1.4/cups/request.c
===================================================================
--- branches/branch-1.4/cups/request.c 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/cups/request.c 2009-08-29 06:05:14 UTC (rev 8801)
@@ -266,7 +266,9 @@
DEBUG_printf(("2cupsDoIORequest: status=%d", status));
- if (status == HTTP_FORBIDDEN || status >= HTTP_SERVER_ERROR)
+ if (status >= HTTP_BAD_REQUEST &&
+ status != HTTP_UNAUTHORIZED &&
+ status != HTTP_UPGRADE_REQUIRED)
{
httpFlush(http);
_cupsSetHTTPError(status);
Modified: branches/branch-1.4/doc/help/spec-ipp.html
===================================================================
--- branches/branch-1.4/doc/help/spec-ipp.html 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/doc/help/spec-ipp.html 2009-08-29 06:05:14 UTC (rev 8801)
@@ -1603,8 +1603,8 @@
<dt>"timeout" (integer (1:MAX)) :<span class='info'>CUPS 1.4/Mac OS X 10.6</span>
- <dd>The client OPTIONALLY supplies this attribute limiting the number of
- devices that are returned.
+ <dd>The client OPTIONALLY supplies this attribute to limit the duration
+ of the lookup. The default timeout is 15 seconds.
</dl>
Modified: branches/branch-1.4/man/lprm.man
===================================================================
--- branches/branch-1.4/man/lprm.man 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/man/lprm.man 2009-08-29 06:05:14 UTC (rev 8801)
@@ -12,7 +12,7 @@
.\" which should have been included with this file. If this file is
.\" file is missing or damaged, see the license at "http://www.cups.org/".
.\"
-.TH lprm 1 "CUPS" "12 February 2006" "Apple Inc."
+.TH lprm 1 "CUPS" "28 August 2009" "Apple Inc."
.SH NAME
lprm \- cancel print jobs
.SH SYNOPSIS
@@ -49,7 +49,7 @@
.TP 5
-h server[:port]
.br
-Specifies and alternate server.
+Specifies an alternate server.
.SH COMPATIBILITY
The CUPS version of \fIlprm\fR is compatible with the standard
Berkeley \fIlprm\fR command.
Modified: branches/branch-1.4/ppdc/ppdc-driver.cxx
===================================================================
--- branches/branch-1.4/ppdc/ppdc-driver.cxx 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/ppdc/ppdc-driver.cxx 2009-08-29 06:05:14 UTC (rev 8801)
@@ -554,6 +554,8 @@
else if (type != PPDC_DRIVER_PS)
cupsFilePrintf(fp, "*TTRasterizer: Type42%s", lf);
+ struct lconv *loc = localeconv();
+
if (attrs->count)
{
// Write driver-defined attributes...
@@ -679,16 +681,23 @@
for (p = (ppdcProfile *)profiles->first();
p;
p = (ppdcProfile *)profiles->next())
+ {
+ char density[255], gamma[255], profile[9][255];
+
+ _cupsStrFormatd(density, density + sizeof(density), p->density, loc);
+ _cupsStrFormatd(gamma, gamma + sizeof(gamma), p->gamma, loc);
+
+ for (int i = 0; i < 9; i ++)
+ _cupsStrFormatd(profile[i], profile[i] + sizeof(profile[0]),
+ p->profile[i], loc);
+
cupsFilePrintf(fp,
- "*cupsColorProfile %s/%s: \"%.3f %.3f %.3f %.3f %.3f %.3f "
- "%.3f %.3f %.3f %.3f %.3f\"%s",
- p->resolution->value, p->media_type->value,
- p->density, p->gamma,
- p->profile[0], p->profile[1],
- p->profile[2], p->profile[3],
- p->profile[4], p->profile[5],
- p->profile[6], p->profile[7],
- p->profile[8], lf);
+ "*cupsColorProfile %s/%s: \"%s %s %s %s %s %s %s %s %s %s "
+ "%s\"%s", p->resolution->value, p->media_type->value,
+ density, gamma, profile[0], profile[1], profile[2],
+ profile[3], profile[4], profile[5], profile[6], profile[7],
+ profile[8], lf);
+ }
}
if (locales)
@@ -871,13 +880,21 @@
cupsFilePrintf(fp, "*DefaultImageableArea: %s%s",
default_size ? default_size->value : "Letter", lf);
+ char left[255], right[255], bottom[255], top[255];
+
for (m = (ppdcMediaSize *)sizes->first();
m;
m = (ppdcMediaSize *)sizes->next())
- cupsFilePrintf(fp, "*ImageableArea %s/%s: \"%.2f %.2f %.2f %.2f\"%s",
+ {
+ _cupsStrFormatd(left, left + sizeof(left), m->left, loc);
+ _cupsStrFormatd(bottom, bottom + sizeof(bottom), m->bottom, loc);
+ _cupsStrFormatd(right, right + sizeof(right), m->width - m->right, loc);
+ _cupsStrFormatd(top, top + sizeof(top), m->length - m->top, loc);
+
+ cupsFilePrintf(fp, "*ImageableArea %s/%s: \"%s %s %s %s\"%s",
m->name->value, catalog->find_message(m->text->value),
- m->left, m->bottom, m->width - m->right, m->length - m->top,
- lf);
+ left, bottom, right, top, lf);
+ }
if ((a = find_attr("?ImageableArea", NULL)) != NULL)
{
@@ -892,12 +909,19 @@
cupsFilePrintf(fp, "*DefaultPaperDimension: %s%s",
default_size ? default_size->value : "Letter", lf);
+ char width[255], length[255];
+
for (m = (ppdcMediaSize *)sizes->first();
m;
m = (ppdcMediaSize *)sizes->next())
- cupsFilePrintf(fp, "*PaperDimension %s/%s: \"%.2f %.2f\"%s",
+ {
+ _cupsStrFormatd(width, width + sizeof(width), m->width, loc);
+ _cupsStrFormatd(length, length + sizeof(length), m->length, loc);
+
+ cupsFilePrintf(fp, "*PaperDimension %s/%s: \"%s %s\"%s",
m->name->value, catalog->find_message(m->text->value),
- m->width, m->length, lf);
+ width, length, lf);
+ }
if ((a = find_attr("?PaperDimension", NULL)) != NULL)
{
@@ -911,11 +935,19 @@
// Custom size support...
if (variable_paper_size)
{
- cupsFilePrintf(fp, "*MaxMediaWidth: \"%.2f\"%s", max_width, lf);
- cupsFilePrintf(fp, "*MaxMediaHeight: \"%.2f\"%s", max_length, lf);
- cupsFilePrintf(fp, "*HWMargins: %.2f %.2f %.2f %.2f\n",
- left_margin, bottom_margin, right_margin, top_margin);
+ _cupsStrFormatd(width, width + sizeof(width), max_width, loc);
+ _cupsStrFormatd(length, length + sizeof(length), max_length, loc);
+ _cupsStrFormatd(left, left + sizeof(left), left_margin, loc);
+ _cupsStrFormatd(bottom, bottom + sizeof(bottom), bottom_margin, loc);
+ _cupsStrFormatd(right, right + sizeof(right), right_margin, loc);
+ _cupsStrFormatd(top, top + sizeof(top), top_margin, loc);
+
+ cupsFilePrintf(fp, "*MaxMediaWidth: \"%s\"%s", width, lf);
+ cupsFilePrintf(fp, "*MaxMediaHeight: \"%s\"%s", length, lf);
+ cupsFilePrintf(fp, "*HWMargins: %s %s %s %s%s", left, bottom, right, top,
+ lf);
+
if (custom_size_code && custom_size_code->value)
{
cupsFilePrintf(fp, "*CustomPageSize True: \"%s\"%s",
@@ -934,16 +966,30 @@
cupsFilePrintf(fp, "*ParamCustomPageSize Width: %s%s", a->value->value,
lf);
else
- cupsFilePrintf(fp, "*ParamCustomPageSize Width: 1 points %.2f %.2f%s",
- min_width, max_width, lf);
+ {
+ char width0[255];
+ _cupsStrFormatd(width0, width0 + sizeof(width0), min_width, loc);
+ _cupsStrFormatd(width, width + sizeof(width), max_width, loc);
+
+ cupsFilePrintf(fp, "*ParamCustomPageSize Width: 1 points %s %s%s",
+ width0, width, lf);
+ }
+
if ((a = find_attr("ParamCustomPageSize", "Height")) != NULL)
cupsFilePrintf(fp, "*ParamCustomPageSize Height: %s%s", a->value->value,
lf);
else
- cupsFilePrintf(fp, "*ParamCustomPageSize Height: 2 points %.2f %.2f%s",
- min_length, max_length, lf);
+ {
+ char length0[255];
+ _cupsStrFormatd(length0, length0 + sizeof(length0), min_length, loc);
+ _cupsStrFormatd(length, length + sizeof(length), max_length, loc);
+
+ cupsFilePrintf(fp, "*ParamCustomPageSize Height: 2 points %s %s%s",
+ length0, length, lf);
+ }
+
if ((a = find_attr("ParamCustomPageSize", "WidthOffset")) != NULL)
cupsFilePrintf(fp, "*ParamCustomPageSize WidthOffset: %s%s",
a->value->value, lf);
@@ -1000,7 +1046,10 @@
break;
}
- cupsFilePrintf(fp, "*OrderDependency: %.1f ", o->order);
+ char order[255];
+ _cupsStrFormatd(order, order + sizeof(order), o->order, loc);
+
+ cupsFilePrintf(fp, "*OrderDependency: %s ", order);
switch (o->section)
{
default :
Modified: branches/branch-1.4/scheduler/cups-driverd.cxx
===================================================================
--- branches/branch-1.4/scheduler/cups-driverd.cxx 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/scheduler/cups-driverd.cxx 2009-08-29 06:05:14 UTC (rev 8801)
@@ -1493,13 +1493,21 @@
ppd->record.size == dent->fileinfo.st_size &&
ppd->record.mtime == dent->fileinfo.st_mtime)
{
- do
- {
- ppd->found = 1;
- }
- while ((ppd = (ppd_info_t *)cupsArrayNext(PPDsByName)) != NULL &&
+ /*
+ * Rewind to the first entry for this file...
+ */
+
+ while ((ppd = (ppd_info_t *)cupsArrayPrev(PPDsByName)) != NULL &&
!strcmp(ppd->record.filename, name));
+ /*
+ * Then mark all of the matches for this file as found...
+ */
+
+ while ((ppd = (ppd_info_t *)cupsArrayNext(PPDsByName)) != NULL &&
+ !strcmp(ppd->record.filename, name))
+ ppd->found = 1;
+
continue;
}
@@ -1904,7 +1912,8 @@
*cups_fax, // cupsFax attribute
*nick_name; // NickName attribute
ppdcFilter *filter; // Current filter
- bool product_found; // Found product?
+ ppd_info_t *ppd; // Current PPD
+ int products_found; // Number of products found
char uri[1024], // Driver URI
make_model[1024]; // Make and model
int type; // Driver type
@@ -1929,7 +1938,7 @@
* Add a dummy entry for the file...
*/
- add_ppd(filename, filename, "", "", "", "", "", "", mtime, size, 0,
+ add_ppd(name, name, "", "", "", "", "", "", mtime, size, 0,
PPD_TYPE_DRV, "drv");
ChangedPPD = 1;
@@ -1981,22 +1990,28 @@
type = PPD_TYPE_PDF;
}
- for (product = (ppdcAttr *)d->attrs->first(), product_found = false;
+ for (product = (ppdcAttr *)d->attrs->first(), products_found = 0;
product;
product = (ppdcAttr *)d->attrs->next())
if (!strcmp(product->name->value, "Product"))
{
- product_found = true;
+ if (!products_found)
+ ppd = add_ppd(name, uri, "en", d->manufacturer->value, make_model,
+ device_id ? device_id->value->value : "",
+ product->value->value,
+ ps_version ? ps_version->value->value : "(3010) 0",
+ mtime, size, d->model_number, type, "drv");
+ else if (products_found < PPD_MAX_PROD)
+ strlcpy(ppd->record.products[products_found], product->value->value,
+ sizeof(ppd->record.products[0]));
+ else
+ break;
- add_ppd(filename, uri, "en", d->manufacturer->value, make_model,
- device_id ? device_id->value->value : "",
- product->value->value,
- ps_version ? ps_version->value->value : "(3010) 0",
- mtime, size, d->model_number, type, "drv");
+ products_found ++;
}
- if (!product_found)
- add_ppd(filename, uri, "en", d->manufacturer->value, make_model,
+ if (!products_found)
+ add_ppd(name, uri, "en", d->manufacturer->value, make_model,
device_id ? device_id->value->value : "",
d->model_name->value,
ps_version ? ps_version->value->value : "(3010) 0",
Modified: branches/branch-1.4/scheduler/dirsvc.c
===================================================================
--- branches/branch-1.4/scheduler/dirsvc.c 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/scheduler/dirsvc.c 2009-08-29 06:05:14 UTC (rev 8801)
@@ -1558,9 +1558,12 @@
* Add the master connection to the select list...
*/
- cupsdAddSelect(DNSServiceRefSockFD(DNSSDRef),
- (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
+ int fd = DNSServiceRefSockFD(DNSSDRef);
+ fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
+
+ cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
+
/*
* Then get the port we use for registrations. If we are not listening
* on any non-local ports, there is no sense sharing local printers via
Modified: branches/branch-1.4/scheduler/ipp.c
===================================================================
--- branches/branch-1.4/scheduler/ipp.c 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/scheduler/ipp.c 2009-08-29 06:05:14 UTC (rev 8801)
@@ -6556,7 +6556,7 @@
"%d+%d+%d+%d+%s%s%s%s%s",
con->request->request.op.request_id,
limit ? limit->values[0].integer : 0,
- timeout ? timeout->values[0].integer : 10,
+ timeout ? timeout->values[0].integer : 15,
(int)User,
requested_str,
exclude_str[0] ? "%20" : "", exclude_str,
Modified: branches/branch-1.4/scheduler/job.c
===================================================================
--- branches/branch-1.4/scheduler/job.c 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/scheduler/job.c 2009-08-29 06:05:14 UTC (rev 8801)
@@ -3863,6 +3863,11 @@
fcntl(job->side_pipes[1], F_SETFL,
fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
+ fcntl(job->side_pipes[0], F_SETFD,
+ fcntl(job->side_pipes[0], F_GETFD) | FD_CLOEXEC);
+ fcntl(job->side_pipes[1], F_SETFD,
+ fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC);
+
/*
* Now start the first file in the job...
*/
Modified: branches/branch-1.4/scheduler/printers.c
===================================================================
--- branches/branch-1.4/scheduler/printers.c 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/scheduler/printers.c 2009-08-29 06:05:14 UTC (rev 8801)
@@ -3699,10 +3699,6 @@
p->name, mimetype);
}
- cupsdLogMessage(CUPSD_LOG_DEBUG2,
- "add_printer_formats: %s: %d supported types",
- p->name, cupsArrayCount(p->filetypes) + 1);
-
/*
* Add the file formats that can be filtered...
*/
@@ -3713,9 +3709,13 @@
else
i = 0;
+ cupsdLogMessage(CUPSD_LOG_DEBUG2,
+ "add_printer_formats: %s: %d supported types",
+ p->name, cupsArrayCount(p->filetypes) + i);
+
attr = ippAddStrings(p->attrs, IPP_TAG_PRINTER, IPP_TAG_MIMETYPE,
"document-format-supported",
- cupsArrayCount(p->filetypes) + 1, NULL, NULL);
+ cupsArrayCount(p->filetypes) + i, NULL, NULL);
if (i)
attr->values[0].string.text = _cupsStrAlloc("application/octet-stream");
Modified: branches/branch-1.4/templates/de/modify-class.tmpl
===================================================================
--- branches/branch-1.4/templates/de/modify-class.tmpl 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/templates/de/modify-class.tmpl 2009-08-29 06:05:14 UTC (rev 8801)
@@ -4,6 +4,7 @@
<FORM METHOD="POST" ACTION="/admin">
<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
<TABLE>
<TR>
Modified: branches/branch-1.4/templates/es/modify-class.tmpl
===================================================================
--- branches/branch-1.4/templates/es/modify-class.tmpl 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/templates/es/modify-class.tmpl 2009-08-29 06:05:14 UTC (rev 8801)
@@ -4,6 +4,7 @@
<FORM METHOD="POST" ACTION="/admin">
<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
<TABLE>
<TR>
Modified: branches/branch-1.4/templates/eu/modify-class.tmpl
===================================================================
--- branches/branch-1.4/templates/eu/modify-class.tmpl 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/templates/eu/modify-class.tmpl 2009-08-29 06:05:14 UTC (rev 8801)
@@ -4,6 +4,7 @@
<FORM METHOD="POST" ACTION="/admin">
<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
<TABLE>
<TR>
Modified: branches/branch-1.4/templates/ja/modify-class.tmpl
===================================================================
--- branches/branch-1.4/templates/ja/modify-class.tmpl 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/templates/ja/modify-class.tmpl 2009-08-29 06:05:14 UTC (rev 8801)
@@ -4,6 +4,7 @@
<FORM METHOD="POST" ACTION="/admin">
<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
<TABLE>
<TR>
Modified: branches/branch-1.4/templates/modify-class.tmpl
===================================================================
--- branches/branch-1.4/templates/modify-class.tmpl 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/templates/modify-class.tmpl 2009-08-29 06:05:14 UTC (rev 8801)
@@ -4,6 +4,7 @@
<FORM METHOD="POST" ACTION="/admin">
<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
<TABLE>
<TR>
Modified: branches/branch-1.4/templates/pl/modify-class.tmpl
===================================================================
--- branches/branch-1.4/templates/pl/modify-class.tmpl 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/templates/pl/modify-class.tmpl 2009-08-29 06:05:14 UTC (rev 8801)
@@ -4,6 +4,7 @@
<FORM METHOD="POST" ACTION="/admin">
<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
<TABLE>
<TR>
Modified: branches/branch-1.4/templates/ru/modify-class.tmpl
===================================================================
--- branches/branch-1.4/templates/ru/modify-class.tmpl 2009-08-29 06:03:48 UTC (rev 8800)
+++ branches/branch-1.4/templates/ru/modify-class.tmpl 2009-08-29 06:05:14 UTC (rev 8801)
@@ -4,6 +4,7 @@
<FORM METHOD="POST" ACTION="/admin">
<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
<TABLE>
<TR>
_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic