Remove remaining references to subscriptions and samba.

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index f8c7e157bdd503a9b43150338f2d7b3a70b11e2e..50962520482adec1cfeb3556afde7bb02224501b 100644 (file)
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -41,7 +41,6 @@ static void   do_am_printer(http_t *http, int modify);
 static void    do_config_server(http_t *http);
 static void    do_delete_class(http_t *http);
 static void    do_delete_printer(http_t *http);
-static void    do_export(http_t *http);
 static void    do_list_printers(http_t *http);
 static void    do_menu(http_t *http);
 static void    do_set_allowed_users(http_t *http);
@@ -164,8 +163,6 @@ main(void)
       do_set_options(http, 0);
     else if (!strcmp(op, "config-server"))
       do_config_server(http);
-    else if (!strcmp(op, "export-samba"))
-      do_export(http);
     else
     {
      /*
@@ -1938,141 +1935,6 @@ do_delete_printer(http_t *http)         /* I - HTTP connection */
 }
 
 
-/*
- * 'do_export()' - Export printers to Samba.
- */
-
-static void
-do_export(http_t *http)                        /* I - HTTP connection */
-{
-  int          i, j;                   /* Looping vars */
-  ipp_t                *request,               /* IPP request */
-               *response;              /* IPP response */
-  const char   *username,              /* Samba username */
-               *password,              /* Samba password */
-               *export_all;            /* Export all printers? */
-  int          export_count,           /* Number of printers to export */
-               printer_count;          /* Number of available printers */
-  const char   *name,                  /* What name to pull */
-               *dest;                  /* Current destination */
-  char         ppd[1024];              /* PPD file */
-
-
- /*
-  * Get form data...
-  */
-
-  username     = cgiGetVariable("USERNAME");
-  password     = cgiGetVariable("PASSWORD");
-  export_all   = cgiGetVariable("EXPORT_ALL");
-  export_count = cgiGetSize("EXPORT_NAME");
-
- /*
-  * Get list of available printers...
-  */
-
-  cgiSetSize("PRINTER_NAME", 0);
-  cgiSetSize("PRINTER_EXPORT", 0);
-
-  request = ippNewRequest(CUPS_GET_PRINTERS);
-
-  ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM,
-                "printer-type", 0);
-
-  ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_ENUM,
-                "printer-type-mask", CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-               "requested-attributes", NULL, "printer-name");
-
-  if ((response = cupsDoRequest(http, request, "/")) != NULL)
-  {
-    cgiSetIPPVars(response, NULL, NULL, NULL, 0);
-    ippDelete(response);
-
-    if (!export_all)
-    {
-      printer_count = cgiGetSize("PRINTER_NAME");
-
-      for (i = 0; i < printer_count; i ++)
-      {
-        dest = cgiGetArray("PRINTER_NAME", i);
-
-        for (j = 0; j < export_count; j ++)
-         if (!_cups_strcasecmp(dest, cgiGetArray("EXPORT_NAME", j)))
-            break;
-
-        cgiSetArray("PRINTER_EXPORT", i, j < export_count ? "Y" : "");
-      }
-    }
-  }
-
- /*
-  * Export or get the printers to export...
-  */
-
-  if (username && *username && password && *password &&
-      (export_all || export_count > 0))
-  {
-   /*
-    * Do export...
-    */
-
-    fputs("DEBUG: Export printers...\n", stderr);
-
-    if (export_all)
-    {
-      name         = "PRINTER_NAME";
-      export_count = cgiGetSize("PRINTER_NAME");
-    }
-    else
-      name = "EXPORT_NAME";
-
-    for (i = 0; i < export_count; i ++)
-    {
-      dest = cgiGetArray(name, i);
-
-      if (!cupsAdminCreateWindowsPPD(http, dest, ppd, sizeof(ppd)))
-        break;
-
-      j = cupsAdminExportSamba(dest, ppd, "localhost", username, password,
-                               stderr);
-
-      unlink(ppd);
-
-      if (!j)
-        break;
-    }
-
-    if (i < export_count)
-      cgiSetVariable("ERROR", cupsLastErrorString());
-    else
-    {
-      cgiStartHTML(cgiText(_("Export Printers to Samba")));
-      cgiCopyTemplateLang("samba-exported.tmpl");
-      cgiEndHTML();
-      return;
-    }
-  }
-  else if (username && !*username)
-    cgiSetVariable("ERROR",
-                   cgiText(_("A Samba username is required to export "
-                            "printer drivers")));
-  else if (username && (!password || !*password))
-    cgiSetVariable("ERROR",
-                   cgiText(_("A Samba password is required to export "
-                            "printer drivers")));
-
- /*
-  * Show form...
-  */
-
-  cgiStartHTML(cgiText(_("Export Printers to Samba")));
-  cgiCopyTemplateLang("samba-export.tmpl");
-  cgiEndHTML();
-}
-
-
 /*
  * 'do_list_printers()' - List available printers.
  */
@@ -2384,55 +2246,6 @@ do_menu(http_t *http)                    /* I - HTTP connection */
 
   cupsFreeOptions(num_settings, settings);
 
- /*
-  * See if Samba and the Windows drivers are installed...
-  */
-
-  if ((datadir = getenv("CUPS_DATADIR")) == NULL)
-    datadir = CUPS_DATADIR;
-
-  snprintf(filename, sizeof(filename), "%s/drivers/pscript5.dll", datadir);
-  if (!access(filename, R_OK))
-  {
-   /*
-    * Found Windows 2000 driver file, see if we have smbclient and
-    * rpcclient...
-    */
-
-    if (cupsFileFind("smbclient", getenv("PATH"), 1, filename,
-                     sizeof(filename)) &&
-        cupsFileFind("rpcclient", getenv("PATH"), 1, filename,
-                    sizeof(filename)))
-      cgiSetVariable("HAVE_SAMBA", "Y");
-    else
-    {
-      if (!cupsFileFind("smbclient", getenv("PATH"), 1, filename,
-                        sizeof(filename)))
-        fputs("ERROR: smbclient not found!\n", stderr);
-
-      if (!cupsFileFind("rpcclient", getenv("PATH"), 1, filename,
-                        sizeof(filename)))
-        fputs("ERROR: rpcclient not found!\n", stderr);
-    }
-  }
-  else
-    perror(filename);
-
- /*
-  * Subscriptions...
-  */
-
-  request = ippNewRequest(IPP_GET_SUBSCRIPTIONS);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-               NULL, "ipp://localhost/");
-
-  if ((response = cupsDoRequest(http, request, "/")) != NULL)
-  {
-    cgiSetIPPVars(response, NULL, NULL, NULL, 0);
-    ippDelete(response);
-  }
-
  /*
   * Finally, show the main menu template...
   */

diff --git a/templates/admin.tmpl b/templates/admin.tmpl
index a5660e2e07eb328ac080b669b69b3bbd6769f554..596696e68e2c229c2eccd14bdda4066c5b505715 100644 (file)
--- a/templates/admin.tmpl
+++ b/templates/admin.tmpl
@@ -6,7 +6,6 @@
     <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="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>

diff --git a/templates/da/admin.tmpl b/templates/da/admin.tmpl
index 06fd23589366d521b438a93e797792bdc2042724..4b26c250cd1876d0acab428810c5c5098ac5f667 100644 (file)
--- a/templates/da/admin.tmpl
+++ b/templates/da/admin.tmpl
@@ -6,7 +6,6 @@
     <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="Tilføj 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 nye printere"></FORM>
     <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Håndter printere"></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="Eksportér printere til Samba"></FORM>:}
     </P>
 
     <H2 CLASS="title">Klasser</H2>

diff --git a/templates/da/samba-export.tmpl b/templates/da/samba-export.tmpl
deleted file mode 100644 (file)
index ad78908..0000000
--- a/templates/da/samba-export.tmpl
+++ /dev/null
@@ -1,55 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></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">Eksportér printere til Samba</H2>
-
-{error?<P>Kan ikke eksportere printere til Samba\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Se <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A>-filen for mere information.</P>:
-<P>Siden giver dig mulighed for at eksportere printere til Samba så
-Windows-klienter kan få adgang til dem gennem <VAR>Andre
-computere</VAR>- eller <VAR>Netværkssteder</VAR>-ikonerne på deres
-skrivebord. Du skal først have installere Windows PostScript-printerdriverne
-som beskrevet i man-siden til <A
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A>.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Printere:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Eksportér alle printere</LABEL>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba-brugernavn:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (kræves)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba-adgangskode:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (kræves)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Eksportér printere til Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>

diff --git a/templates/da/samba-exported.tmpl b/templates/da/samba-exported.tmpl
deleted file mode 100644 (file)
index 6779bde..0000000
--- a/templates/da/samba-exported.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<P>Printere eksporteret til samba.</P>

diff --git a/templates/de/admin.tmpl b/templates/de/admin.tmpl
index ebf193ea2aaaffc1a3d740c982399df751712d4f..e8c1e18c90a5177385cafd4dd6bba2d81b8f011a 100644 (file)
--- a/templates/de/admin.tmpl
+++ b/templates/de/admin.tmpl
@@ -6,7 +6,6 @@
     <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="Neue Drucker suchen"></FORM>
     <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Drucker verwalten"></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>

diff --git a/templates/de/samba-export.tmpl b/templates/de/samba-export.tmpl
deleted file mode 100644 (file)
index 1850aef..0000000
--- a/templates/de/samba-export.tmpl
+++ /dev/null
@@ -1,56 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></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>
-
-{error?<P>Drucker können nicht für Samba freigegeben werden\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Bitte prüfen Sie das <A HREF="/admin/log/error_log"
-TARGET="_blank">Fehlerprotokoll</A> für weitere Informationen.</P>:
-<P>Diese Seite erlaubt es Ihnen Drucker für Samba freizugeben
-damit Windows-Rechner auf diese über das <VAR>Netzwerk</VAR>-
-bzw. <VAR>Netzwerkumgebung</VAR>-Symbol z.B. auf dem Desktop
-zugreifen können. Davor muss allerdings der PostScript-
-Druckertreiber für Windows, wie in der man page <A 
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A> beschrieben, installiert
-worden sein.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Drucker:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Alle Drucker freigeben</LABEL>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba-Benutzername:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (erforderlich)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba-Passwort:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (erforderlich)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Drucker für Samba freigeben"></TD>
-</TR>
-</TABLE>
-
-</FORM>

diff --git a/templates/de/samba-exported.tmpl b/templates/de/samba-exported.tmpl
deleted file mode 100644 (file)
index 8a49c30..0000000
--- a/templates/de/samba-exported.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<P>Die Drucker wurden erfolgreich für Samba freigegeben.</P>

diff --git a/templates/es/admin.tmpl b/templates/es/admin.tmpl
index 2be1ed0af2e430e4c58d7f8cc90c5bc6467e0fa2..b455bc737a9dc163339cb70bec00faf0e7aea128 100644 (file)
--- a/templates/es/admin.tmpl
+++ b/templates/es/admin.tmpl
@@ -6,7 +6,6 @@
     <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&ntilde;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="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>

diff --git a/templates/es/samba-export.tmpl b/templates/es/samba-export.tmpl
deleted file mode 100644 (file)
index 946e312..0000000
--- a/templates/es/samba-export.tmpl
+++ /dev/null
@@ -1,55 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></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>
-
-{error?<P>No se han podido exportar las impresoras a Samba\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Consulte el archivo <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> para m&aacute;s informaci&oacute;n.</P>:
-<P>Esta p&aacute;gina le permite exportar las impresoras a Samba para que
-los clientes Windows puedan acceder a ellas por los iconos de su
-escritorio <VAR>Entorno de red</VAR> o <VAR>Sitios de red</VAR>. Debe haber instalado
-previamente el controlador de impresora PostScript de Windows
-como se describe en la p&aacute;gina del manual
-<A HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A>.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Impresoras:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Exportar todas las impresoras</LABEL>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Nombre de usuario Samba:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (necesario)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Contrase&ntilde;a Samba:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (necesaria)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Exportar impresoras a Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>

diff --git a/templates/es/samba-exported.tmpl b/templates/es/samba-exported.tmpl
deleted file mode 100644 (file)
index a54925d..0000000
--- a/templates/es/samba-exported.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<P>Se han exportado las impresoras a samba con &eacute;xito.</P>

diff --git a/templates/fr/admin.tmpl b/templates/fr/admin.tmpl
index 8ad563ae654881210a5a6bb797ba354324f32ee0..d52b0f24b41c37c42b3b6746970680f006838f73 100644 (file)
--- a/templates/fr/admin.tmpl
+++ b/templates/fr/admin.tmpl
@@ -6,7 +6,6 @@
     <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="Ajouter une imprimante"></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="Trouver de nouvelles imprimantes"></FORM>
     <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="G&eacute;rer les imprimantes"></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="Exporter les imprimantes vers Samba"></FORM>:}
     </P>
 
     <H2 CLASS="title">Classes</H2>

diff --git a/templates/fr/samba-export.tmpl b/templates/fr/samba-export.tmpl
deleted file mode 100644 (file)
index fa16d30..0000000
--- a/templates/fr/samba-export.tmpl
+++ /dev/null
@@ -1,52 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></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">Exporter les Imprimantes vers Samba</H2>
-
-{error?<P>Impossible d'exporter les imprimantes vers Samba \:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Consulter le fichier <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> pour plus d'informations.</P>:
-<P>Cette page vous permet d'exporter des imprimantes vers Samba de sorte que des clients Windows puissent y acc&eacute;der via l'ic&oacirc;ne <VAR>Voisinage r&eacute;seau</VAR> ou
-<VAR>Favoris r&eacute;seau</VAR> du bureau. Vous devez au pr&eacute;alable installer les pilotes Windows d'imprimante PostScript : cf. la page man <A
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A>.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Imprimantes \:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Exporter toutes les imprimantes</LABEL>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Utilisateur Samba \:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (required)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Mot de passe Samba \:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (requis)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Export Printers to Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>

diff --git a/templates/fr/samba-exported.tmpl b/templates/fr/samba-exported.tmpl
deleted file mode 100644 (file)
index d4ad778..0000000
--- a/templates/fr/samba-exported.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<P>Les imprimantes ont &eacute;t&eacute; export&eacute;es vers Samba avec succ&egrave;s.</P>

diff --git a/templates/ja/admin.tmpl b/templates/ja/admin.tmpl
index e115e6e919d60f87d5bad6f3598530b19894ed4d..1fd958cbb50bda4107aca1fdcc7d95606382d5f9 100644 (file)
--- a/templates/ja/admin.tmpl
+++ b/templates/ja/admin.tmpl
@@ -6,7 +6,6 @@
     <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="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>

diff --git a/templates/ja/samba-export.tmpl b/templates/ja/samba-export.tmpl
deleted file mode 100644 (file)
index f2d3a9e..0000000
--- a/templates/ja/samba-export.tmpl
+++ /dev/null
@@ -1,55 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></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>
-
-{error?<P>プリンターを Samba にエクスポートできません\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>より詳細な情報については <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> ファイルを参照してください。</P>:
-<P>このページは、Windows クライアントがデスクトップ上の
-<VAR>マイネットワーク</VAR> や <VAR>ネットワークの場所</VAR>
-アイコン経由でアクセスできるよう、プリンターの Samba
-へのエクスポートを許可します。<A
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A> man ページに書かれているように、
-事前に Windows PostScript ドライバーをインストールしておく必要があります。</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">プリンター:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> すべてのプリンターをエクスポート</LABEL>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba のユーザー名:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (必須)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba のパスワード:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (必須)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="プリンターを Samba にエクスポート"></TD>
-</TR>
-</TABLE>
-
-</FORM>

diff --git a/templates/ja/samba-exported.tmpl b/templates/ja/samba-exported.tmpl
deleted file mode 100644 (file)
index f67ddd9..0000000
--- a/templates/ja/samba-exported.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<P>プリンターは Samba に正しくエクスポートされました。</P>

diff --git a/templates/pt_BR/admin.tmpl b/templates/pt_BR/admin.tmpl
index 8ee2d4ba8ae1316e7ee20eaa2024907e4f29d440..4f0fd03f0f70e0a840ac4be31318d749f88b0c5a 100644 (file)
--- a/templates/pt_BR/admin.tmpl
+++ b/templates/pt_BR/admin.tmpl
@@ -6,7 +6,6 @@
     <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="Adicionar impressora"></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 novas impressoras"></FORM>
     <FORM ACTION="/printers/" METHOD="GET"><INPUT TYPE="SUBMIT" VALUE="Gerenciar impressoras"></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 impressoras ao Samba"></FORM>:}
     </P>
 
     <H2 CLASS="title">Classes</H2>

diff --git a/templates/pt_BR/samba-export.tmpl b/templates/pt_BR/samba-export.tmpl
deleted file mode 100644 (file)
index d8badd9..0000000
--- a/templates/pt_BR/samba-export.tmpl
+++ /dev/null
@@ -1,54 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></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 impressoras para o Samba</H2>
-
-{error?<P>N&atilde;o foi poss&iacute;vel exportar impressoras para o Samba\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>>Consulte o arquivo <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> para mais informa&ccedil;&otilde;es.</P>:
-<P>Essa p&aacute;gina permite que voc&ecirc; exporte impressoras para o Samba
-para que clientes Windows possam acess&aacute;-las atrav&eacute;s dos &iacute;cones de
-<VAR>Ambiente de Rede</VAR> ou <VAR>Locais de Rede</VAR> nas suas
-&aacute;reas de trabalho. Voc&ecirc; deve primeiro instalar os drivers de
-impressora PostScript do Windows como descrito na p&aacute;gina de manual do
-<A HREF="/help/man-cupsaddsmb.html" TARGET="_blank">cupsaddsmb(8)</A>.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Impressoras:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Exportar todas as impressoras</LABEL>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Nome do usu&aacute;rio do Samba:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (obrigat&oacute;rio)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Senha do Samba:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (obrigat&oacute;rio)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Exportar impressoras para o Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>

diff --git a/templates/pt_BR/samba-exported.tmpl b/templates/pt_BR/samba-exported.tmpl
deleted file mode 100644 (file)
index c2ec3a5..0000000
--- a/templates/pt_BR/samba-exported.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<P>Impressoras exportadas para o samba com sucesso.</P>

diff --git a/templates/ru/admin.tmpl b/templates/ru/admin.tmpl
index 3d807ce208ccc1e3bf0ce10f6322c0968b186e91..1aafc6b0e504cdcf0596a76b6811047a51ad6a9a 100644 (file)
--- a/templates/ru/admin.tmpl
+++ b/templates/ru/admin.tmpl
@@ -5,7 +5,6 @@
     <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="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>

diff --git a/templates/ru/samba-export.tmpl b/templates/ru/samba-export.tmpl
deleted file mode 100644 (file)
index 39d0259..0000000
--- a/templates/ru/samba-export.tmpl
+++ /dev/null
@@ -1,53 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></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>
-
-{error?<P>Невозможно экспортировать принтеры в Samba\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Посмотрите файл <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> для более подробной информации.</P>:
-<P>Эта страница позволяет добавить принтеры в Samba так, чтобы
-клиенты Windows могли получить доступ к ним через значок <VAR>Сетевое окружение</VAR> или <VAR>Сетевые подключения</VAR> на их рабочем столе. Вы должны установить на Windows драйвер принтера PostScript
-как описано на странице руководства <A
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A>.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Принтеры:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Экспортировать все принтеры</LABEL>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Имя пользователя Samba:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (обязательный параметр)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Пароль Samba:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (обязательный параметр)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Экспортировать принтеры в Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>

diff --git a/templates/ru/samba-exported.tmpl b/templates/ru/samba-exported.tmpl
deleted file mode 100644 (file)
index 179b2ad..0000000
--- a/templates/ru/samba-exported.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<P>Принтеры успешно экспортированы в Samba.</P>

diff --git a/templates/samba-export.tmpl b/templates/samba-export.tmpl
deleted file mode 100644 (file)
index da4b1ca..0000000
--- a/templates/samba-export.tmpl
+++ /dev/null
@@ -1,55 +0,0 @@
-<SCRIPT TYPE="text/javascript"><!--
-function select_printers() {
-  var list = document.export_samba.EXPORT_NAME;
-  var sel = document.export_samba.EXPORT_ALL.checked;
-
-  for (i = 0; i < list.length; i ++) {
-    list.options[i].selected = sel;
-  }
-}
---></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>
-
-{error?<P>Unable to export printers to Samba\:</P>
-<BLOCKQUOTE>{error}</BLOCKQUOTE>
-<P>Consult the <A HREF="/admin/log/error_log"
-TARGET="_blank">error_log</A> file for more information.</P>:
-<P>This page allows you to export printers to Samba so that
-Windows clients can access them through the <VAR>Network
-Neighborhood</VAR> or <VAR>Network Places</VAR> icons on their
-desktop. You must previously install the Windows PostScript
-printer drivers as described in the <A
-HREF="/help/man-cupsaddsmb.html"
-TARGET="_blank">cupsaddsmb(8)</A> man page.</P>}
-
-<TABLE>
-<TR>
-<TH CLASS="label">Printers:</TH>
-<TD>
-<SELECT NAME="EXPORT_NAME" SIZE="10" MULTIPLE>
-{[printer_name]<OPTION VALUE="{printer_name}"{export_all? SELECTED:{printer_export? SELECTED:}}>{printer_name}}
-</SELECT><BR>
-<INPUT TYPE="CHECKBOX" NAME="EXPORT_ALL" ID="EXPORT_ALL"{export_all? CHECKED:}
-onChange="select_printers()"><LABEL FOR="EXPORT_ALL"> Export All Printers</LABEL>
-</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba Username:</TH>
-<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> (required)</TD>
-</TR>
-<TR>
-<TH CLASS="label">Samba Password:</TH>
-<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> (required)</TD>
-</TR>
-<TR>
-<TD></TD>
-<TD><INPUT TYPE="SUBMIT" VALUE="Export Printers to Samba"></TD>
-</TR>
-</TABLE>
-
-</FORM>

diff --git a/templates/samba-exported.tmpl b/templates/samba-exported.tmpl
deleted file mode 100644 (file)
index 6fa8eb4..0000000
--- a/templates/samba-exported.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-<P>Printers exported to samba successfully.</P>