Removed purge-jobs legacy code from CGI scripts and templates

Fixes #325

diff --git a/CHANGES.md b/CHANGES.md
index 6bc64396dd57b8f3adf8644142481f256cd417f8..19fd31dcc32c34615db65a36240ebc63ebff265a 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ Changes in CUPS v2.4.1 (TBA)
 - Removed remaining legacy code for `RIP_MAX_CACHE` environment variable
   (Issue #323)
 - Removed deprecated directives from cupsctl and cups-files.conf (Issue #300)
+- Removed `purge-jobs` legacy code from CGI scripts and templates (Issue #325)
 
 
 Changes in CUPS v2.4.0 (29th November 2021)

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index cedb1f3eb92797d0173ea5793af557bbda97dde2..24cab0c36df44cdfbeaa769e9db092a908758e4c 100644 (file)
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -2271,7 +2271,7 @@ do_set_allowed_users(http_t *http)        /* I - HTTP connection */
   ipp_t                *request,               /* IPP request */
                *response;              /* IPP response */
   char         uri[HTTP_MAX_URI];      /* Printer URI */
-  const char   *printer,               /* Printer name (purge-jobs) */
+  const char   *printer,               /* Printer name */
                *is_class,              /* Is a class? */
                *users,                 /* List of users or groups */
                *type;                  /* Allow/deny type */
@@ -2536,7 +2536,7 @@ do_set_default(http_t *http)              /* I - HTTP connection */
   const char   *title;                 /* Page title */
   ipp_t                *request;               /* IPP request */
   char         uri[HTTP_MAX_URI];      /* Printer URI */
-  const char   *printer,               /* Printer name (purge-jobs) */
+  const char   *printer,               /* Printer name */
                *is_class;              /* Is a class? */
 
 

diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c
index d4d4ffd9e27f5cca8d74db2e55b8175d8a63c47f..d6da74444aba4150fa3f2e77ac6811af6f2bb621 100644 (file)
--- a/cgi-bin/jobs.c
+++ b/cgi-bin/jobs.c
@@ -138,7 +138,7 @@ do_job_op(http_t      *http,                /* I - HTTP connection */
   *
   *    attributes-charset
   *    attributes-natural-language
-  *    job-uri or printer-uri (purge-jobs)
+  *    job-uri
   *    requesting-user-name
   */
 

diff --git a/templates/class.tmpl b/templates/class.tmpl
index 0afb0d39f01e80422c47181fdcf1a7a6d9169ca3..630c342ec2ea804f2935a1a4dc367e06a0cf46ab 100644 (file)
--- a/templates/class.tmpl
+++ b/templates/class.tmpl
@@ -11,7 +11,7 @@
 {printer_state=5?<OPTION VALUE="start-class">Resume Class</OPTION>:<OPTION VALUE="stop-class">Pause Class</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Accept Jobs</OPTION>:<OPTION VALUE="reject-jobs">Reject Jobs</OPTION>}
 <OPTION VALUE="move-jobs">Move All Jobs</OPTION>
-<OPTION VALUE="purge-jobs">Cancel All Jobs</OPTION>
+<OPTION VALUE="cancel-jobs">Cancel All Jobs</OPTION>
 </SELECT>
 <INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
 </FORM>

diff --git a/templates/da/class.tmpl b/templates/da/class.tmpl
index dbbf8d54c2ad545f97e38067cacdf5075e99f8ea..49d3b8ee2dde5cc7fa3ebb9c060cc8a7331c857d 100644 (file)
--- a/templates/da/class.tmpl
+++ b/templates/da/class.tmpl
@@ -11,7 +11,7 @@
 {printer_state=5?<OPTION VALUE="start-class">Genoptag klasse</OPTION>:<OPTION VALUE="stop-class">Sæt klasse på pause</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Accepter jobs</OPTION>:<OPTION VALUE="reject-jobs">Afvis jobs</OPTION>}
 <OPTION VALUE="move-jobs">Flyt alle jobs</OPTION>
-<OPTION VALUE="purge-jobs">Annuller alle jobs</OPTION>
+<OPTION VALUE="cancel-jobs">Annuller alle jobs</OPTION>
 </SELECT>
 <INPUT TYPE="SUBMIT" VALUE="Gå" STYLE="display: none;">
 </FORM>

diff --git a/templates/de/class.tmpl b/templates/de/class.tmpl
index eecb47bb50f4858b270a9afc3acf3766a2a3413c..123c1b5325215eacfcbe4bdc1cec99cf68c403ec 100644 (file)
--- a/templates/de/class.tmpl
+++ b/templates/de/class.tmpl
@@ -11,7 +11,7 @@
 {printer_state=5?<OPTION VALUE="start-class">Klasse starten</OPTION>:<OPTION VALUE="stop-class">Klasse anhalten</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aufträge annehmen</OPTION>:<OPTION VALUE="reject-jobs">Aufträge ablehnen</OPTION>}
 <OPTION VALUE="move-jobs">Alle Aufträge verschieben</OPTION>
-<OPTION VALUE="purge-jobs">Alle Aufträge abbrechen</OPTION>
+<OPTION VALUE="cancel-jobs">Alle Aufträge abbrechen</OPTION>
 </SELECT>
 <INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
 </FORM>

diff --git a/templates/es/class.tmpl b/templates/es/class.tmpl
index d89983cd2b25f04a894f46c3bffb938e27049baa..a29426906603f957ac465e617bf946d7d986d8a5 100644 (file)
--- a/templates/es/class.tmpl
+++ b/templates/es/class.tmpl
@@ -11,7 +11,7 @@
 {printer_state=5?<OPTION VALUE="start-class">Reanudar clase</OPTION>:<OPTION VALUE="stop-class">Pausar clase</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aceptar trabajos</OPTION>:<OPTION VALUE="reject-jobs">Rechazar trabajos</OPTION>}
 <OPTION VALUE="move-jobs">Mover todos los trabajos</OPTION>
-<OPTION VALUE="purge-jobs">Cancelar todos los trabajos</OPTION>
+<OPTION VALUE="cancel-jobs">Cancelar todos los trabajos</OPTION>
 </SELECT>
 <INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
 </FORM>

diff --git a/templates/fr/class.tmpl b/templates/fr/class.tmpl
index d48c05d6a606b0f741fe179a793a6a45d6114a11..c9d6475713ebcd295f6f5c788d367967d58cf336 100644 (file)
--- a/templates/fr/class.tmpl
+++ b/templates/fr/class.tmpl
@@ -11,7 +11,7 @@
 {printer_state=5?<OPTION VALUE="start-class">D&eacute;marrer la classe</OPTION>:<OPTION VALUE="stop-class">Arr&ecirc;ter la classe</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Accepter les t&acirc;ches</OPTION>:<OPTION VALUE="reject-jobs">Rejeter les t&acirc;ches</OPTION>}
 <OPTION VALUE="move-jobs">Transf&eacute;rer toutes les t&acirc;ches</OPTION>
-<OPTION VALUE="purge-jobs">Annuler toutes les t&acirc;ches</OPTION>
+<OPTION VALUE="cancel-jobs">Annuler toutes les t&acirc;ches</OPTION>
 </SELECT>
 <INPUT TYPE="SUBMIT" VALUE="Valider" STYLE="display: none;">
 </FORM>

diff --git a/templates/ja/class.tmpl b/templates/ja/class.tmpl
index a5becb6661e42f0a02d06bf26b3bb52497222f0b..a89fcd37cbe7d5eec6d290475e12bca997d5b8d4 100644 (file)
--- a/templates/ja/class.tmpl
+++ b/templates/ja/class.tmpl
@@ -11,7 +11,7 @@
 {printer_state=5?<OPTION VALUE="start-class">クラスの再開</OPTION>:<OPTION VALUE="stop-class">クラスの停止</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">ジョブを受け付け</OPTION>:<OPTION VALUE="reject-jobs">ジョブを拒否</OPTION>}
 <OPTION VALUE="move-jobs">すべてのジョブの移動</OPTION>
-<OPTION VALUE="purge-jobs">すべてのジョブをキャンセル</OPTION>
+<OPTION VALUE="cancel-jobs">すべてのジョブをキャンセル</OPTION>
 </SELECT>
 <INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
 </FORM>

diff --git a/templates/pt_BR/class.tmpl b/templates/pt_BR/class.tmpl
index dc503776d09e8fee938e68d1f79c0073dfb9e7af..2c045cc244ee194d9fd051ac36d53b2a283d5ae6 100644 (file)
--- a/templates/pt_BR/class.tmpl
+++ b/templates/pt_BR/class.tmpl
@@ -11,7 +11,7 @@
 {printer_state=5?<OPTION VALUE="start-class">Resumir classe</OPTION>:<OPTION VALUE="stop-class">Pausar classe</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Aceitar trabalhos</OPTION>:<OPTION VALUE="reject-jobs">Rejeitar trabalhos</OPTION>}
 <OPTION VALUE="move-jobs">Mover todos trabalhos</OPTION>
-<OPTION VALUE="purge-jobs">Cancelar todos trabalhos</OPTION>
+<OPTION VALUE="cancel-jobs">Cancelar todos trabalhos</OPTION>
 </SELECT>
 <INPUT TYPE="SUBMIT" VALUE="Ir" STYLE="display: none;">
 </FORM>

diff --git a/templates/ru/class.tmpl b/templates/ru/class.tmpl
index a5aadff044e53fcd4cb1ef9524a4deb2bffa17d7..3ed47b2c1471f9a82673ff7acf972dc362baa6bd 100644 (file)
--- a/templates/ru/class.tmpl
+++ b/templates/ru/class.tmpl
@@ -11,7 +11,7 @@
 {printer_state=5?<OPTION VALUE="start-class">Включить группу</OPTION>:<OPTION VALUE="stop-class">Остановить группу</OPTION>}
 {printer_is_accepting_jobs=0?<OPTION VALUE="accept-jobs">Принимать задания</OPTION>:<OPTION VALUE="reject-jobs">Не принимать задания</OPTION>}
 <OPTION VALUE="move-jobs">Переместить все задания</OPTION>
-<OPTION VALUE="purge-jobs">Отменить все задания</OPTION>
+<OPTION VALUE="cancel-jobs">Отменить все задания</OPTION>
 </SELECT>
 <INPUT TYPE="SUBMIT" VALUE="Go" STYLE="display: none;">
 </FORM>