diff options
| author | Michael R Sweet <michaelrsweet@gmail.com> | 2017-11-01 12:06:06 -0400 |
|---|---|---|
| committer | Michael R Sweet <michaelrsweet@gmail.com> | 2017-11-01 12:06:06 -0400 |
| commit | b00c84094b1750612e7172251ab95a69627e044b (patch) | |
| tree | 26a0a0180074529050719e2f0b8e4a58b7ac6e6d | |
| parent | 98491ecc6fb571869d0947096982a64d6ec16a7d (diff) | |
| download | cups-b00c84094b1750612e7172251ab95a69627e044b.tar.gz | |
Drop RSS subscription management from the web interface (Issue #5012)
31 files changed, 4 insertions, 724 deletions
diff --git a/CHANGES.md b/CHANGES.md index 11a5d0f5d..a987bc67f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ CHANGES - 2.3b1 - 2017-11-01 Changes in CUPS v2.3b1 ---------------------- +- Dropped RSS subscription management from the web interface (Issue #5012) +- Dropped hard-coded CGI scripting language support (Issue #5124) - Fixed the ippserver sample code when threading is disabled or unavailable (Issue #5154) -- Dropped hard-coded CGI scripting language support (Issue #5124) diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index 576fac0bc..cfdf3ff01 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -1,7 +1,7 @@ /* * Administration CGI for CUPS. * - * Copyright 2007-2015 by Apple Inc. + * Copyright 2007-2017 by Apple Inc. * Copyright 1997-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -39,10 +39,8 @@ static int current_device = 0; /* Current device shown */ */ static void choose_device_cb(const char *device_class, const char *device_id, const char *device_info, const char *device_make_and_model, const char *device_uri, const char *device_location, const char *title); -static void do_add_rss_subscription(http_t *http); static void do_am_class(http_t *http, int modify); static void do_am_printer(http_t *http, int modify); -static void do_cancel_subscription(http_t *http); static void do_config_server(http_t *http); static void do_delete_class(http_t *http); static void do_delete_printer(http_t *http); @@ -171,10 +169,6 @@ main(void) do_config_server(http); else if (!strcmp(op, "export-samba")) do_export(http); - else if (!strcmp(op, "add-rss-subscription")) - do_add_rss_subscription(http); - else if (!strcmp(op, "cancel-subscription")) - do_cancel_subscription(http); else { /* @@ -319,202 +313,6 @@ choose_device_cb( /* - * 'do_add_rss_subscription()' - Add a RSS subscription. - */ - -static void -do_add_rss_subscription(http_t *http) /* I - HTTP connection */ -{ - ipp_t *request, /* IPP request data */ - *response; /* IPP response data */ - char rss_uri[1024]; /* RSS notify-recipient URI */ - int num_events; /* Number of events */ - const char *events[12], /* Subscribed events */ - *subscription_name, /* Subscription name */ - *printer_uri, /* Printer URI */ - *ptr, /* Pointer into name */ - *user; /* Username */ - int max_events; /* Maximum number of events */ - - - /* - * See if we have all of the required information... - */ - - subscription_name = cgiGetVariable("SUBSCRIPTION_NAME"); - printer_uri = cgiGetVariable("PRINTER_URI"); - num_events = 0; - - if (cgiGetVariable("EVENT_JOB_CREATED")) - events[num_events ++] = "job-created"; - if (cgiGetVariable("EVENT_JOB_COMPLETED")) - events[num_events ++] = "job-completed"; - if (cgiGetVariable("EVENT_JOB_STOPPED")) - events[num_events ++] = "job-stopped"; - if (cgiGetVariable("EVENT_JOB_CONFIG_CHANGED")) - events[num_events ++] = "job-config-changed"; - if (cgiGetVariable("EVENT_PRINTER_STOPPED")) - events[num_events ++] = "printer-stopped"; - if (cgiGetVariable("EVENT_PRINTER_ADDED")) - events[num_events ++] = "printer-added"; - if (cgiGetVariable("EVENT_PRINTER_MODIFIED")) - events[num_events ++] = "printer-modified"; - if (cgiGetVariable("EVENT_PRINTER_DELETED")) - events[num_events ++] = "printer-deleted"; - if (cgiGetVariable("EVENT_SERVER_STARTED")) - events[num_events ++] = "server-started"; - if (cgiGetVariable("EVENT_SERVER_STOPPED")) - events[num_events ++] = "server-stopped"; - if (cgiGetVariable("EVENT_SERVER_RESTARTED")) - events[num_events ++] = "server-restarted"; - if (cgiGetVariable("EVENT_SERVER_AUDIT")) - events[num_events ++] = "server-audit"; - - if ((ptr = cgiGetVariable("MAX_EVENTS")) != NULL) - max_events = atoi(ptr); - else - max_events = 0; - - if (!subscription_name || !printer_uri || !num_events || - max_events <= 0 || max_events > 9999) - { - /* - * Don't have everything we need, so get the available printers - * and classes and (re)show the add page... - */ - - if (cgiGetVariable("EVENT_JOB_CREATED")) - cgiSetVariable("EVENT_JOB_CREATED", "CHECKED"); - if (cgiGetVariable("EVENT_JOB_COMPLETED")) - cgiSetVariable("EVENT_JOB_COMPLETED", "CHECKED"); - if (cgiGetVariable("EVENT_JOB_STOPPED")) - cgiSetVariable("EVENT_JOB_STOPPED", "CHECKED"); - if (cgiGetVariable("EVENT_JOB_CONFIG_CHANGED")) - cgiSetVariable("EVENT_JOB_CONFIG_CHANGED", "CHECKED"); - if (cgiGetVariable("EVENT_PRINTER_STOPPED")) - cgiSetVariable("EVENT_PRINTER_STOPPED", "CHECKED"); - if (cgiGetVariable("EVENT_PRINTER_ADDED")) - cgiSetVariable("EVENT_PRINTER_ADDED", "CHECKED"); - if (cgiGetVariable("EVENT_PRINTER_MODIFIED")) - cgiSetVariable("EVENT_PRINTER_MODIFIED", "CHECKED"); - if (cgiGetVariable("EVENT_PRINTER_DELETED")) - cgiSetVariable("EVENT_PRINTER_DELETED", "CHECKED"); - if (cgiGetVariable("EVENT_SERVER_STARTED")) - cgiSetVariable("EVENT_SERVER_STARTED", "CHECKED"); - if (cgiGetVariable("EVENT_SERVER_STOPPED")) - cgiSetVariable("EVENT_SERVER_STOPPED", "CHECKED"); - if (cgiGetVariable("EVENT_SERVER_RESTARTED")) - cgiSetVariable("EVENT_SERVER_RESTARTED", "CHECKED"); - if (cgiGetVariable("EVENT_SERVER_AUDIT")) - cgiSetVariable("EVENT_SERVER_AUDIT", "CHECKED"); - - request = ippNewRequest(CUPS_GET_PRINTERS); - response = cupsDoRequest(http, request, "/"); - - cgiSetIPPVars(response, NULL, NULL, NULL, 0); - - ippDelete(response); - - cgiStartHTML(cgiText(_("Add RSS Subscription"))); - - cgiCopyTemplateLang("add-rss-subscription.tmpl"); - - cgiEndHTML(); - return; - } - - /* - * Make sure we have a username... - */ - - if ((user = getenv("REMOTE_USER")) == NULL) - { - puts("Status: 401\n"); - exit(0); - } - - /* - * Validate the subscription name... - */ - - for (ptr = subscription_name; *ptr; ptr ++) - if ((*ptr >= 0 && *ptr <= ' ') || *ptr == 127 || *ptr == '/' || - *ptr == '?' || *ptr == '#') - break; - - if (*ptr) - { - cgiSetVariable("ERROR", - cgiText(_("The subscription name may not " - "contain spaces, slashes (/), question marks (?), " - "or the pound sign (#)."))); - cgiStartHTML(_("Add RSS Subscription")); - cgiCopyTemplateLang("error.tmpl"); - cgiEndHTML(); - return; - } - - /* - * Add the subscription... - */ - - ptr = subscription_name + strlen(subscription_name) - 4; - if (ptr < subscription_name || strcmp(ptr, ".rss")) - httpAssembleURIf(HTTP_URI_CODING_ALL, rss_uri, sizeof(rss_uri), "rss", - NULL, NULL, 0, "/%s.rss?max_events=%d", subscription_name, - max_events); - else - httpAssembleURIf(HTTP_URI_CODING_ALL, rss_uri, sizeof(rss_uri), "rss", - NULL, NULL, 0, "/%s?max_events=%d", subscription_name, - max_events); - - request = ippNewRequest(IPP_CREATE_PRINTER_SUBSCRIPTION); - - if (!_cups_strcasecmp(printer_uri, "#ALL#")) - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", - NULL, "ipp://localhost/"); - else - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", - NULL, printer_uri); - - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", - NULL, user); - - ippAddString(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI, - "notify-recipient-uri", NULL, rss_uri); - ippAddStrings(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD, "notify-events", - num_events, NULL, events); - ippAddInteger(request, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER, - "notify-lease-duration", 0); - - ippDelete(cupsDoRequest(http, request, "/")); - - if (cupsLastError() == IPP_NOT_AUTHORIZED) - { - puts("Status: 401\n"); - exit(0); - } - else if (cupsLastError() > IPP_OK_CONFLICT) - { - cgiStartHTML(_("Add RSS Subscription")); - cgiShowIPPError(_("Unable to add RSS subscription")); - } - else - { - /* - * Redirect successful updates back to the admin page... - */ - - cgiSetVariable("refresh_page", "5;URL=/admin"); - cgiStartHTML(_("Add RSS Subscription")); - cgiCopyTemplateLang("subscription-added.tmpl"); - } - - cgiEndHTML(); -} - - -/* * 'do_am_class()' - Add or modify a class. */ @@ -1442,88 +1240,6 @@ do_am_printer(http_t *http, /* I - HTTP connection */ /* - * 'do_cancel_subscription()' - Cancel a subscription. - */ - -static void -do_cancel_subscription(http_t *http)/* I - HTTP connection */ -{ - ipp_t *request; /* IPP request data */ - const char *var, /* Form variable */ - *user; /* Username */ - int id; /* Subscription ID */ - - - /* - * See if we have all of the required information... - */ - - if ((var = cgiGetVariable("NOTIFY_SUBSCRIPTION_ID")) != NULL) - id = atoi(var); - else - id = 0; - - if (id <= 0) - { - cgiSetVariable("ERROR", cgiText(_("Bad subscription ID"))); - cgiStartHTML(_("Cancel RSS Subscription")); - cgiCopyTemplateLang("error.tmpl"); - cgiEndHTML(); - return; - } - - /* - * Require a username... - */ - - if ((user = getenv("REMOTE_USER")) == NULL) - { - puts("Status: 401\n"); - exit(0); - } - - /* - * Cancel the subscription... - */ - - request = ippNewRequest(IPP_CANCEL_SUBSCRIPTION); - - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", - NULL, "ipp://localhost/"); - ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, - "notify-subscription-id", id); - - ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name", - NULL, user); - - ippDelete(cupsDoRequest(http, request, "/")); - - if (cupsLastError() == IPP_NOT_AUTHORIZED) - { - puts("Status: 401\n"); - exit(0); - } - else if (cupsLastError() > IPP_OK_CONFLICT) - { - cgiStartHTML(_("Cancel RSS Subscription")); - cgiShowIPPError(_("Unable to cancel RSS subscription")); - } - else - { - /* - * Redirect successful updates back to the admin page... - */ - - cgiSetVariable("refresh_page", "5;URL=/admin"); - cgiStartHTML(_("Cancel RSS Subscription")); - cgiCopyTemplateLang("subscription-canceled.tmpl"); - } - - cgiEndHTML(); -} - - -/* * 'do_config_server()' - Configure server settings. */ diff --git a/templates/Makefile b/templates/Makefile index 7a0819183..ff139ff7e 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -20,7 +20,6 @@ include ../Makedefs FILES = \ add-class.tmpl \ add-printer.tmpl \ - add-rss-subscription.tmpl \ admin.tmpl \ choose-device.tmpl \ choose-make.tmpl \ @@ -83,8 +82,6 @@ FILES = \ search.tmpl \ set-printer-options-header.tmpl \ set-printer-options-trailer.tmpl \ - subscription-added.tmpl \ - subscription-canceled.tmpl \ test-page.tmpl \ trailer.tmpl \ users.tmpl diff --git a/templates/add-rss-subscription.tmpl b/templates/add-rss-subscription.tmpl deleted file mode 100644 index 17e3fa0d3..000000000 --- a/templates/add-rss-subscription.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -<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> - -<TABLE SUMMARY="Add RSS Subscription form"> -<TR> -<TH CLASS="label">Name:</TH> -<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR> -<SMALL>(May contain any printable characters except space, "/", "?", and "#")</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Queue:</TH> -<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>All Queues</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD> -</TR> -<TR VALIGN="TOP"> -<TH CLASS="label">Events:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Job Created<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Job Completed<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Job Stopped<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Job Options Changed</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Queue Stopped<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Queue Added<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Queue Modified<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Queue Deleted</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Server Started<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Server Stopped<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Server Restarted<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Server Security Auditing</TD> -</TR> -<TR> -<TH CLASS="label">Maximum Events in Feed:</TH> -<TD COLSPAN="5"><INPUT TYPE="NUMBER" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD> -</TR> -<TR> -<TD></TD> -<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="Add RSS Subscription"></TD> -</TR> -</TABLE> - -</FORM> diff --git a/templates/admin.tmpl b/templates/admin.tmpl index 101f96017..ae8339993 100644 --- a/templates/admin.tmpl +++ b/templates/admin.tmpl @@ -79,19 +79,3 @@ </FORM>} </div> </div> - -<div class="row"> - <H2 CLASS="title">RSS Subscriptions</H2> - - <P> - <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> - - {notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS Subscriptions"> - <THEAD><TR><TH>Name</TH><TH>Events</TH><TH>Queue Name</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="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="Cancel RSS Subscription"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:All Queues}</TD></TR>} - </TBODY> - </TABLE>:} -</div>
\ No newline at end of file diff --git a/templates/de/add-rss-subscription.tmpl b/templates/de/add-rss-subscription.tmpl deleted file mode 100644 index c6c4d7008..000000000 --- a/templates/de/add-rss-subscription.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -<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-Abonnement hinzufügen</H2> - -<TABLE SUMMARY="Formular zum Hinzufügen eines RSS-Abonnements"> -<TR> -<TH CLASS="label">Name:</TH> -<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR> -<SMALL>(Darf alle druckbaren Zeichen außer Leerzeichen, "/", "?" und "#" enthalten)</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Warteschlange:</TH> -<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>Alle Warteschlangen</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD> -</TR> -<TR VALIGN="TOP"> -<TH CLASS="label">Ereignisse:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Auftrag erstellt<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Auftrag abgeschlossen<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Auftrag angehalten<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Auftragsparameter geändert</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Warteschlange angehalten<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Warteschlange hinzugefügt<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Warteschlange geändert<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Warteschlange gelöscht</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Server gestartet<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Server angehalten<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Server neu gestartet<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Server-Sicherheitsprüfung</TD> -</TR> -<TR> -<TH CLASS="label">Maximale Ereignisse in Durchführung:</TH> -<TD COLSPAN="5"><INPUT TYPE="NUMBER" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD> -</TR> -<TR> -<TD></TD> -<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="RSS-Abonnement hinzufügen"></TD> -</TR> -</TABLE> - -</FORM> diff --git a/templates/de/admin.tmpl b/templates/de/admin.tmpl index fb2851a70..c5fed72aa 100644 --- a/templates/de/admin.tmpl +++ b/templates/de/admin.tmpl @@ -79,19 +79,3 @@ </FORM>} </div> </div> - -<div class="row"> - <H2 CLASS="title">RSS-Abonnements</H2> - - <P> - <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-Abonnement hinzufügen"></FORM> - </P> - - {notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS-Abonnements"> - <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="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-Abonnement beenden"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Alle Warteschlangen}</TD></TR>} - </TBODY> - </TABLE>:} -</div> diff --git a/templates/de/subscription-added.tmpl b/templates/de/subscription-added.tmpl deleted file mode 100644 index 178c95632..000000000 --- a/templates/de/subscription-added.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>Das RSS-Abonnement {subscription_name} wurde erfolgreich hinzugefügt.</P> diff --git a/templates/de/subscription-canceled.tmpl b/templates/de/subscription-canceled.tmpl deleted file mode 100644 index 4382796e5..000000000 --- a/templates/de/subscription-canceled.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>Das RSS-Abonnement #{notify_subscription_id} wurde beendet.</P> diff --git a/templates/es/add-rss-subscription.tmpl b/templates/es/add-rss-subscription.tmpl deleted file mode 100644 index d17c86eef..000000000 --- a/templates/es/add-rss-subscription.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -<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> - -<TABLE SUMMARY="Add RSS Subscription form"> -<TR> -<TH CLASS="label">Nombre:</TH> -<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR> -<SMALL>(Puede contener cualquier carácter imprimible excepto espacio, "/", "?", y "#"))</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Cola:</TH> -<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>Todas las colas</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD> -</TR> -<TR VALIGN="TOP"> -<TH CLASS="label">Eventos:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Trabajo creado<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Trabajo completado<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Trabajo parado<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Opciones de trabajo cambiadas</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Cola parada<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Cola añadida<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Cola modificada<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Cola borrada</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Servidor iniciado<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Servidor parado<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Servidor reiniciado<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Auditoría de seguridad del servidor</TD> -</TR> -<TR> -<TH CLASS="label">Número máximo de eventos del canal:</TH> -<TD COLSPAN="5"><INPUT TYPE="NUMBER" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD> -</TR> -<TR> -<TD></TD> -<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="Añadir subscripción RSS"></TD> -</TR> -</TABLE> - -</FORM> diff --git a/templates/es/admin.tmpl b/templates/es/admin.tmpl index 097c65c02..edc0adf71 100644 --- a/templates/es/admin.tmpl +++ b/templates/es/admin.tmpl @@ -79,19 +79,3 @@ </FORM>} </div> </div> - -<div class="row"> - <H2 CLASS="title">Subscripciones RSS</H2> - - <P> - <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> - - {notify_subscription_id?<TABLE CLASS="list" SUMMARY="Subscripciones RSS"> - <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="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>:} -</div> diff --git a/templates/es/subscription-added.tmpl b/templates/es/subscription-added.tmpl deleted file mode 100644 index 725b8bbc3..000000000 --- a/templates/es/subscription-added.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>Se ha añadido con éxito la subscripción {subscription_name}.</P> diff --git a/templates/es/subscription-canceled.tmpl b/templates/es/subscription-canceled.tmpl deleted file mode 100644 index 8a68f543d..000000000 --- a/templates/es/subscription-canceled.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>La subscripción #{notify_subscription_id} ha sido cancelada.</P> diff --git a/templates/fr/add-rss-subscription.tmpl b/templates/fr/add-rss-subscription.tmpl deleted file mode 100644 index d5767b6f8..000000000 --- a/templates/fr/add-rss-subscription.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -<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">S'abonner à un flux RSS</H2> - -<TABLE SUMMARY="S'abonner à un flux RSS"> -<TR> -<TH CLASS="label">Nom :</TH> -<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR> -<SMALL>(Peux contenir n'importe quel caractère sauf "/", "#", et espace)</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">File :</TH> -<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>Toutes les files</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD> -</TR> -<TR VALIGN="TOP"> -<TH CLASS="label">Evénements :</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Tâches créées<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Tâches finies<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Tâches stoppées<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Options de tâche modifiées</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Files arrêtées<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>File ajoutée<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>File modifiée<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>File supprimée</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Serveur démarré<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Serveur arrêté<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Serveur redémarré<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Audit de sécurité du serveur</TD> -</TR> -<TR> -<TH CLASS="label">Nombre maximum d'événements :</TH> -<TD COLSPAN="5"><INPUT TYPE="NUMBER" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD> -</TR> -<TR> -<TD></TD> -<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="S'abonner à un flux RSS"></TD> -</TR> -</TABLE> - -</FORM> diff --git a/templates/fr/admin.tmpl b/templates/fr/admin.tmpl index 2fcd9c528..6e8026553 100644 --- a/templates/fr/admin.tmpl +++ b/templates/fr/admin.tmpl @@ -79,19 +79,3 @@ </FORM>} </div> </div> - -<div class="row"> - <H2 CLASS="title">Abonnements RSS</H2> - - <P> - <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="Ajouter un abonnement RSS"></FORM> - </P> - - {notify_subscription_id?<TABLE CLASS="list" SUMMARY="Abonnements RSS"> - <THEAD><TR><TH>Nom</TH><TH>Événements</TH><TH>Nom de la file</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="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="Annuler l'abonnement RSS"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Toutes les files}</TD></TR>} - </TBODY> - </TABLE>:} -</div> diff --git a/templates/fr/subscription-added.tmpl b/templates/fr/subscription-added.tmpl deleted file mode 100644 index 293385db9..000000000 --- a/templates/fr/subscription-added.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>L'abonnement au flux RSS {subscription_name} a été ajouté avec succès.</P> diff --git a/templates/fr/subscription-canceled.tmpl b/templates/fr/subscription-canceled.tmpl deleted file mode 100644 index ec7bbae81..000000000 --- a/templates/fr/subscription-canceled.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>L'abonnement #{notify_subscription_id} au flux RSS a été annulé.</P> diff --git a/templates/ja/add-rss-subscription.tmpl b/templates/ja/add-rss-subscription.tmpl deleted file mode 100644 index c5afeb068..000000000 --- a/templates/ja/add-rss-subscription.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -<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> - -<TABLE SUMMARY="RSS 購読フォームを追加"> -<TR> -<TH CLASS="label">名前:</TH> -<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR> -<SMALL>("/"、"?"、"#"、スペースを除く文字を含めることができます)</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">キュー:</TH> -<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>すべてのキュー</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD> -</TR> -<TR VALIGN="TOP"> -<TH CLASS="label">イベント:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>ジョブが作成された<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>ジョブが完了した<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>ジョブが停止した<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>ジョブオプションが変更された</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>キューが停止した<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>キューが追加された<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>キューが変更された<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>キューが削除された</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>サーバーが開始した<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>サーバーが停止した<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>サーバーが再起動した<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>サーバーのセキュリティを監査中</TD> -</TR> -<TR> -<TH CLASS="label">フィード内の最大イベント数:</TH> -<TD COLSPAN="5"><INPUT TYPE="NUMBER" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD> -</TR> -<TR> -<TD></TD> -<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="RSS 購読を追加"></TD> -</TR> -</TABLE> - -</FORM> diff --git a/templates/ja/admin.tmpl b/templates/ja/admin.tmpl index 13d6f1349..3443297a7 100644 --- a/templates/ja/admin.tmpl +++ b/templates/ja/admin.tmpl @@ -79,19 +79,3 @@ </FORM>} </div> </div> - -<div class="row"> - <H2 CLASS="title">RSS 購読</H2> - - <P> - <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> - - {notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS 購読"> - <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="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>:} -</div>
\ No newline at end of file diff --git a/templates/ja/subscription-added.tmpl b/templates/ja/subscription-added.tmpl deleted file mode 100644 index 60339c130..000000000 --- a/templates/ja/subscription-added.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>{subscription_name} の購読は正しく追加されました。</P> diff --git a/templates/ja/subscription-canceled.tmpl b/templates/ja/subscription-canceled.tmpl deleted file mode 100644 index 806522585..000000000 --- a/templates/ja/subscription-canceled.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>購読 #{notify_subscription_id} はキャンセルされました。</P> diff --git a/templates/pt_BR/add-rss-subscription.tmpl b/templates/pt_BR/add-rss-subscription.tmpl deleted file mode 100644 index 7eb3e04eb..000000000 --- a/templates/pt_BR/add-rss-subscription.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -<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">Adicionar inscrição RSS</H2> - -<TABLE SUMMARY="Formulário para adicionar inscrição RSS"> -<TR> -<TH CLASS="label">Nome:</TH> -<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR> -<SMALL>(Pode conter qualquer caractere imprimível, exceto espaço em branco, "/", "?", e "#")</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Fila:</TH> -<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>All Queues</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD> -</TR> -<TR VALIGN="TOP"> -<TH CLASS="label">Eventos:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Trabalho criado<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Trabalho concluído<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Trabalho parado<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Opções do Trabalho alteradas</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Fila parada<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Fila adicionada<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Fila modificada<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Fila apagada</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Servidor iniciado<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Servidor parado<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Servidor reiniciado<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Auditoria de segurança do servidor</TD> -</TR> -<TR> -<TH CLASS="label">Máximo de eventos no Feed:</TH> -<TD COLSPAN="5"><INPUT TYPE="NUMBER" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD> -</TR> -<TR> -<TD></TD> -<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="Adicionar inscrição RSS"></TD> -</TR> -</TABLE> - -</FORM> diff --git a/templates/pt_BR/admin.tmpl b/templates/pt_BR/admin.tmpl index b847bef96..c7095e17c 100644 --- a/templates/pt_BR/admin.tmpl +++ b/templates/pt_BR/admin.tmpl @@ -79,19 +79,3 @@ </FORM>} </div> </div> - -<div class="row"> - <H2 CLASS="title">Inscrições RSS</H2> - - <P> - <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="Adicionar inscrição RSS"></FORM> - </P> - - {notify_subscription_id?<TABLE CLASS="list" SUMMARY="Inscrições RSS"> - <THEAD><TR><TH>Nome</TH><TH>Eventos</TH><TH>Nome da fila</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="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 inscrição RSS"></FORM> </TD><TD>{notify_events}</TD><TD NOWRAP> {notify_printer_name?{notify_printer_name}:Todas as filas}</TD></TR>} - </TBODY> - </TABLE>:} -</div> diff --git a/templates/pt_BR/subscription-added.tmpl b/templates/pt_BR/subscription-added.tmpl deleted file mode 100644 index c67cc97a9..000000000 --- a/templates/pt_BR/subscription-added.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>A inscrição {subscription_name} foi adicionada com sucesso.</P> diff --git a/templates/pt_BR/subscription-canceled.tmpl b/templates/pt_BR/subscription-canceled.tmpl deleted file mode 100644 index be57babc4..000000000 --- a/templates/pt_BR/subscription-canceled.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>A inscrição #{notify_subscription_id} foi cancelada.</P> diff --git a/templates/ru/add-rss-subscription.tmpl b/templates/ru/add-rss-subscription.tmpl deleted file mode 100644 index 4567b9262..000000000 --- a/templates/ru/add-rss-subscription.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -<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> - -<TABLE SUMMARY="Добавление подписки по RSS"> -<TR> -<TH CLASS="label">Название:</TH> -<TD COLSPAN="5"><INPUT TYPE="TEXT" NAME="SUBSCRIPTION_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?SUBSCRIPTION_NAME}"><BR> -<SMALL>(Может содержать любые символы, кроме "/", "#", "?" и пробела)</SMALL></TD> -</TR> -<TR> -<TH CLASS="label">Очередь:</TH> -<TD COLSPAN="5"><SELECT NAME="PRINTER_URI" SIZE="10"><OPTION VALUE="#ALL#"{?PRINTER_URI=#ALL#? SELECTED:}>Все очереди</OPTION>{[printer_name]<OPTION VALUE="{printer_uri_supported}"{?PRINTER_URI={printer_uri_supported}? SELECTED:}>{printer_name}</OPTION>}</SELECT></TD> -</TR> -<TR VALIGN="TOP"> -<TH CLASS="label">События:</TH> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CREATED" {?EVENT_JOB_CREATED}>Новое задание<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_COMPLETED" {?EVENT_JOB_COMPLETED}>Задание выполнено<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_STOPPED" {?EVENT_JOB_STOPPED}>Задание остановлено<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_JOB_CONFIG_CHANGED" {?EVENT_JOB_CONFIG_CHANGED}>Изменены параметры задания</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_STOPPED" {?EVENT_PRINTER_STOPPED}>Очередь остановлена<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_ADDED" {?EVENT_PRINTER_ADDED}>Очередь добавлена<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_MODIFIED" {?EVENT_PRINTER_MODIFIED}>Очередь изменена<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_PRINTER_DELETED" {?EVENT_PRINTER_DELETED}>Очередь удалена</TD> -<TD> </TD> -<TD><INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STARTED" {?EVENT_SERVER_STARTED}>Сервер запущен<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_STOPPED" {?EVENT_SERVER_STOPPED}>Сервер остановлен<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_RESTARTED" {?EVENT_SERVER_RESTARTED}>Сервер перезапущен<BR> -<INPUT TYPE="CHECKBOX" NAME="EVENT_SERVER_AUDIT" {?EVENT_SERVER_AUDIT}>Проверка безопасности сервера</TD> -</TR> -<TR> -<TH CLASS="label">Количество событий в ленте:</TH> -<TD COLSPAN="5"><INPUT TYPE="NUMBER" NAME="MAX_EVENTS" SIZE="4" MAXLENGTH="4" VALUE="{MAX_EVENTS?{MAX_EVENTS}:20}"></TD> -</TR> -<TR> -<TD></TD> -<TD COLSPAN="5"><INPUT TYPE="SUBMIT" VALUE="Добавить подписку по RSS"></TD> -</TR> -</TABLE> - -</FORM> diff --git a/templates/ru/admin.tmpl b/templates/ru/admin.tmpl index 49a168cfc..e6d7445e2 100644 --- a/templates/ru/admin.tmpl +++ b/templates/ru/admin.tmpl @@ -66,7 +66,7 @@ <P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Дополнительные параметры <SMALL>▶</SMALL></A><BR> <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server"> <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Разрешить совместный доступ к принтерам, подключенным к этой системе<BR> - <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из + <INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из интернет<BR> <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Разрешить удаленное администрирование<BR> {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:} @@ -79,19 +79,3 @@ </FORM>} </div> </div> - -<div class="row"> - <H2 CLASS="title">Подписка по RSS</H2> - - <P> - <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> - - {notify_subscription_id?<TABLE CLASS="list" SUMMARY="Подписки по RSS"> - <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="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>:} -</div>
\ No newline at end of file diff --git a/templates/ru/subscription-added.tmpl b/templates/ru/subscription-added.tmpl deleted file mode 100644 index b5c60ab71..000000000 --- a/templates/ru/subscription-added.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>Подписка {subscription_name} была успешно добавлена.</P> diff --git a/templates/ru/subscription-canceled.tmpl b/templates/ru/subscription-canceled.tmpl deleted file mode 100644 index 1518cbeec..000000000 --- a/templates/ru/subscription-canceled.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>Подписка #{notify_subscription_id} была отменена.</P> diff --git a/templates/subscription-added.tmpl b/templates/subscription-added.tmpl deleted file mode 100644 index 6153d7950..000000000 --- a/templates/subscription-added.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>Subscription {subscription_name} has been added successfully.</P> diff --git a/templates/subscription-canceled.tmpl b/templates/subscription-canceled.tmpl deleted file mode 100644 index 46662ccdb..000000000 --- a/templates/subscription-canceled.tmpl +++ /dev/null @@ -1 +0,0 @@ -<P>Subscription #{notify_subscription_id} has been canceled.</P> |