http://cups.org/str.php?L3498 http://cups.org/strfiles/3498/str3498.patch diff -Naurp cups-1.4.3/cgi-bin/cgi.h cups-1.4.3.oden/cgi-bin/cgi.h --- cups-1.4.3/cgi-bin/cgi.h 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/cgi-bin/cgi.h 2010-11-14 09:43:37.000000000 +0000 @@ -69,11 +69,12 @@ extern void cgiCopyTemplateLang(const c extern int cgiDoSearch(void *search, const char *text); extern void cgiEndHTML(void); extern void cgiEndMultipart(void); -extern char *cgiFormEncode(char *dst, const char *src, size_t dstsize); +extern char *cgiFormEncode(char *dst, const char *src, + size_t dstsize); extern void cgiFreeSearch(void *search); extern const char *cgiGetArray(const char *name, int element); extern void cgiGetAttributes(ipp_t *request, const char *tmpl); -extern char *cgiGetCookie(const char *name, char *buf, int buflen); +extern const char *cgiGetCookie(const char *name); extern const cgi_file_t *cgiGetFile(void); extern cups_array_t *cgiGetIPPObjects(ipp_t *response, void *search); extern int cgiGetSize(const char *name); diff -Naurp cups-1.4.3/cgi-bin/libcupscgi.exp cups-1.4.3.oden/cgi-bin/libcupscgi.exp --- cups-1.4.3/cgi-bin/libcupscgi.exp 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/cgi-bin/libcupscgi.exp 2010-11-14 09:43:37.000000000 +0000 @@ -10,6 +10,7 @@ _cgiFormEncode _cgiFreeSearch _cgiGetArray _cgiGetAttributes +_cgiGetCookie _cgiGetFile _cgiGetIPPObjects _cgiGetSize @@ -24,6 +25,7 @@ _cgiRewriteURL _cgiSetArray _cgiSetIPPObjectVars _cgiSetIPPVars +_cgiSetCookie _cgiSetServerVersion _cgiSetSize _cgiSetVariable diff -Naurp cups-1.4.3/cgi-bin/template.c cups-1.4.3.oden/cgi-bin/template.c --- cups-1.4.3/cgi-bin/template.c 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/cgi-bin/template.c 2010-11-14 09:43:37.000000000 +0000 @@ -369,6 +369,20 @@ cgi_copy(FILE *out, /* I - Output file continue; } + else if (name[0] == '$') + { + /* + * Insert cookie value or nothing if not defined. + */ + + if ((value = cgiGetCookie(name + 1)) != NULL) + outptr = value; + else + { + outval[0] = '\0'; + outptr = outval; + } + } else { /* diff -Naurp cups-1.4.3/cgi-bin/var.c cups-1.4.3.oden/cgi-bin/var.c --- cups-1.4.3/cgi-bin/var.c 2010-11-14 09:35:31.000000000 +0000 +++ cups-1.4.3.oden/cgi-bin/var.c 2010-11-14 09:43:37.000000000 +0000 @@ -14,25 +14,34 @@ * * Contents: * - * cgiCheckVariables() - Check for the presence of "required" variables. + * cgiCheckVariables() - Check for the presence of "required" + * variables. * cgiClearVariables() - Clear all form variables. - * cgiGetArray() - Get an element from a form array... - * cgiGetFile() - Get the file (if any) that was submitted in the form. + * cgiGetArray() - Get an element from a form array. + * cgiGetCookie() - Get a cookie value. + * cgiGetFile() - Get the file (if any) that was submitted in + * the form. * cgiGetSize() - Get the size of a form array value. - * cgiGetVariable() - Get a CGI variable from the database... - * cgiInitialize() - Initialize the CGI variable "database"... + * cgiGetVariable() - Get a CGI variable from the database. + * cgiInitialize() - Initialize the CGI variable "database". * cgiIsPOST() - Determine whether this page was POSTed. * cgiSetArray() - Set array element N to the specified string. + * cgiSetCookie() - Set a cookie value. * cgiSetSize() - Set the array size. - * cgiSetVariable() - Set a CGI variable in the database... + * cgiSetVariable() - Set a CGI variable in the database. * cgi_add_variable() - Add a form variable. * cgi_compare_variables() - Compare two variables. - * cgi_find_variable() - Find a variable... - * cgi_initialize_get() - Initialize form variables using the GET method. - * cgi_initialize_multipart() - Initialize variables and file using the POST method. + * cgi_find_variable() - Find a variable. + * cgi_initialize_cookies() - Initialize cookies. + * cgi_initialize_get() - Initialize form variables using the GET + * method. + * cgi_initialize_multipart() - Initialize variables and file using the POST + * method. * cgi_initialize_post() - Initialize variables using the POST method. * cgi_initialize_string() - Initialize form variables from a string. - * cgi_passwd() - Catch authentication requests and notify the server. + * cgi_passwd() - Catch authentication requests and notify the + * server. + * cgi_set_sid() - Set the CUPS session ID. * cgi_sort_variables() - Sort all form variables for faster lookup. * cgi_unlink_file() - Remove the uploaded form. */ @@ -40,6 +49,15 @@ /*#define DEBUG*/ #include "cgi-private.h" #include <errno.h> +#include <cups/http.h> +#include <cups/md5.h> + + +/* + * Session ID name + */ + +#define CUPS_SID "org.cups.sid" /* @@ -59,6 +77,8 @@ typedef struct /**** Form variable st * Local globals... */ +static int num_cookies = 0;/* Number of cookies */ +static cups_option_t *cookies = NULL;/* Cookies */ static int form_count = 0, /* Form variable count */ form_alloc = 0; /* Number of variables allocated */ static _cgi_var_t *form_vars = NULL; @@ -76,11 +96,13 @@ static void cgi_add_variable(const char static int cgi_compare_variables(const _cgi_var_t *v1, const _cgi_var_t *v2); static _cgi_var_t *cgi_find_variable(const char *name); +static void cgi_initialize_cookies(void); static int cgi_initialize_get(void); static int cgi_initialize_multipart(const char *boundary); static int cgi_initialize_post(void); static int cgi_initialize_string(const char *data); static const char *cgi_passwd(const char *prompt); +static const char *cgi_set_sid(void); static void cgi_sort_variables(void); static void cgi_unlink_file(void); @@ -161,7 +183,7 @@ cgiClearVariables(void) /* - * 'cgiGetArray()' - Get an element from a form array... + * 'cgiGetArray()' - Get an element from a form array. */ const char * /* O - Element value or NULL */ @@ -182,6 +204,17 @@ cgiGetArray(const char *name, /* I - Na /* + * 'cgiGetCookie()' - Get a cookie value. + */ + +const char * /* O - Value or NULL */ +cgiGetCookie(const char *name) /* I - Name of cookie */ +{ + return (cupsGetOption(name, num_cookies, cookies)); +} + + +/* * 'cgiGetFile()' - Get the file (if any) that was submitted in the form. */ @@ -210,10 +243,10 @@ cgiGetSize(const char *name) /* I - Nam /* - * 'cgiGetVariable()' - Get a CGI variable from the database... + * 'cgiGetVariable()' - Get a CGI variable from the database. * * Returns NULL if the variable doesn't exist. If the variable is an - * array of values, returns the last element... + * array of values, returns the last element. */ const char * /* O - Value of variable */ @@ -237,14 +270,16 @@ cgiGetVariable(const char *name) /* I - /* - * 'cgiInitialize()' - Initialize the CGI variable "database"... + * 'cgiInitialize()' - Initialize the CGI variable "database". */ int /* O - Non-zero if there was form data */ cgiInitialize(void) { - const char *method; /* Form posting method */ - const char *content_type; /* Content-Type of post data */ + const char *method, /* Form posting method */ + *content_type, /* Content-Type of post data */ + *cups_sid_cookie, /* SID cookie */ + *cups_sid_form; /* SID form variable */ /* @@ -268,6 +303,20 @@ cgiInitialize(void) #endif /* DEBUG */ /* + * Get cookies... + */ + + cgi_initialize_cookies(); + + if ((cups_sid_cookie = cgiGetCookie(CUPS_SID)) == NULL) + { + fputs("DEBUG: " CUPS_SID " cookie not found, initializing!\n", stderr); + cups_sid_cookie = cgi_set_sid(); + } + + fprintf(stderr, "DEBUG: " CUPS_SID " cookie is \"%s\"\n", cups_sid_cookie); + + /* * Get the request method (GET or POST)... */ @@ -290,9 +339,27 @@ cgiInitialize(void) boundary += 9; if (content_type && !strncmp(content_type, "multipart/form-data; ", 21)) - return (cgi_initialize_multipart(boundary)); + { + if (!cgi_initialize_multipart(boundary)) + return (0); + } + else if (!cgi_initialize_post()) + return (0); + + if ((cups_sid_form = cgiGetVariable(CUPS_SID)) == NULL || + strcmp(cups_sid_cookie, cups_sid_form)) + { + if (cups_sid_form) + fprintf(stderr, "DEBUG: " CUPS_SID " form variable is \"%s\"\n", + cups_sid_form); + else + fputs("DEBUG: " CUPS_SID " form variable is not present.\n", stderr); + + cgiClearVariables(); + return (0); + } else - return (cgi_initialize_post()); + return (1); } else return (0); @@ -371,6 +438,38 @@ cgiSetArray(const char *name, /* I - Na /* + * 'cgiSetCookie()' - Set a cookie value. + */ + +void +cgiSetCookie(const char *name, /* I - Name */ + const char *value, /* I - Value */ + const char *path, /* I - Path (typically "/") */ + const char *domain, /* I - Domain name */ + time_t expires, /* I - Expiration date (0 for session) */ + int secure) /* I - Require SSL */ +{ + num_cookies = cupsAddOption(name, value, num_cookies, &cookies); + + printf("Set-Cookie: %s=%s;", name, value); + if (path) + printf("; path=%s", path); + if (domain) + printf("; domain=%s", domain); + if (expires) + { + char date[256]; /* Date string */ + + printf("; expires=%s", httpGetDateString2(expires, date, sizeof(date))); + } + if (secure) + puts("; secure;"); + else + puts(";"); +} + + +/* * 'cgiSetSize()' - Set the array size. */ @@ -418,7 +517,7 @@ cgiSetSize(const char *name, /* I - Nam /* - * 'cgiSetVariable()' - Set a CGI variable in the database... + * 'cgiSetVariable()' - Set a CGI variable in the database. * * If the variable is an array, this truncates the array to a single element. */ @@ -514,7 +613,7 @@ cgi_compare_variables( /* - * 'cgi_find_variable()' - Find a variable... + * 'cgi_find_variable()' - Find a variable. */ static _cgi_var_t * /* O - Variable pointer or NULL */ @@ -534,6 +633,91 @@ cgi_find_variable(const char *name) /* I /* + * 'cgi_initialize_cookies()' - Initialize cookies. + */ + +static void +cgi_initialize_cookies(void) +{ + const char *cookie; /* HTTP_COOKIE environment variable */ + char name[128], /* Name string */ + value[512], /* Value string */ + *ptr; /* Pointer into name/value */ + + + if ((cookie = getenv("HTTP_COOKIE")) == NULL) + return; + + while (*cookie) + { + /* + * Skip leading whitespace... + */ + + while (isspace(*cookie & 255)) + cookie ++; + if (!*cookie) + break; + + /* + * Copy the name... + */ + + for (ptr = name; *cookie && *cookie != '=';) + if (ptr < (name + sizeof(name) - 1)) + *ptr++ = *cookie++; + else + break; + + if (*cookie != '=') + break; + + *ptr = '\0'; + cookie ++; + + /* + * Then the value... + */ + + if (*cookie == '\"') + { + for (cookie ++, ptr = value; *cookie && *cookie != '\"';) + if (ptr < (value + sizeof(value) - 1)) + *ptr++ = *cookie++; + else + break; + + if (*cookie == '\"') + cookie ++; + } + else + { + for (ptr = value; *cookie && *cookie != ';';) + if (ptr < (value + sizeof(value) - 1)) + *ptr++ = *cookie++; + else + break; + } + + if (*cookie == ';') + cookie ++; + else if (*cookie) + break; + + *ptr = '\0'; + + /* + * Then add the cookie to an array as long as the name doesn't start with + * "$"... + */ + + if (name[0] != '$') + num_cookies = cupsAddOption(name, value, num_cookies, &cookies); + } +} + + +/* * 'cgi_initialize_get()' - Initialize form variables using the GET method. */ @@ -562,7 +746,8 @@ cgi_initialize_get(void) /* - * 'cgi_initialize_multipart()' - Initialize variables and file using the POST method. + * 'cgi_initialize_multipart()' - Initialize variables and file using the POST + * method. * * TODO: Update to support files > 2GB. */ @@ -874,7 +1059,7 @@ cgi_initialize_string(const char *data) char *s, /* Pointer to current form string */ ch, /* Temporary character */ name[255], /* Name of form variable */ - value[65536]; /* Variable value... */ + value[65536]; /* Variable value */ /* @@ -1017,6 +1202,45 @@ cgi_passwd(const char *prompt) /* I - P } +/* + * 'cgi_set_sid()' - Set the CUPS session ID. + */ + +static const char * /* O - New session ID */ +cgi_set_sid(void) +{ + char buffer[512], /* SID data */ + sid[33]; /* SID string */ + _cups_md5_state_t md5; /* MD5 state */ + unsigned char sum[16]; /* MD5 sum */ + const char *remote_addr, /* REMOTE_ADDR */ + *server_name, /* SERVER_NAME */ + *server_port; /* SERVER_PORT */ + + + if ((remote_addr = getenv("REMOTE_ADDR")) == NULL) + remote_addr = "REMOTE_ADDR"; + if ((server_name = getenv("SERVER_NAME")) == NULL) + server_name = "SERVER_NAME"; + if ((server_port = getenv("SERVER_PORT")) == NULL) + server_port = "SERVER_PORT"; + + srand(time(NULL)); + snprintf(buffer, sizeof(buffer), "%s:%s:%s:%02X%02X%02X%02X%02X%02X%02X%02X", + remote_addr, server_name, server_port, (unsigned)rand() & 255, + (unsigned)rand() & 255, (unsigned)rand() & 255, (unsigned)rand() & 255, + (unsigned)rand() & 255, (unsigned)rand() & 255, (unsigned)rand() & 255, + (unsigned)rand() & 255); + _cupsMD5Init(&md5); + _cupsMD5Append(&md5, (unsigned char *)buffer, (int)strlen(buffer)); + _cupsMD5Finish(&md5, sum); + + cgiSetCookie(CUPS_SID, httpMD5String(sum, sid), "/", server_name, 0, 0); + + return (cupsGetOption(CUPS_SID, num_cookies, cookies)); +} + + /* * 'cgi_sort_variables()' - Sort all form variables for faster lookup. */ diff -Naurp cups-1.4.3/templates/add-class.tmpl cups-1.4.3.oden/templates/add-class.tmpl --- cups-1.4.3/templates/add-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/add-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Add Class</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <TABLE> diff -Naurp cups-1.4.3/templates/add-printer.tmpl cups-1.4.3.oden/templates/add-printer.tmpl --- cups-1.4.3/templates/add-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/add-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Add Printer</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/add-rss-subscription.tmpl cups-1.4.3.oden/templates/add-rss-subscription.tmpl --- cups-1.4.3/templates/add-rss-subscription.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/add-rss-subscription.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,4 +1,5 @@ <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"> <H2 CLASS="title">Add RSS Subscription</H2> diff -Naurp cups-1.4.3/templates/admin.tmpl cups-1.4.3.oden/templates/admin.tmpl --- cups-1.4.3/templates/admin.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/admin.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,16 +4,16 @@ <H2 CLASS="title">Printers</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Add Printer"></FORM> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Find New Printers"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Add Printer"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Find New Printers"></FORM> <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Printers"></FORM> -{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Export Printers to Samba"></FORM>:} +{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Export Printers to Samba"></FORM>:} </P> <H2 CLASS="title">Classes</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Add Class"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Add Class"></FORM> <FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Manage Classes"></FORM> </P> @@ -28,7 +28,7 @@ <H2 CLASS="title">Server</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Edit Configuration File"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Edit Configuration File"></FORM> <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Access Log"></FORM> <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Error Log"></FORM> <FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="View Page Log"></FORM> @@ -38,6 +38,7 @@ <BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>: <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> {ADVANCEDSETTINGS?<P><B>Server Settings\:</B></P> @@ -95,7 +96,7 @@ <H2 CLASS="title">RSS Subscriptions</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Add RSS Subscription"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Add RSS Subscription"></FORM> </P> </DIV> diff -Naurp cups-1.4.3/templates/choose-device.tmpl cups-1.4.3.oden/templates/choose-device.tmpl --- cups-1.4.3/templates/choose-device.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/choose-device.tmpl 2010-11-14 09:46:07.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2> {CUPS_GET_DEVICES_DONE?<FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/choose-make.tmpl cups-1.4.3.oden/templates/choose-make.tmpl --- cups-1.4.3/templates/choose-make.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/choose-make.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/choose-model.tmpl cups-1.4.3.oden/templates/choose-model.tmpl --- cups-1.4.3/templates/choose-model.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/choose-model.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/choose-serial.tmpl cups-1.4.3.oden/templates/choose-serial.tmpl --- cups-1.4.3/templates/choose-serial.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/choose-serial.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/choose-uri.tmpl cups-1.4.3.oden/templates/choose-uri.tmpl --- cups-1.4.3/templates/choose-uri.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/choose-uri.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}"> diff -Naurp cups-1.4.3/templates/class-confirm.tmpl cups-1.4.3.oden/templates/class-confirm.tmpl --- cups-1.4.3/templates/class-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/class-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,6 @@ <P><B>Warning:</B> Are you sure you want to delete class {printer_name}?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Delete Class"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Delete Class"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/class.tmpl cups-1.4.3.oden/templates/class.tmpl --- cups-1.4.3/templates/class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,7 @@ {server_is_sharing_printers=0?Not:{printer_is_shared=0?Not:}} Shared{default_name={printer_name}?, Server Default:})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Maintenance</OPTION> <OPTION VALUE="print-test-page">Print Test Page</OPTION> @@ -17,6 +18,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Administration</OPTION> diff -Naurp cups-1.4.3/templates/de/add-class.tmpl cups-1.4.3.oden/templates/de/add-class.tmpl --- cups-1.4.3/templates/de/add-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/add-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">>Klasse hinzufügen</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <TABLE> diff -Naurp cups-1.4.3/templates/de/add-printer.tmpl cups-1.4.3.oden/templates/de/add-printer.tmpl --- cups-1.4.3/templates/de/add-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/add-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Drucker hinzufügen</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/de/add-rss-subscription.tmpl cups-1.4.3.oden/templates/de/add-rss-subscription.tmpl --- cups-1.4.3/templates/de/add-rss-subscription.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/add-rss-subscription.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,4 +1,5 @@ <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"> <H2 CLASS="title">>RSS Subskription hinzufügen</H2> diff -Naurp cups-1.4.3/templates/de/admin.tmpl cups-1.4.3.oden/templates/de/admin.tmpl --- cups-1.4.3/templates/de/admin.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/admin.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,16 +4,16 @@ <H2 CLASS="title">Drucker</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Drucker hinzufügen"></FORM> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Verfügbare Drucker auflisten"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Drucker hinzufügen"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Verfügbare Drucker auflisten"></FORM> <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Drucker verwalten"></FORM> -{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Drucker für Samba freigeben"></FORM>:} +{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Drucker für Samba freigeben"></FORM>:} </P> <H2 CLASS="title">Klassen</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Klasse hinzufügen"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Klasse hinzufügen"></FORM> <FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Klassen verwalten"></FORM> </P> @@ -28,7 +28,7 @@ <H2 CLASS="title">Server</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Konfigurationsdatei bearbeiten"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Konfigurationsdatei bearbeiten"></FORM> <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Zugriffsprotokoll betrachten"></FORM> <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Fehlerprotokoll betrachten"></FORM> <FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Seitenprotokoll betrachten"></FORM> @@ -38,6 +38,7 @@ <BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>: <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> {ADVANCEDSETTINGS?<P><B>Erweiterte Servereinstellungen\:</B></P> @@ -95,7 +96,7 @@ <H2 CLASS="title">RSS Subskriptionen</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="RSS Subskription hinzufügen"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="RSS Subskription hinzufügen"></FORM> </P> </DIV> @@ -104,6 +105,6 @@ <THEAD><TR><TH>Name</TH><TH>Ereignis</TH><TH>Warteschlange</TH></TR></THEAD> <TBODY>{[notify_subscription_id] <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="RSS Subskription kündigen"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Alle Warteschlangen}</TD></TR>} +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="RSS Subskription kündigen"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Alle Warteschlangen}</TD></TR>} </TBODY> </TABLE>:} diff -Naurp cups-1.4.3/templates/de/choose-device.tmpl cups-1.4.3.oden/templates/de/choose-device.tmpl --- cups-1.4.3/templates/de/choose-device.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/choose-device.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ ALT="Busy Indicator"> Suche nach Druckern...</P>} <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/de/choose-make.tmpl cups-1.4.3.oden/templates/de/choose-make.tmpl --- cups-1.4.3/templates/de/choose-make.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/choose-make.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?{printer_name} ändern:Drucker hinzufügen}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/de/choose-model.tmpl cups-1.4.3.oden/templates/de/choose-model.tmpl --- cups-1.4.3/templates/de/choose-model.tmpl 2010-02-15 16:51:42.000000000 +0000 +++ cups-1.4.3.oden/templates/de/choose-model.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?{printer_name} ändern:Drucker hinzufügen}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/de/choose-serial.tmpl cups-1.4.3.oden/templates/de/choose-serial.tmpl --- cups-1.4.3/templates/de/choose-serial.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/choose-serial.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?{printer_name} ändern:Drucker hinzufügen}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/de/choose-uri.tmpl cups-1.4.3.oden/templates/de/choose-uri.tmpl --- cups-1.4.3/templates/de/choose-uri.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/choose-uri.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?{printer_name} ändern:Drucker hinzufügen}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}"> diff -Naurp cups-1.4.3/templates/de/class-confirm.tmpl cups-1.4.3.oden/templates/de/class-confirm.tmpl --- cups-1.4.3/templates/de/class-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/class-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,6 @@ <P><B>Warnung:</B> Sind Sie sicher, dass Sie die Klasse {printer_name} löschen wollen?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Klasse löschen"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Klasse löschen"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/de/class.tmpl cups-1.4.3.oden/templates/de/class.tmpl --- cups-1.4.3/templates/de/class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,7 @@ {server_is_sharing_printers=0?Nicht:{printer_is_shared=0?Nicht:}} Freigegeben{default_name={printer_name}?, Standarddrucker:})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Wartung</OPTION> <OPTION VALUE="print-test-page">Drucke Testseite</OPTION> @@ -17,6 +18,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Administration</OPTION> diff -Naurp cups-1.4.3/templates/de/edit-config.tmpl cups-1.4.3.oden/templates/de/edit-config.tmpl --- cups-1.4.3/templates/de/edit-config.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/edit-config.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,7 +10,7 @@ function reset_config() <H2 CLASS="title">Konfigurationsdatei ändern</H2> <FORM NAME="cups" METHOD="POST" ACTION="/admin/"> - +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA> diff -Naurp cups-1.4.3/templates/de/job-move.tmpl cups-1.4.3.oden/templates/de/job-move.tmpl --- cups-1.4.3/templates/de/job-move.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/job-move.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:} diff -Naurp cups-1.4.3/templates/de/jobs.tmpl cups-1.4.3.oden/templates/de/jobs.tmpl --- cups-1.4.3/templates/de/jobs.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/jobs.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -17,18 +17,18 @@ <EM>"{job_printer_state_message}"</EM>:}</TD> <TD> {job_preserved>0?{job_state>5? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Auftrag neu drucken"></FORM>:}:} {job_state=4? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Auftrag freigeben"></FORM>:} {job_state=3? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Auftrag anhalten"></FORM>:} {job_state<7? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Auftrag löschen"></FORM> -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Auftrag verschieben"></FORM>:} +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Auftrag verschieben"></FORM>:} </TD> </TR> } diff -Naurp cups-1.4.3/templates/de/list-available-printers.tmpl cups-1.4.3.oden/templates/de/list-available-printers.tmpl --- cups-1.4.3/templates/de/list-available-printers.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/list-available-printers.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,7 +4,7 @@ {#device_uri=0?<P>Keine Drucker gefunden.</P> :<UL>{[device_uri] -<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Diesen Drucker hinzufügen"></FORM> +<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Diesen Drucker hinzufügen"></FORM> {device_make_and_model} ({device_info})</LI> }</UL>} diff -Naurp cups-1.4.3/templates/de/modify-class.tmpl cups-1.4.3.oden/templates/de/modify-class.tmpl --- cups-1.4.3/templates/de/modify-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/modify-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Klasse {printer_name} ändern</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> diff -Naurp cups-1.4.3/templates/de/modify-printer.tmpl cups-1.4.3.oden/templates/de/modify-printer.tmpl --- cups-1.4.3/templates/de/modify-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/modify-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{printer_name} ändern</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/de/printer-confirm.tmpl cups-1.4.3.oden/templates/de/printer-confirm.tmpl --- cups-1.4.3/templates/de/printer-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/printer-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,6 @@ <P><B>Warnung:</B> Sind Sie sicher, dass Sie den Drucker {printer_name} löschen wollen?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Drucker löschen"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Drucker löschen"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/de/printer.tmpl cups-1.4.3.oden/templates/de/printer.tmpl --- cups-1.4.3/templates/de/printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ {server_is_sharing_printers=0?Nicht:{printer_is_shared=0?Nicht:}} freigegeben{default_name={printer_name}?, Standarddrucker:})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Wartung</OPTION> <OPTION VALUE="print-test-page">Testseite drucken</OPTION> @@ -20,6 +21,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Administration</OPTION> diff -Naurp cups-1.4.3/templates/de/samba-export.tmpl cups-1.4.3.oden/templates/de/samba-export.tmpl --- cups-1.4.3/templates/de/samba-export.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/samba-export.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,6 +10,7 @@ function select_printers() { --></SCRIPT> <FORM METHOD="POST" ACTION="/admin/" NAME="export_samba"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"> <H2 CLASS="title">Drucker für Samba freigeben</H2> diff -Naurp cups-1.4.3/templates/de/set-printer-options-header.tmpl cups-1.4.3.oden/templates/de/set-printer-options-header.tmpl --- cups-1.4.3/templates/de/set-printer-options-header.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/set-printer-options-header.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Standardeinstellungen für {printer_name} festlegen</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Drucker nach Standardeinstellungen fragen">:} diff -Naurp cups-1.4.3/templates/de/users.tmpl cups-1.4.3.oden/templates/de/users.tmpl --- cups-1.4.3/templates/de/users.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/de/users.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> {IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:} diff -Naurp cups-1.4.3/templates/edit-config.tmpl cups-1.4.3.oden/templates/edit-config.tmpl --- cups-1.4.3/templates/edit-config.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/edit-config.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,7 +10,7 @@ function reset_config() <H2 CLASS="title">Edit Configuration File</H2> <FORM NAME="cups" METHOD="POST" ACTION="/admin/"> - +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA> diff -Naurp cups-1.4.3/templates/es/add-class.tmpl cups-1.4.3.oden/templates/es/add-class.tmpl --- cups-1.4.3/templates/es/add-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/add-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Añadir clase</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <TABLE> diff -Naurp cups-1.4.3/templates/es/add-printer.tmpl cups-1.4.3.oden/templates/es/add-printer.tmpl --- cups-1.4.3/templates/es/add-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/add-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Añadir impresora</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/es/add-rss-subscription.tmpl cups-1.4.3.oden/templates/es/add-rss-subscription.tmpl --- cups-1.4.3/templates/es/add-rss-subscription.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/add-rss-subscription.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,4 +1,5 @@ <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"> <H2 CLASS="title">Añadir subscripción RSS</H2> diff -Naurp cups-1.4.3/templates/es/admin.tmpl cups-1.4.3.oden/templates/es/admin.tmpl --- cups-1.4.3/templates/es/admin.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/admin.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,16 +4,16 @@ <H2 CLASS="title">Impresoras</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Añadir impresora"></FORM> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Encontrar nuevas impresoras"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Añadir impresora"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Encontrar nuevas impresoras"></FORM> <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Administrar impresoras"></FORM> -{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Exportar impresoras a Samba"></FORM>:} +{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Exportar impresoras a Samba"></FORM>:} </P> <H2 CLASS="title">Clases</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Añadir clase"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Añadir clase"></FORM> <FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Administrar clases"></FORM> </P> @@ -28,7 +28,7 @@ <H2 CLASS="title">Servidor</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Editar archivo configuración"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Editar archivo configuración"></FORM> <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ver archivo de registro de accesos"></FORM> <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ver archivo de registro de errores"></FORM> <FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ver archivo de registro de páginas"></FORM> @@ -38,6 +38,7 @@ <BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>: <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> {ADVANCEDSETTINGS?<P><B>Configuración del servidor\:</B></P> @@ -95,7 +96,7 @@ <H2 CLASS="title">Subscripciones RSS</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Añadir subscripción RSS"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Añadir subscripción RSS"></FORM> </P> </DIV> @@ -104,6 +105,6 @@ <THEAD><TR><TH>Nombre</TH><TH>Eventos</TH><TH>Nombre de la cola</TH></TR></THEAD> <TBODY>{[notify_subscription_id] <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancelar subscripción RSS"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Todas las colas}</TD></TR>} +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancelar subscripción RSS"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Todas las colas}</TD></TR>} </TBODY> </TABLE>:} diff -Naurp cups-1.4.3/templates/es/choose-device.tmpl cups-1.4.3.oden/templates/es/choose-device.tmpl --- cups-1.4.3/templates/es/choose-device.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/choose-device.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ ALT="Busy Indicator"> Buscando impresoras...</P>} <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/es/choose-make.tmpl cups-1.4.3.oden/templates/es/choose-make.tmpl --- cups-1.4.3/templates/es/choose-make.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/choose-make.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modificar {printer_name}:Añadir impresora}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/es/choose-model.tmpl cups-1.4.3.oden/templates/es/choose-model.tmpl --- cups-1.4.3/templates/es/choose-model.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/choose-model.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modificar {printer_name}:Añadir impresora}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/es/choose-serial.tmpl cups-1.4.3.oden/templates/es/choose-serial.tmpl --- cups-1.4.3/templates/es/choose-serial.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/choose-serial.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modificar {printer_name}:Añadir impresora}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/es/choose-uri.tmpl cups-1.4.3.oden/templates/es/choose-uri.tmpl --- cups-1.4.3/templates/es/choose-uri.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/choose-uri.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modificar {printer_name}:Añadir impresora}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}"> diff -Naurp cups-1.4.3/templates/es/class-confirm.tmpl cups-1.4.3.oden/templates/es/class-confirm.tmpl --- cups-1.4.3/templates/es/class-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/class-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,6 @@ <P><B>Advertencia:</B> ¿Está seguro de querer borrar la clase {printer_name}?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Borrar clase"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Borrar clase"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/es/class.tmpl cups-1.4.3.oden/templates/es/class.tmpl --- cups-1.4.3/templates/es/class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,7 @@ {server_is_sharing_printers=0?no:{printer_is_shared=0?no:}} compartida{default_name={printer_name}?, predeterminada del servidor:})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Mantenimiento</OPTION> <OPTION VALUE="print-test-page">Imprimir página de prueba</OPTION> @@ -17,6 +18,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Administración</OPTION> diff -Naurp cups-1.4.3/templates/es/edit-config.tmpl cups-1.4.3.oden/templates/es/edit-config.tmpl --- cups-1.4.3/templates/es/edit-config.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/edit-config.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,7 +10,7 @@ function reset_config() <H2 CLASS="title">Editar archivo de configuración</H2> <FORM NAME="cups" METHOD="POST" ACTION="/admin/"> - +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA> diff -Naurp cups-1.4.3/templates/es/job-move.tmpl cups-1.4.3.oden/templates/es/job-move.tmpl --- cups-1.4.3/templates/es/job-move.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/job-move.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:} diff -Naurp cups-1.4.3/templates/es/jobs.tmpl cups-1.4.3.oden/templates/es/jobs.tmpl --- cups-1.4.3/templates/es/jobs.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/jobs.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -17,18 +17,18 @@ <EM>"{job_printer_state_message}"</EM>:}</TD> <TD> {job_preserved>0?{job_state>5? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Reimprimir trabajo"></FORM>:}:} {job_state=4? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Liberar trabajo"></FORM>:} {job_state=3? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Retener trabajo"></FORM>:} {job_state<7? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Cancelar trabajo"></FORM> -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Mover trabajo"></FORM>:} +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Mover trabajo"></FORM>:} </TD> </TR> } diff -Naurp cups-1.4.3/templates/es/list-available-printers.tmpl cups-1.4.3.oden/templates/es/list-available-printers.tmpl --- cups-1.4.3/templates/es/list-available-printers.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/list-available-printers.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,7 +4,7 @@ {#device_uri=0?<P>No se encuentran impresoras.</P> :<UL>{[device_uri] -<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Añadir esta impresora"></FORM> +<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Añadir esta impresora"></FORM> {device_make_and_model} ({device_info})</LI> }</UL>} diff -Naurp cups-1.4.3/templates/es/modify-class.tmpl cups-1.4.3.oden/templates/es/modify-class.tmpl --- cups-1.4.3/templates/es/modify-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/modify-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Modificar clase {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> diff -Naurp cups-1.4.3/templates/es/modify-printer.tmpl cups-1.4.3.oden/templates/es/modify-printer.tmpl --- cups-1.4.3/templates/es/modify-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/modify-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Modificar {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/es/printer-confirm.tmpl cups-1.4.3.oden/templates/es/printer-confirm.tmpl --- cups-1.4.3/templates/es/printer-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/printer-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,6 @@ <P><B>Advertencia:</B> ¿Está seguro de querer borrar la impresora {printer_name}?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Borrar impresora"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Borrar impresora"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/es/printer.tmpl cups-1.4.3.oden/templates/es/printer.tmpl --- cups-1.4.3/templates/es/printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ {server_is_sharing_printers=0?no:{printer_is_shared=0?no:}} compartida{default_name={printer_name}?, predeterminada del servidor:})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Mantenimiento</OPTION> <OPTION VALUE="print-test-page">Imprimir página de prueba</OPTION> @@ -20,6 +21,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Administración</OPTION> diff -Naurp cups-1.4.3/templates/es/samba-export.tmpl cups-1.4.3.oden/templates/es/samba-export.tmpl --- cups-1.4.3/templates/es/samba-export.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/samba-export.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,6 +10,7 @@ function select_printers() { --></SCRIPT> <FORM METHOD="POST" ACTION="/admin/" NAME="export_samba"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"> <H2 CLASS="title">Exportar impresoras a Samba</H2> diff -Naurp cups-1.4.3/templates/es/set-printer-options-header.tmpl cups-1.4.3.oden/templates/es/set-printer-options-header.tmpl --- cups-1.4.3/templates/es/set-printer-options-header.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/set-printer-options-header.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Establecer opciones predeterminadas de {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Consultar a la impresora las opciones predeterminadas">:} diff -Naurp cups-1.4.3/templates/es/users.tmpl cups-1.4.3.oden/templates/es/users.tmpl --- cups-1.4.3/templates/es/users.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/es/users.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> {IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:} diff -Naurp cups-1.4.3/templates/eu/add-class.tmpl cups-1.4.3.oden/templates/eu/add-class.tmpl --- cups-1.4.3/templates/eu/add-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/add-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Gehitu klasea</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <TABLE> diff -Naurp cups-1.4.3/templates/eu/add-printer.tmpl cups-1.4.3.oden/templates/eu/add-printer.tmpl --- cups-1.4.3/templates/eu/add-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/add-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Gehitu inprimagailua</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/eu/add-rss-subscription.tmpl cups-1.4.3.oden/templates/eu/add-rss-subscription.tmpl --- cups-1.4.3/templates/eu/add-rss-subscription.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/add-rss-subscription.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,4 +1,5 @@ <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"> <H2 CLASS="title">Gehitu RSS harpidetza</H2> diff -Naurp cups-1.4.3/templates/eu/admin.tmpl cups-1.4.3.oden/templates/eu/admin.tmpl --- cups-1.4.3/templates/eu/admin.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/admin.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,16 +4,16 @@ <H2 CLASS="title">Inprimagailuak</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Gehitu inprimagailua"></FORM> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Bilatu inprimagailu berriak"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Gehitu inprimagailua"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Bilatu inprimagailu berriak"></FORM> <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Kudeatu inprimagailuak"></FORM> -{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Esportatu inprimagailuak Samba-ra"></FORM>:} +{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Esportatu inprimagailuak Samba-ra"></FORM>:} </P> <H2 CLASS="title">Klaseak</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Gehitu klasea"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Gehitu klasea"></FORM> <FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Kudeatu klaseak"></FORM> </P> @@ -28,7 +28,7 @@ <H2 CLASS="title">Zerbitzaria</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Editatu konfigurazioko fitxategia"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Editatu konfigurazioko fitxategia"></FORM> <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ikusi atzipenen egunkaria"></FORM> <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ikusi erroreen egunkaria"></FORM> <FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Ikusi orrialdeen egunkaria"></FORM> @@ -38,6 +38,7 @@ <BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>: <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> {ADVANCEDSETTINGS?<P><B>Zerbitzariaren ezarpenak\:</B></P> @@ -95,7 +96,7 @@ <H2 CLASS="title">RSS harpidetzak</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Gehitu RSS harpidetza"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Gehitu RSS harpidetza"></FORM> </P> </DIV> @@ -104,6 +105,6 @@ <THEAD><TR><TH>Izena</TH><TH>Gertaerak</TH><TH>Ilararen izena</TH></TR></THEAD> <TBODY>{[notify_subscription_id] <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Utzi RSS harpidetza"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Ilara guztiak}</TD></TR>} +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Utzi RSS harpidetza"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Ilara guztiak}</TD></TR>} </TBODY> </TABLE>:} diff -Naurp cups-1.4.3/templates/eu/choose-device.tmpl cups-1.4.3.oden/templates/eu/choose-device.tmpl --- cups-1.4.3/templates/eu/choose-device.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/choose-device.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ ALT="Busy Indicator"> Inprimagailuak bilatzen...</P>} <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/eu/choose-make.tmpl cups-1.4.3.oden/templates/eu/choose-make.tmpl --- cups-1.4.3/templates/eu/choose-make.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/choose-make.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/eu/choose-model.tmpl cups-1.4.3.oden/templates/eu/choose-model.tmpl --- cups-1.4.3/templates/eu/choose-model.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/choose-model.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/eu/choose-serial.tmpl cups-1.4.3.oden/templates/eu/choose-serial.tmpl --- cups-1.4.3/templates/eu/choose-serial.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/choose-serial.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/eu/choose-uri.tmpl cups-1.4.3.oden/templates/eu/choose-uri.tmpl --- cups-1.4.3/templates/eu/choose-uri.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/choose-uri.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}"> diff -Naurp cups-1.4.3/templates/eu/class-confirm.tmpl cups-1.4.3.oden/templates/eu/class-confirm.tmpl --- cups-1.4.3/templates/eu/class-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/class-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,6 +4,6 @@ <P><B>Abisua:</B> ziur zaude {printer_name} klasea ezabatu nahi duzula?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Ezabatu klasea"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Ezabatu klasea"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/eu/class.tmpl cups-1.4.3.oden/templates/eu/class.tmpl --- cups-1.4.3/templates/eu/class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,7 @@ {default_name={printer_name}?, zerbitzariaren lehenetsiak:} partekatuta {server_is_sharing_printers=0?ez:{printer_is_shared=0?ez:}} daude)</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Mantenimendua</OPTION> <OPTION VALUE="print-test-page">Inprimatu probako orrialdea</OPTION> @@ -17,6 +18,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Administrazioa</OPTION> diff -Naurp cups-1.4.3/templates/eu/edit-config.tmpl cups-1.4.3.oden/templates/eu/edit-config.tmpl --- cups-1.4.3/templates/eu/edit-config.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/edit-config.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,7 +10,7 @@ function reset_config() <H2 CLASS="title">Editatu konfigurazioko fitxategia</H2> <FORM NAME="cups" METHOD="POST" ACTION="/admin/"> - +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA> diff -Naurp cups-1.4.3/templates/eu/job-move.tmpl cups-1.4.3.oden/templates/eu/job-move.tmpl --- cups-1.4.3/templates/eu/job-move.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/job-move.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:} diff -Naurp cups-1.4.3/templates/eu/jobs.tmpl cups-1.4.3.oden/templates/eu/jobs.tmpl --- cups-1.4.3/templates/eu/jobs.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/jobs.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -17,18 +17,18 @@ <EM>"{job_printer_state_message}"</EM>:}</TD> <TD> {job_preserved>0?{job_state>5? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Inprimatu berriro lana"></FORM>:}:} {job_state=4? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Askatu lana"></FORM>:} {job_state=3? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Eutsi lana"></FORM>:} {job_state<7? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Utzi lana"></FORM> -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Aldatu lana lekuz"></FORM>:} +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Aldatu lana lekuz"></FORM>:} </TD> </TR> } diff -Naurp cups-1.4.3/templates/eu/list-available-printers.tmpl cups-1.4.3.oden/templates/eu/list-available-printers.tmpl --- cups-1.4.3/templates/eu/list-available-printers.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/list-available-printers.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,7 +4,7 @@ {#device_uri=0?<P>Ez da inprimagailurik aurkitu.</P> :<UL>{[device_uri] -<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Gehitu inprimagailu hau"></FORM> +<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Gehitu inprimagailu hau"></FORM> {device_make_and_model} ({device_info})</LI> }</UL>} diff -Naurp cups-1.4.3/templates/eu/modify-class.tmpl cups-1.4.3.oden/templates/eu/modify-class.tmpl --- cups-1.4.3/templates/eu/modify-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/modify-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Aldatu {printer_name} klasea</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> diff -Naurp cups-1.4.3/templates/eu/modify-printer.tmpl cups-1.4.3.oden/templates/eu/modify-printer.tmpl --- cups-1.4.3/templates/eu/modify-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/modify-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Aldatu {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/eu/printer-confirm.tmpl cups-1.4.3.oden/templates/eu/printer-confirm.tmpl --- cups-1.4.3/templates/eu/printer-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/printer-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,6 +4,6 @@ <P><B>Abisua:</B> ziur zaude {printer_name} inprimagailua ezabatzea nahi duzula?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Ezabatu inprimagailua"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Ezabatu inprimagailua"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/eu/printer.tmpl cups-1.4.3.oden/templates/eu/printer.tmpl --- cups-1.4.3/templates/eu/printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ {default_name={printer_name}?, Zerbitzariaren lehenetsia:} partekatuta {server_is_sharing_printers=0?ez:{printer_is_shared=0?ez:}} dago)</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Mantenimendua</OPTION> <OPTION VALUE="print-test-page">Inprimatu probako orrialdea</OPTION> @@ -20,6 +21,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Administrazioa</OPTION> diff -Naurp cups-1.4.3/templates/eu/samba-export.tmpl cups-1.4.3.oden/templates/eu/samba-export.tmpl --- cups-1.4.3/templates/eu/samba-export.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/samba-export.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,6 +10,7 @@ function select_printers() { --></SCRIPT> <FORM METHOD="POST" ACTION="/admin/" NAME="export_samba"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"> <H2 CLASS="title">Esportatu inprimagailuak Samba-ra</H2> diff -Naurp cups-1.4.3/templates/eu/set-printer-options-header.tmpl cups-1.4.3.oden/templates/eu/set-printer-options-header.tmpl --- cups-1.4.3/templates/eu/set-printer-options-header.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/set-printer-options-header.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Ezarri {printer_name}(r)en aukera lehenetsiak</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Kontsultatu inprimagailuaren aukera lehenetsiei buruz">:} diff -Naurp cups-1.4.3/templates/eu/users.tmpl cups-1.4.3.oden/templates/eu/users.tmpl --- cups-1.4.3/templates/eu/users.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/eu/users.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> {IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:} diff -Naurp cups-1.4.3/templates/ja/add-class.tmpl cups-1.4.3.oden/templates/ja/add-class.tmpl --- cups-1.4.3/templates/ja/add-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/add-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">クラスの追加</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <TABLE> diff -Naurp cups-1.4.3/templates/ja/add-printer.tmpl cups-1.4.3.oden/templates/ja/add-printer.tmpl --- cups-1.4.3/templates/ja/add-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/add-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">新しいプリンターの追加</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/ja/add-rss-subscription.tmpl cups-1.4.3.oden/templates/ja/add-rss-subscription.tmpl --- cups-1.4.3/templates/ja/add-rss-subscription.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/add-rss-subscription.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,4 +1,5 @@ <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"> <H2 CLASS="title">RSS 購読を追加</H2> diff -Naurp cups-1.4.3/templates/ja/admin.tmpl cups-1.4.3.oden/templates/ja/admin.tmpl --- cups-1.4.3/templates/ja/admin.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/admin.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,16 +4,16 @@ <H2 CLASS="title">プリンター</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="プリンターの追加"></FORM> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="新しいプリンターの検索"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="プリンターの追加"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="新しいプリンターの検索"></FORM> <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="プリンターの管理"></FORM> -{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="プリンターを Samba にエクスポート"></FORM>:} +{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="プリンターを Samba にエクスポート"></FORM>:} </P> <H2 CLASS="title">クラス</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="クラスの追加"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="クラスの追加"></FORM> <FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="クラスの管理"></FORM> </P> @@ -28,7 +28,7 @@ <H2 CLASS="title">サーバー</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="設定ファイルの編集"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="設定ファイルの編集"></FORM> <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="アクセスログの表示"></FORM> <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="エラーログの表示"></FORM> <FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="ページログの表示"></FORM> @@ -38,6 +38,7 @@ <BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>: <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> {ADVANCEDSETTINGS?<P><B>サーバー設定\:</B></P> @@ -95,7 +96,7 @@ <H2 CLASS="title">RSS 購読</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="RSS 購読の追加"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="RSS 購読の追加"></FORM> </P> </DIV> @@ -104,6 +105,6 @@ <THEAD><TR><TH>名前</TH><TH>イベント</TH><TH>キュー名</TH></TR></THEAD> <TBODY>{[notify_subscription_id] <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="RSS 購読のキャンセル"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:すべてのキュー}</TD></TR>} +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="RSS 購読のキャンセル"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:すべてのキュー}</TD></TR>} </TBODY> </TABLE>:} diff -Naurp cups-1.4.3/templates/ja/choose-device.tmpl cups-1.4.3.oden/templates/ja/choose-device.tmpl --- cups-1.4.3/templates/ja/choose-device.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/choose-device.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ ALT="Busy Indicator"> プリンターを探しています...</P>} <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/ja/choose-make.tmpl cups-1.4.3.oden/templates/ja/choose-make.tmpl --- cups-1.4.3/templates/ja/choose-make.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/choose-make.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?{printer_name}の変更:プリンターの追加}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/ja/choose-model.tmpl cups-1.4.3.oden/templates/ja/choose-model.tmpl --- cups-1.4.3/templates/ja/choose-model.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/choose-model.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?{printer_name}の追加:プリンターの追加}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/ja/choose-serial.tmpl cups-1.4.3.oden/templates/ja/choose-serial.tmpl --- cups-1.4.3/templates/ja/choose-serial.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/choose-serial.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?{printer_name}の変更:プリンターの追加}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/ja/choose-uri.tmpl cups-1.4.3.oden/templates/ja/choose-uri.tmpl --- cups-1.4.3/templates/ja/choose-uri.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/choose-uri.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?{printer_name}の変更:プリンターの追加}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}"> diff -Naurp cups-1.4.3/templates/ja/class-confirm.tmpl cups-1.4.3.oden/templates/ja/class-confirm.tmpl --- cups-1.4.3/templates/ja/class-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/class-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,6 @@ <P><B>警告:</B> 本当にクラス {printer_name} を削除しても良いですか?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="クラスの削除"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="クラスの削除"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/ja/class.tmpl cups-1.4.3.oden/templates/ja/class.tmpl --- cups-1.4.3/templates/ja/class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,7 @@ {server_is_sharing_printers=0?非:{printer_is_shared=0?非:}}共有{default_name={printer_name}?, デフォルトプリンター:})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">メンテナンス</OPTION> <OPTION VALUE="print-test-page">テストページの印刷</OPTION> @@ -17,6 +18,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">管理</OPTION> diff -Naurp cups-1.4.3/templates/ja/edit-config.tmpl cups-1.4.3.oden/templates/ja/edit-config.tmpl --- cups-1.4.3/templates/ja/edit-config.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/edit-config.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,7 +10,7 @@ function reset_config() <H2 CLASS="title">設定ファイルの設定</H2> <FORM NAME="cups" METHOD="POST" ACTION="/admin/"> - +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA> diff -Naurp cups-1.4.3/templates/ja/job-move.tmpl cups-1.4.3.oden/templates/ja/job-move.tmpl --- cups-1.4.3/templates/ja/job-move.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/job-move.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:} diff -Naurp cups-1.4.3/templates/ja/jobs.tmpl cups-1.4.3.oden/templates/ja/jobs.tmpl --- cups-1.4.3/templates/ja/jobs.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/jobs.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -17,18 +17,18 @@ <EM>"{job_printer_state_message}"</EM>:}</TD> <TD> {job_preserved>0?{job_state>5? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="ジョブの再印刷"></FORM>:}:} {job_state=4? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="ジョブを解放"></FORM>:} {job_state=3? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="ジョブを保留"></FORM>:} {job_state<7? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="ジョブをキャンセル"></FORM> -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="ジョブを移動"></FORM>:} +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="ジョブを移動"></FORM>:} </TD> </TR> } diff -Naurp cups-1.4.3/templates/ja/list-available-printers.tmpl cups-1.4.3.oden/templates/ja/list-available-printers.tmpl --- cups-1.4.3/templates/ja/list-available-printers.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/list-available-printers.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,7 +4,7 @@ {#device_uri=0?<P>プリンターが見つかりません。</P> :<UL>{[device_uri] -<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="このプリンターを追加"></FORM> +<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="このプリンターを追加"></FORM> {device_make_and_model} ({device_info})</LI> }</UL>} diff -Naurp cups-1.4.3/templates/ja/modify-class.tmpl cups-1.4.3.oden/templates/ja/modify-class.tmpl --- cups-1.4.3/templates/ja/modify-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/modify-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">クラス {printer_name} の変更</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> diff -Naurp cups-1.4.3/templates/ja/modify-printer.tmpl cups-1.4.3.oden/templates/ja/modify-printer.tmpl --- cups-1.4.3/templates/ja/modify-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/modify-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">プリンター {printer_name} の変更</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/ja/printer-confirm.tmpl cups-1.4.3.oden/templates/ja/printer-confirm.tmpl --- cups-1.4.3/templates/ja/printer-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/printer-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,6 +4,6 @@ <P><B>警告:</B> 本当にプリンター {printer_name} を削除してよいですか?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="プリンターの削除"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="プリンターの削除"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/ja/printer.tmpl cups-1.4.3.oden/templates/ja/printer.tmpl --- cups-1.4.3/templates/ja/printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ {server_is_sharing_printers=0?非:{printer_is_shared=0?非:}}共有{default_name={printer_name}?, デフォルトプリンター:})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">メンテナンス</OPTION> <OPTION VALUE="print-test-page">テストページの印刷</OPTION> @@ -20,6 +21,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">管理</OPTION> diff -Naurp cups-1.4.3/templates/ja/samba-export.tmpl cups-1.4.3.oden/templates/ja/samba-export.tmpl --- cups-1.4.3/templates/ja/samba-export.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/samba-export.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,6 +10,7 @@ function select_printers() { --></SCRIPT> <FORM METHOD="POST" ACTION="/admin/" NAME="export_samba"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"> <H2 CLASS="title">プリンターを Samba にエクスポート</H2> diff -Naurp cups-1.4.3/templates/ja/set-printer-options-header.tmpl cups-1.4.3.oden/templates/ja/set-printer-options-header.tmpl --- cups-1.4.3/templates/ja/set-printer-options-header.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/set-printer-options-header.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{printer_name} のデフォルトオプション変更</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="プリンターにデフォルトオプションを問い合わせる">:} diff -Naurp cups-1.4.3/templates/ja/users.tmpl cups-1.4.3.oden/templates/ja/users.tmpl --- cups-1.4.3/templates/ja/users.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ja/users.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> {IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:} diff -Naurp cups-1.4.3/templates/job-move.tmpl cups-1.4.3.oden/templates/job-move.tmpl --- cups-1.4.3/templates/job-move.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/job-move.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:} diff -Naurp cups-1.4.3/templates/jobs.tmpl cups-1.4.3.oden/templates/jobs.tmpl --- cups-1.4.3/templates/jobs.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/jobs.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -17,18 +17,17 @@ <EM>"{job_printer_state_message}"</EM>:}</TD> <TD> {job_preserved>0?{job_state>5? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> -<INPUT TYPE="SUBMIT" VALUE="Reprint Job"></FORM>:}:} +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"><INPUT TYPE="SUBMIT" VALUE="Reprint Job"></FORM>:}:} {job_state=4? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Release Job"></FORM>:} {job_state=3? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Hold Job"></FORM>:} {job_state<7? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Cancel Job"></FORM> -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Move Job"></FORM>:} +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Move Job"></FORM>:} </TD> </TR> } diff -Naurp cups-1.4.3/templates/list-available-printers.tmpl cups-1.4.3.oden/templates/list-available-printers.tmpl --- cups-1.4.3/templates/list-available-printers.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/list-available-printers.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,7 +4,7 @@ {#device_uri=0?<P>No printers found.</P> :<UL>{[device_uri] -<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Add This Printer"></FORM> +<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Local Printer"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Add This Printer"></FORM> {device_make_and_model} ({device_info})</LI> }</UL>} diff -Naurp cups-1.4.3/templates/modify-class.tmpl cups-1.4.3.oden/templates/modify-class.tmpl --- cups-1.4.3/templates/modify-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/modify-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Modify Class {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> diff -Naurp cups-1.4.3/templates/modify-printer.tmpl cups-1.4.3.oden/templates/modify-printer.tmpl --- cups-1.4.3/templates/modify-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/modify-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Modify {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/pl/add-class.tmpl cups-1.4.3.oden/templates/pl/add-class.tmpl --- cups-1.4.3/templates/pl/add-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/add-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Dodawanie klasy</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <TABLE> diff -Naurp cups-1.4.3/templates/pl/add-printer.tmpl cups-1.4.3.oden/templates/pl/add-printer.tmpl --- cups-1.4.3/templates/pl/add-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/add-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Dodawanie drukarki</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/pl/add-rss-subscription.tmpl cups-1.4.3.oden/templates/pl/add-rss-subscription.tmpl --- cups-1.4.3/templates/pl/add-rss-subscription.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/add-rss-subscription.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,4 +1,5 @@ <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"> <H2 CLASS="title">Dodawanie subskrypcji RSS</H2> diff -Naurp cups-1.4.3/templates/pl/admin.tmpl cups-1.4.3.oden/templates/pl/admin.tmpl --- cups-1.4.3/templates/pl/admin.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/admin.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,16 +4,16 @@ <H2 CLASS="title">Drukarki</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Dodawanie drukarki"></FORM> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Wyszukiwanie nowych drukarek"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Dodawanie drukarki"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Wyszukiwanie nowych drukarek"></FORM> <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Zarządzanie drukarkami"></FORM> -{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Eksportowanie drukarek do Samby"></FORM>:} +{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Eksportowanie drukarek do Samby"></FORM>:} </P> <H2 CLASS="title">Klasy</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Dodawanie klasy"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Dodawanie klasy"></FORM> <FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Zarządzanie klasami"></FORM> </P> @@ -28,7 +28,7 @@ <H2 CLASS="title">Serwery</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Modyfikowanie pliku konfiguracji"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Modyfikowanie pliku konfiguracji"></FORM> <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Przeglądanie dziennika dostępu"></FORM> <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Przeglądanie dziennika błędów"></FORM> <FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Przeglądanie dziennika stron"></FORM> @@ -38,6 +38,7 @@ <BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>: <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> {ADVANCEDSETTINGS?<P><B>Ustawienia serwera\:</B></P> @@ -95,7 +96,7 @@ <H2 CLASS="title">Subskrypcje RSS</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Dodawanie subskrypcji RSS"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Dodawanie subskrypcji RSS"></FORM> </P> </DIV> @@ -104,6 +105,6 @@ <THEAD><TR><TH>Name</TH><TH>Zdarzenia</TH><TH>Nazwa kolejki</TH></TR></THEAD> <TBODY>{[notify_subscription_id] <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Anuluj subskrypcję RSS"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Wszystkie kolejki}</TD></TR>} +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Anuluj subskrypcję RSS"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Wszystkie kolejki}</TD></TR>} </TBODY> </TABLE>:} diff -Naurp cups-1.4.3/templates/pl/choose-device.tmpl cups-1.4.3.oden/templates/pl/choose-device.tmpl --- cups-1.4.3/templates/pl/choose-device.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/choose-device.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ ALT="Busy Indicator"> Wyszukiwanie drukarek...</P>} <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/pl/choose-make.tmpl cups-1.4.3.oden/templates/pl/choose-make.tmpl --- cups-1.4.3/templates/pl/choose-make.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/choose-make.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Dodawanie drukarki}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/pl/choose-model.tmpl cups-1.4.3.oden/templates/pl/choose-model.tmpl --- cups-1.4.3/templates/pl/choose-model.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/choose-model.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modyfikowanie {printer_name}:Dodawanie drukarki}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/pl/choose-serial.tmpl cups-1.4.3.oden/templates/pl/choose-serial.tmpl --- cups-1.4.3/templates/pl/choose-serial.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/choose-serial.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modyfikowanie {printer_name}:Dodawanie drukarki}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/pl/choose-uri.tmpl cups-1.4.3.oden/templates/pl/choose-uri.tmpl --- cups-1.4.3/templates/pl/choose-uri.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/choose-uri.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Modyfikowanie {printer_name}:Dodawanie drukarki}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}"> diff -Naurp cups-1.4.3/templates/pl/class-confirm.tmpl cups-1.4.3.oden/templates/pl/class-confirm.tmpl --- cups-1.4.3/templates/pl/class-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/class-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,6 @@ <P><B>Ostrzeżenie:</B> Usunąć klasę {printer_name}?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Usuń klasę"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Usuń klasę"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/pl/class.tmpl cups-1.4.3.oden/templates/pl/class.tmpl --- cups-1.4.3/templates/pl/class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,7 @@ {server_is_sharing_printers=0?Nie:{printer_is_shared=0?Nie:}} Współdzielona{default_name={printer_name}?, Domyślne serwera:})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Konserwacja</OPTION> <OPTION VALUE="print-test-page">Drukowanie strony próbnej</OPTION> @@ -17,6 +18,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Administracja</OPTION> diff -Naurp cups-1.4.3/templates/pl/edit-config.tmpl cups-1.4.3.oden/templates/pl/edit-config.tmpl --- cups-1.4.3/templates/pl/edit-config.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/edit-config.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,7 +10,7 @@ function reset_config() <H2 CLASS="title">Modyfikowanie pliku konfiguracji</H2> <FORM NAME="cups" METHOD="POST" ACTION="/admin/"> - +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA> diff -Naurp cups-1.4.3/templates/pl/job-move.tmpl cups-1.4.3.oden/templates/pl/job-move.tmpl --- cups-1.4.3/templates/pl/job-move.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/job-move.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:} diff -Naurp cups-1.4.3/templates/pl/jobs.tmpl cups-1.4.3.oden/templates/pl/jobs.tmpl --- cups-1.4.3/templates/pl/jobs.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/jobs.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -17,18 +17,18 @@ <EM>"{job_printer_state_message}"</EM>:}</TD> <TD> {job_preserved>0?{job_state>5? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Ponownie wydrukuj zadanie"></FORM>:}:} {job_state=4? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Zwolnij zadanie"></FORM>:} {job_state=3? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Wstrzymaj zadanie"></FORM>:} {job_state<7? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Anuluj zadanie"></FORM> -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Przenieś zadanie"></FORM>:} +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Przenieś zadanie"></FORM>:} </TD> </TR> } diff -Naurp cups-1.4.3/templates/pl/list-available-printers.tmpl cups-1.4.3.oden/templates/pl/list-available-printers.tmpl --- cups-1.4.3/templates/pl/list-available-printers.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/list-available-printers.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,7 +4,7 @@ {#device_uri=0?<P>Nie znaleziono drukarek.</P> :<UL>{[device_uri] -<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Lokalna drukarka"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Dodaj tę drukarkę"></FORM> +<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Lokalna drukarka"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Dodaj tę drukarkę"></FORM> {device_make_and_model} ({device_info})</LI> }</UL>} diff -Naurp cups-1.4.3/templates/pl/modify-class.tmpl cups-1.4.3.oden/templates/pl/modify-class.tmpl --- cups-1.4.3/templates/pl/modify-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/modify-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Modyfikowanie klasy {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> diff -Naurp cups-1.4.3/templates/pl/modify-printer.tmpl cups-1.4.3.oden/templates/pl/modify-printer.tmpl --- cups-1.4.3/templates/pl/modify-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/modify-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Modyfikowanie {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/pl/printer-confirm.tmpl cups-1.4.3.oden/templates/pl/printer-confirm.tmpl --- cups-1.4.3/templates/pl/printer-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/printer-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,6 @@ <P><B>Ostrzeżenie:</B> usunąć drukarkę {printer_name}?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Usuń drukarkę"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Usuń drukarkę"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/pl/printer.tmpl cups-1.4.3.oden/templates/pl/printer.tmpl --- cups-1.4.3/templates/pl/printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ {server_is_sharing_printers=0?Nie:{printer_is_shared=0?Nie:}} Współdzielona{default_name={printer_name}?, Domyślne serwera:})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Konserwacja</OPTION> <OPTION VALUE="print-test-page">Wydrukuj stronę próbną</OPTION> @@ -20,6 +21,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Administracja</OPTION> diff -Naurp cups-1.4.3/templates/pl/samba-export.tmpl cups-1.4.3.oden/templates/pl/samba-export.tmpl --- cups-1.4.3/templates/pl/samba-export.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/samba-export.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,6 +10,7 @@ function select_printers() { --></SCRIPT> <FORM METHOD="POST" ACTION="/admin/" NAME="export_samba"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"> <H2 CLASS="title">Eksportowanie drukarek do Samby</H2> diff -Naurp cups-1.4.3/templates/pl/set-printer-options-header.tmpl cups-1.4.3.oden/templates/pl/set-printer-options-header.tmpl --- cups-1.4.3/templates/pl/set-printer-options-header.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/set-printer-options-header.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Ustawianie domyślnych opcji dla {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Zakolejkuj drukarkę do domyślnych opcji">:} diff -Naurp cups-1.4.3/templates/pl/users.tmpl cups-1.4.3.oden/templates/pl/users.tmpl --- cups-1.4.3/templates/pl/users.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/pl/users.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> {IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:} diff -Naurp cups-1.4.3/templates/printer-confirm.tmpl cups-1.4.3.oden/templates/printer-confirm.tmpl --- cups-1.4.3/templates/printer-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/printer-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,6 @@ <P><B>Warning:</B> Are you sure you want to delete printer {printer_name}?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Delete Printer"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Delete Printer"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/printer.tmpl cups-1.4.3.oden/templates/printer.tmpl --- cups-1.4.3/templates/printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ {server_is_sharing_printers=0?Not:{printer_is_shared=0?Not:}} Shared{default_name={printer_name}?, Server Default:})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Maintenance</OPTION> <OPTION VALUE="print-test-page">Print Test Page</OPTION> @@ -20,6 +21,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Administration</OPTION> diff -Naurp cups-1.4.3/templates/ru/add-class.tmpl cups-1.4.3.oden/templates/ru/add-class.tmpl --- cups-1.4.3/templates/ru/add-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/add-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Новая группа</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <TABLE> diff -Naurp cups-1.4.3/templates/ru/add-printer.tmpl cups-1.4.3.oden/templates/ru/add-printer.tmpl --- cups-1.4.3/templates/ru/add-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/add-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Добавление принтера</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/ru/add-rss-subscription.tmpl cups-1.4.3.oden/templates/ru/add-rss-subscription.tmpl --- cups-1.4.3/templates/ru/add-rss-subscription.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/add-rss-subscription.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,4 +1,5 @@ <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"> <H2 CLASS="title">Добавление подписки по RSS</H2> diff -Naurp cups-1.4.3/templates/ru/admin.tmpl cups-1.4.3.oden/templates/ru/admin.tmpl --- cups-1.4.3/templates/ru/admin.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/admin.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,16 +4,16 @@ <H2 CLASS="title">Принтеры</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Добавить принтер"></FORM> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Найти новый принтер"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="SUBMIT" VALUE="Добавить принтер"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="find-new-printers"><INPUT TYPE="SUBMIT" VALUE="Найти новый принтер"></FORM> <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Управление принтерами"></FORM> -{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Экспортировать принтер в Samba"></FORM>:} +{have_samba?<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"><INPUT TYPE="SUBMIT" VALUE="Экспортировать принтер в Samba"></FORM>:} </P> <H2 CLASS="title">Группы</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Добавить группу"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-class"><INPUT TYPE="SUBMIT" VALUE="Добавить группу"></FORM> <FORM ACTION="/classes/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Управление группами"></FORM> </P> @@ -28,7 +28,7 @@ <H2 CLASS="title">Сервер</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Редактировать конфигурационный файл"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"><INPUT TYPE="SUBMIT" VALUE="Редактировать конфигурационный файл"></FORM> <FORM ACTION="/admin/log/access_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал заданий"></FORM> <FORM ACTION="/admin/log/error_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал ошибок"></FORM> <FORM ACTION="/admin/log/page_log" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Показать журнал страниц"></FORM> @@ -38,6 +38,7 @@ <BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>: <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> {ADVANCEDSETTINGS?<P><B>Параметры сервера\:</B></P> @@ -95,7 +96,7 @@ <H2 CLASS="title">Подписка по RSS</H2> <P> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Добавить подписку по RSS"></FORM> +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Добавить подписку по RSS"></FORM> </P> </DIV> @@ -104,6 +105,6 @@ <THEAD><TR><TH>Название</TH><TH>События</TH><TH>Очередь</TH></TR></THEAD> <TBODY>{[notify_subscription_id] <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR> -<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Отменить подписку по RSS"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Все очереди}</TD></TR>} +<FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Отменить подписку по RSS"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Все очереди}</TD></TR>} </TBODY> </TABLE>:} diff -Naurp cups-1.4.3/templates/ru/choose-device.tmpl cups-1.4.3.oden/templates/ru/choose-device.tmpl --- cups-1.4.3/templates/ru/choose-device.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/choose-device.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ ALT="Busy Indicator"> Поиск принтеров...</P>} <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/ru/choose-make.tmpl cups-1.4.3.oden/templates/ru/choose-make.tmpl --- cups-1.4.3/templates/ru/choose-make.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/choose-make.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/ru/choose-model.tmpl cups-1.4.3.oden/templates/ru/choose-model.tmpl --- cups-1.4.3/templates/ru/choose-model.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/choose-model.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2> <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> diff -Naurp cups-1.4.3/templates/ru/choose-serial.tmpl cups-1.4.3.oden/templates/ru/choose-serial.tmpl --- cups-1.4.3/templates/ru/choose-serial.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/choose-serial.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} diff -Naurp cups-1.4.3/templates/ru/choose-uri.tmpl cups-1.4.3.oden/templates/ru/choose-uri.tmpl --- cups-1.4.3/templates/ru/choose-uri.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/choose-uri.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {printer_name?<INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}">:} <INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}"> diff -Naurp cups-1.4.3/templates/ru/class-confirm.tmpl cups-1.4.3.oden/templates/ru/class-confirm.tmpl --- cups-1.4.3/templates/ru/class-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/class-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,6 @@ <P><B>Предупреждение:</B> вы действительно хотите удалить группу «{printer_name}»?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить группу"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="op" VALUE="delete-class"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить группу"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/ru/class.tmpl cups-1.4.3.oden/templates/ru/class.tmpl --- cups-1.4.3/templates/ru/class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,7 @@ {server_is_sharing_printers=0?нет совместного доступа:{printer_is_shared=0?нет совместного доступа:разрешен совместный доступ}})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Обслуживание</OPTION> <OPTION VALUE="print-test-page">Печать пробной страницы</OPTION> @@ -17,6 +18,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="Администрирование"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Администрирование</OPTION> diff -Naurp cups-1.4.3/templates/ru/edit-config.tmpl cups-1.4.3.oden/templates/ru/edit-config.tmpl --- cups-1.4.3/templates/ru/edit-config.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/edit-config.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,7 +10,7 @@ function reset_config() <H2 CLASS="title">Редактирование конфигурационного файла</H2> <FORM NAME="cups" METHOD="POST" ACTION="/admin/"> - +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA> diff -Naurp cups-1.4.3/templates/ru/job-move.tmpl cups-1.4.3.oden/templates/ru/job-move.tmpl --- cups-1.4.3/templates/ru/job-move.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/job-move.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:} diff -Naurp cups-1.4.3/templates/ru/jobs.tmpl cups-1.4.3.oden/templates/ru/jobs.tmpl --- cups-1.4.3/templates/ru/jobs.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/jobs.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -17,18 +17,18 @@ <EM>"{job_printer_state_message}"</EM>:}</TD> <TD> {job_preserved>0?{job_state>5? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="restart-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Перезапустить"></FORM>:}:} {job_state=4? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="release-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Продолжить"></FORM>:} {job_state=3? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="hold-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Приостановить"></FORM>:} {job_state<7? -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="HIDDEN" NAME="job_printer_uri" VALUE="{job_printer_uri}"> <INPUT TYPE="SUBMIT" VALUE="Отменить"></FORM> -<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Переместить"></FORM>:} +<FORM ACTION="/jobs/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="move-job"><INPUT TYPE="HIDDEN" NAME="job_id" VALUE="{job_id}"><INPUT TYPE="SUBMIT" VALUE="Переместить"></FORM>:} </TD> </TR> } diff -Naurp cups-1.4.3/templates/ru/list-available-printers.tmpl cups-1.4.3.oden/templates/ru/list-available-printers.tmpl --- cups-1.4.3/templates/ru/list-available-printers.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/list-available-printers.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -4,7 +4,7 @@ {#device_uri=0?<P>Не обнаружено ни одного принтера.</P> :<UL>{[device_uri] -<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Сетевой принтер"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Добавить этот принтер"></FORM> +<LI><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-printer"><INPUT TYPE="HIDDEN" NAME="TEMPLATE_NAME" VALUE="{template_name}"><INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="Сетевой принтер"><INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{device_make_and_model}"><INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}"><INPUT TYPE="SUBMIT" VALUE="Добавить этот принтер"></FORM> {device_make_and_model} ({device_info})</LI> }</UL>} diff -Naurp cups-1.4.3/templates/ru/modify-class.tmpl cups-1.4.3.oden/templates/ru/modify-class.tmpl --- cups-1.4.3/templates/ru/modify-class.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/modify-class.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Изменение группы {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> diff -Naurp cups-1.4.3/templates/ru/modify-printer.tmpl cups-1.4.3.oden/templates/ru/modify-printer.tmpl --- cups-1.4.3/templates/ru/modify-printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/modify-printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Изменение принтера {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> <INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}"> <INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}"> diff -Naurp cups-1.4.3/templates/ru/printer-confirm.tmpl cups-1.4.3.oden/templates/ru/printer-confirm.tmpl --- cups-1.4.3/templates/ru/printer-confirm.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/printer-confirm.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -5,6 +5,6 @@ <P><B>Предупреждение:</B> вы действительно хотите удалить принтер «{printer_name}»?</P> -<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить принтер"></FORM></P> +<P ALIGN="CENTER"><FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="delete-printer"><INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"><INPUT TYPE="SUBMIT" NAME="confirm" VALUE="Удалить принтер"></FORM></P> </DIV> diff -Naurp cups-1.4.3/templates/ru/printer.tmpl cups-1.4.3.oden/templates/ru/printer.tmpl --- cups-1.4.3/templates/ru/printer.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/printer.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -6,6 +6,7 @@ {server_is_sharing_printers=0?нет совместного доступа:{printer_is_shared=0?нет совместного доступа:разрешен совместный доступ}})</H2> <FORM METHOD="POST" ACTION="{printer_uri_supported}" NAME="maintenance"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <SELECT NAME="OP" ONCHANGE="document.maintenance.submit();"> <OPTION VALUE="">Обслуживание</OPTION> <OPTION VALUE="print-test-page">Печать пробной страницы</OPTION> @@ -20,6 +21,7 @@ </FORM> <FORM METHOD="POST" ACTION="{admin_uri}" NAME="administration"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="printer_name" VALUE="{printer_name}"> <SELECT NAME="OP" ONCHANGE="document.administration.submit();"> <OPTION VALUE="">Администрирование</OPTION> diff -Naurp cups-1.4.3/templates/ru/samba-export.tmpl cups-1.4.3.oden/templates/ru/samba-export.tmpl --- cups-1.4.3/templates/ru/samba-export.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/samba-export.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,6 +10,7 @@ function select_printers() { --></SCRIPT> <FORM METHOD="POST" ACTION="/admin/" NAME="export_samba"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"> <H2 CLASS="title">Экспорт принтеров в Samba</H2> diff -Naurp cups-1.4.3/templates/ru/set-printer-options-header.tmpl cups-1.4.3.oden/templates/ru/set-printer-options-header.tmpl --- cups-1.4.3/templates/ru/set-printer-options-header.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/set-printer-options-header.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Установить параметры по умолчанию для {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Запрос принтера для параметров по умолчанию">:} diff -Naurp cups-1.4.3/templates/ru/users.tmpl cups-1.4.3.oden/templates/ru/users.tmpl --- cups-1.4.3/templates/ru/users.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/ru/users.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> {IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:} diff -Naurp cups-1.4.3/templates/samba-export.tmpl cups-1.4.3.oden/templates/samba-export.tmpl --- cups-1.4.3/templates/samba-export.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/samba-export.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -10,6 +10,7 @@ function select_printers() { --></SCRIPT> <FORM METHOD="POST" ACTION="/admin/" NAME="export_samba"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="export-samba"> <H2 CLASS="title">Export Printers to Samba</H2> diff -Naurp cups-1.4.3/templates/set-printer-options-header.tmpl cups-1.4.3.oden/templates/set-printer-options-header.tmpl --- cups-1.4.3/templates/set-printer-options-header.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/set-printer-options-header.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -3,6 +3,7 @@ <H2 CLASS="title">Set Default Options for {printer_name}</H2> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}"> {HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Query Printer for Default Options">:} diff -Naurp cups-1.4.3/templates/users.tmpl cups-1.4.3.oden/templates/users.tmpl --- cups-1.4.3/templates/users.tmpl 2010-02-08 17:33:31.000000000 +0000 +++ cups-1.4.3.oden/templates/users.tmpl 2010-11-14 09:43:37.000000000 +0000 @@ -1,6 +1,7 @@ <DIV CLASS="indent"> <FORM METHOD="POST" ACTION="/admin"> +<INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{OP}"> <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}"> {IS_CLASS?<INPUT TYPE="HIDDEN" NAME="IS_CLASS" VALUE="{IS_CLASS}">:}