Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.2.8@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -1,41 +1,6 @@
-CHANGES.txt - 2007-03-15
+CHANGES.txt - 2007-02-06
 ------------------------

-CHANGES IN CUPS V1.2.9
-
-	- The scheduler did not use the default job-sheets
-	  (banners) for implicit classes (STR #2284)
-	- The scheduler could crash when listing complete jobs
-	  that had been unloaded from memory (STR #2288)
-	- The French localization was doubled up (STR #2287)
-	- Build system fixes for several platforms (STR #2260,
-	  STR #2275)
-	- The scheduler's openssl certificate generation code was
-	  broken on some platforms (STR #2282)
-	- The scheduler's log rotation check for devices was
-	  broken (STR #2278)
-	- The LPD mini-daemon did not handle the document-format
-	  option correctly (STR #2266)
-	- The pdftops filter ignored the "match" size option in the
-	  pdftops.conf file (STR #2285)
-	- cupstestppd now validates UTF-8 text strings in
-	  globalized PPD files (STR #2283)
-	- The outputorder=reverse option did not work with all
-	  printers (STR #2279)
-	- Classes containing other classes did not always work
-	  (STR #2255)
-	- Printer location and description information was lost
-	  if the corresponding string contained the "#" character
-	  (STR #2254)
-	- cupsRemoveOption() did not work properly (STR #2264)
-	- The USB backend did not work with some USB to parallel
-	  cables on Mac OS X.
-	- The test page did not print the rulers properly on
-	  large media sizes (STR #2252)
-	- The text filter could crash when pretty printing certain
-	  types of files (STR #2158)
-
-
 CHANGES IN CUPS V1.2.8

 	- Documentation fixes (STR #2141, STR #2157)
@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.2.9 - 2007-03-15
+INSTALL - CUPS v1.2.8 - 2007-02-14
 ----------------------------------

 This file describes how to compile and install CUPS from source
@@ -214,9 +214,6 @@ LOCALEDIR	= 	$(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR		= 	$(BUILDROOT)@CUPS_LOGDIR@
 MANDIR		=	$(BUILDROOT)@mandir@
 PMANDIR		=	$(BUILDROOT)@PMANDIR@
-RCLEVELS	=	@RCLEVELS@
-RCSTART		=	@RCSTART@
-RCSTOP		=	@RCSTOP@
 REQUESTS	= 	$(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR		=	$(BUILDROOT)@sbindir@
 SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
@@ -103,17 +103,14 @@ install:	installhdrs
 		echo Installing init scripts...; \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
 		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
-		for level in $(RCLEVELS); do \
-			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
-			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/S$(RCSTART)cups; \
-			if test `uname` = HP-UX; then \
-				level=`expr $$level - 1`; \
-				$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc$${level}.d; \
-			fi; \
-			$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc$${level}.d/K$(RCSTOP)cups; \
-		done; \
 		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
-		$(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \
+		$(INSTALL_SCRIPT) init/cups.sh  $(BUILDROOT)$(INITDIR)/rc0.d/K00cups; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc2.d; \
+		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc2.d/S99cups; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc3.d; \
+		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc3.d/S99cups; \
+		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc5.d; \
+		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/rc5.d/S99cups; \
 	fi
 	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
 		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
@@ -1,4 +1,4 @@
-README - CUPS v1.2.9 - 2007-03-15
+README - CUPS v1.2.8 - 2007-02-14
 ---------------------------------

 Looking for compile instructions?  Read the file "INSTALL.txt"
@@ -465,27 +465,16 @@ static Boolean list_device_callback(void *refcon, io_service_t obj)
    copy_devicestring(obj, &deviceIDString, &deviceLocation);
    if (deviceIDString != NULL) {
      CFStringRef make = NULL,  model = NULL, serial = NULL;
-      char uristr[1024], makestr[1024], modelstr[1024], serialstr[1024];
-      char optionsstr[1024], idstr[1024];
+      char uristr[1024], makestr[1024], modelstr[1024], serialstr[1024], optionsstr[1024];
+      char idstr[1024];

      copy_deviceinfo(deviceIDString, &make, &model, &serial);

      modelstr[0] = '/';

-      CFStringGetCString(deviceIDString, idstr, sizeof(idstr),
-                         kCFStringEncodingUTF8);
-
-      if (make)
-        CFStringGetCString(make, makestr, sizeof(makestr),
-	                   kCFStringEncodingUTF8);
-      else
-        strcpy(makestr, "Unknown");
-
-      if (model)
-	CFStringGetCString(model, &modelstr[1], sizeof(modelstr)-1,
-      			   kCFStringEncodingUTF8);
-      else
-        strcpy(modelstr + 1, "Printer");
+      CFStringGetCString(deviceIDString, idstr, sizeof(idstr),    kCFStringEncodingUTF8);
+      CFStringGetCString(make, makestr, sizeof(makestr),    kCFStringEncodingUTF8);
+      CFStringGetCString(model, &modelstr[1], sizeof(modelstr)-1, kCFStringEncodingUTF8);

     /*
      * Fix common HP 1284 bug...
@@ -79,14 +79,12 @@ print_device(const char *uri,		/* I - Device URI */
  do
  {
   /*
-    * Disable backchannel data when printing to Brother, Canon, or
-    * Minolta USB printers - apparently these printers will return
-    * the IEEE-1284 device ID over and over and over when they get
-    * a read request...
+    * Disable backchannel data when printing to Canon or Minolta USB
+    * printers - apparently these printers will return the IEEE-1284
+    * device ID over and over and over when they get a read request...
    */

-    use_bc = strcasecmp(hostname, "Brother") &&
-             strcasecmp(hostname, "Canon") &&
+    use_bc = strcasecmp(hostname, "Canon") &&
             strcasecmp(hostname, "Konica Minolta") &&
             strcasecmp(hostname, "Minolta");

@@ -1,9 +1,9 @@
 dnl
-dnl "$Id: cups-common.m4 6296 2007-02-20 16:33:25Z mike $"
+dnl "$Id: cups-common.m4 6145 2006-12-06 20:10:16Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 dnl
 dnl   These coded instructions, statements, and computer programs are the
 dnl   property of Easy Software Products and are protected by Federal
@@ -29,7 +29,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)

 dnl Version number information...
-CUPS_VERSION="1.2.9"
+CUPS_VERSION="1.2.8"
 CUPS_REVISION=""

 AC_SUBST(CUPS_VERSION)
@@ -264,5 +264,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)

 dnl
-dnl End of "$Id: cups-common.m4 6296 2007-02-20 16:33:25Z mike $".
+dnl End of "$Id: cups-common.m4 6145 2006-12-06 20:10:16Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-directories.m4 6333 2007-03-12 20:49:13Z mike $"
+dnl "$Id: cups-directories.m4 5905 2006-08-29 20:48:59Z mike $"
 dnl
 dnl   Directory stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -123,24 +123,24 @@ fi

 dnl Setup init.d locations...
 AC_ARG_WITH(rcdir, [  --with-rcdir            set path for rc scripts],rcdir="$withval",rcdir="")
-AC_ARG_WITH(rclevels, [  --with-rclevels         set run levels for rc scripts],rclevels="$withval",rclevels="2 3 5")
-AC_ARG_WITH(rcstart, [  --with-rcstart          set start number for rc scripts],rcstart="$withval",rcstart="99")
-AC_ARG_WITH(rcstop, [  --with-rcstop           set stop number for rc scripts],rcstop="$withval",rcstop="00")
-
-INITDIR=""
-INITDDIR=""
-RCLEVELS="$rclevels"
-RCSTART="$rcstart"
-RCSTOP="$rcstop"

 if test x$rcdir = x; then
 	case "$uname" in
-		AIX*)
-			INITDIR="/etc/rc.d"
+		FreeBSD* | OpenBSD* | MirBsD* | ekkoBSD*)
+			# FreeBSD and OpenBSD
+			INITDIR=""
+			INITDDIR=""
+			;;
+
+		NetBSD*)
+			# NetBSD
+			INITDIR=""
+			INITDDIR="/etc/rc.d"
 			;;

 		Darwin*)
 			# Darwin and MacOS X...
+			INITDIR=""
 			if test -x /sbin/launchd; then
 				INITDDIR="/System/Library/LaunchDaemons"
 			else 
@@ -148,75 +148,48 @@ if test x$rcdir = x; then
 			fi
 			;;

-		FreeBSD* | OpenBSD* | MirBsD* | ekkoBSD*)
-			# FreeBSD and OpenBSD
-			;;
-
-		HP-UX*)
-			INITDIR="/sbin"
-			RCLEVELS="2"
-			RCSTART="620"
-			RCSTOP="380"
-			;;
-
-		IRIX*)
-			# IRIX
-			INITDIR="/etc"
-			RCSTART="60"
-			RCSTOP="25"
-			;;
-
 		Linux | GNU)
 			# Linux/HURD seems to choose an init.d directory at random...
 			if test -d /sbin/init.d; then
 				# SuSE
 				INITDIR="/sbin/init.d"
+				INITDDIR=".."
 			else
 				if test -d /etc/init.d; then
 					# Others
 					INITDIR="/etc"
+					INITDDIR="../init.d"
 				else
 					# RedHat
 					INITDIR="/etc/rc.d"
+					INITDDIR="../init.d"
 				fi
 			fi
-			RCSTART="81"
-			RCSTOP="36"
 			;;

-		NetBSD*)
-			# NetBSD
-			INITDDIR="/etc/rc.d"
-			;;
-
-		OSF1*)
+		OSF1* | HP-UX*)
 			INITDIR="/sbin"
+			INITDDIR="../init.d"
 			;;

-		SunOS*)
-			# Solaris
-			INITDIR="/etc"
-			RCSTART="81"
+		AIX*)
+			INITDIR="/etc/rc.d"
+			INITDDIR=".."
 			;;

 		*)
 			INITDIR="/etc"
+			INITDDIR="../init.d"
 			;;

 	esac
 else
-	if test "x$rclevels" = x; then
-		INITDDIR="$rcdir"
-	else
-		INITDIR="$rcdir"
-	fi
+	INITDIR=""
+	INITDDIR="$rcdir"
 fi

 AC_SUBST(INITDIR)
 AC_SUBST(INITDDIR)
-AC_SUBST(RCLEVELS)
-AC_SUBST(RCSTART)
-AC_SUBST(RCSTOP)

 dnl Xinetd support...
 XINETD=""
@@ -343,5 +316,5 @@ AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
 AC_SUBST(CUPS_STATEDIR)

 dnl
-dnl End of "$Id: cups-directories.m4 6333 2007-03-12 20:49:13Z mike $".
+dnl End of "$Id: cups-directories.m4 5905 2006-08-29 20:48:59Z mike $".
 dnl
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-largefile.m4 6333 2007-03-12 20:49:13Z mike $"
+dnl "$Id: cups-largefile.m4 4732 2005-09-30 23:23:25Z mike $"
 dnl
 dnl   Large file support stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -30,11 +30,11 @@ LARGEFILE=""
 if test x$enable_largefile != xno; then
 	LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"

-	if test x$ac_cv_sys_large_files = x1; then
+	if test $ac_cv_sys_large_files = 1; then
 		LARGEFILE="$LARGEFILE -D_LARGE_FILES"
 	fi

-	if test x$ac_cv_sys_file_offset_bits = x64; then
+	if test $ac_cv_sys_file_offset_bits = 64; then
 		LARGEFILE="$LARGEFILE -D_FILE_OFFSET_BITS=64"
 	fi
 fi
@@ -57,5 +57,5 @@ fi
 AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL))

 dnl
-dnl End of "$Id: cups-largefile.m4 6333 2007-03-12 20:49:13Z mike $".
+dnl End of "$Id: cups-largefile.m4 4732 2005-09-30 23:23:25Z mike $".
 dnl
@@ -68,10 +68,10 @@ extern "C" {
 * Constants...
 */

-#  define CUPS_VERSION		1.0209
+#  define CUPS_VERSION		1.0208
 #  define CUPS_VERSION_MAJOR	1
 #  define CUPS_VERSION_MINOR	2
-#  define CUPS_VERSION_PATCH	9
+#  define CUPS_VERSION_PATCH	8
 #  define CUPS_DATE_ANY		-1


@@ -508,7 +508,7 @@ cupsFileGetConf(cups_file_t *fp,	/* I  - CUPS file */
  */

  *value = NULL;
-
+  
  while (cupsFileGets(fp, buf, buflen))
  {
    (*linenum) ++;
@@ -519,24 +519,15 @@ cupsFileGetConf(cups_file_t *fp,	/* I  - CUPS file */

    if ((ptr = strchr(buf, '#')) != NULL)
    {
-      if (ptr > buf && ptr[-1] == '\\')
+      while (ptr > buf)
      {
-        // Unquote the #...
-	_cups_strcpy(ptr - 1, ptr);
-      }
-      else
-      {
-        // Strip the comment and any trailing whitespace...
-	while (ptr > buf)
-	{
-	  if (!isspace(ptr[-1] & 255))
-	    break;
+	if (!isspace(ptr[-1] & 255))
+	  break;

-	  ptr --;
-	}
-
-	*ptr = '\0';
+        ptr --;
      }
+
+      *ptr = '\0';
    }

   /*
@@ -3,7 +3,7 @@
 *
 *   Option routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2007 by Easy Software Products.
+ *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -578,7 +578,7 @@ cupsParseOptions(


 /*
- * 'cupsRemoveOption()' - Remove an option from an option array.
+ * 'cupsRemoveOptions()' - Remove an option from an option array.
 *
 * @since CUPS 1.2@
 */
@@ -622,7 +622,7 @@ cupsRemoveOption(
      free(option->value);

    if (i > 0)
-      memmove(option, option + 1, i * sizeof(cups_option_t));
+      memmove(option, option + 1, i * sizeof(cups_option_t *));
  }

 /*
@@ -6,7 +6,7 @@
 %%DocumentSuppliedResources: procset testprint/1.2
 %%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman
 %%Creator: Michael Sweet, Easy Software Products
-%%CreationDate: D:20070220113000+0500
+%%CreationDate: D:20060114093000+0500
 %%Title: Test Page
 %%EndComments
 %%BeginProlog
@@ -14,7 +14,7 @@
 %
 %   PostScript test page for the Common UNIX Printing System ("CUPS").
 %
-%   Copyright 1993-2007 Easy Software Products
+%   Copyright 1993-2006 Easy Software Products
 %
 %   These coded instructions, statements, and computer programs are the
 %   property of Easy Software Products and are protected by Federal
@@ -198,8 +198,7 @@ gsave
  /CENTIMETER 72 2.54 div def
  /MILLIMETER 72 25.4 div def

-  /Times-Roman findfont			% Font for ruler numbers
-  11 scalefont setfont			% 11 points
+  smallFont setfont			% Font

  gsave					% Left side inches
    pageLeft 72 mul 0 translate		% Offset left edge
@@ -632,6 +631,6 @@ gsave
 grestore
 showpage
 %
-% End of "$Id: testprint.ps 6296 2007-02-20 16:33:25Z mike $".
+% End of "$Id: testprint.ps 4930 2006-01-14 16:54:03Z mike $".
 %
 %%EOF
@@ -38,16 +38,16 @@ encryption settings for the client.</P>
 <PRE CLASS="command">
 ServerName foo.bar.com
 ServerName 11.22.33.44
-ServerName foo.bar.com:8631
 </PRE>

 <H3>Description</H3>

-<P>The <CODE>ServerName</CODE> directive specifies sets the remote server that is to be used for all client operations. That is, it redirects all client requests to the remote server.</P>
+<P>The <CODE>ServerName</CODE> directive specifies sets the
+remote server that is to be used for all client operations.  That
+is, it redirects all client requests to the remote server.</P>

-<P>The default port number is 631 but can be overridden by adding a colon followed by the desired port number to the value.</P>
-
-<P>The default is to use the local server ("<VAR>localhost</VAR>") or domain socket, if so configured.</P>
+<P>The default is to use the local server
+("<VAR>localhost</VAR>") or domain socket, if so configured.</P>

 </BODY>
 </HTML>
@@ -937,18 +937,11 @@ copy_dsc(cups_file_t  *fp,		/* I - File to read from */
        ppdEmitJCL(ppd, stdout, doc->job_id, doc->user, doc->title);

 	puts("%!PS-Adobe-3.0");
-
-	number = 0;
-      }
-
-     /*
-      * Copy the prolog as needed...
-      */
-
-      if (!number)
-      {
+	
        pageinfo = (pstops_page_t *)cupsArrayFirst(doc->pages);
 	copy_bytes(doc->temp, 0, pageinfo->offset);
+
+	number = 0;
      }

     /*
@@ -3,7 +3,7 @@
 *
 *   Text to PostScript filter for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1993-2007 by Easy Software Products.
+ *   Copyright 1993-2005 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -812,7 +812,7 @@ WriteProlog(const char *title,		/* I - Title of job */

    puts("% Reencode base fonts");

-    for (i = PrettyPrint ? 2 : 1; i >= 0; i --)
+    for (i = 1 + PrettyPrint; i >= 0; i --)
      for (j = 0; j < NumFonts; j ++)
      {
 	printf("/%s findfont\n", Fonts[j][i]);
@@ -831,7 +831,7 @@ WriteProlog(const char *title,		/* I - Title of job */

    puts("% Create composite fonts...");

-    for (i = PrettyPrint ? 2 : 1; i >= 0; i --)
+    for (i = 1 + PrettyPrint; i >= 0; i --)
    {
      puts("8 dict begin");
      puts("/FontType 0 def/FontMatrix[1.0 0 0 1.0 0 0]def/FMapType 2 def/Encoding[");
@@ -4,7 +4,7 @@
 #
 #   Startup/shutdown script for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+#   Copyright 1997-2005 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
 #   property of Easy Software Products and are protected by Federal
@@ -135,20 +135,6 @@ fi
 unset TMPDIR


-#
-# Make sure we have the standard program directories in the path
-# since some operating systems (this means YOU HP-UX!) don't
-# provide a standard path on boot-up...
-#
-
-if "x$PATH" = x; then
-	PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-else
-	PATH="/bin:/usr/bin:/sbin:/usr/sbin:$PATH"
-fi
-
-export PATH
-
 #
 # See if the CUPS server (cupsd) is running...
 #
@@ -215,16 +201,6 @@ case $1 in
 		fi
 		;;

-	start_msg)
-		# HP-UX non-standard...
-		echo "Starting CUPS Server"
-		;;
-
-	stop_msg)
-		# HP-UX non-standard...
-		echo "Starting CUPS Server"
-		;;
-
 	*)
 		echo "Usage: cups {reload|restart|start|status|stop}"
 		exit 1
@@ -4,7 +4,7 @@
 \margl1440\margr1440\vieww9000\viewh8400\viewkind0
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural

-\f0\fs24 \cf0 This program will install CUPS @CUPS_VERSION@, replacing the CUPS 1.1.x software that is included with MacOS X. This version of CUPS is known to have issues with the System Preferences "Sharing" page - use the CUPS web interface (http://localhost:631) to control printer sharing and other print server functionality instead.\
+\f0\fs24 \cf0 This program will install CUPS @CUPS_VERSION@, replacing the CUPS 1.1.x software that is included with MacOS X.\
 \

 \f1\b WARNING\
@@ -635,7 +635,7 @@ EOF
 %subpackage

 %system !darwin
-i 0755 root sys cups init/cups.sh start(@RCSTART@) stop(@RCSTOP) runlevels(@RCLEVELS@)
+i 0755 root sys cups init/cups.sh
 %subpackage lpd
 %if XINETD
 f 0644 root sys $XINETD/cups-lpd init/cups-lpd
@@ -279,16 +279,9 @@ main(int  argc,				// I - Number of command-line args

  globalParams = new GlobalParams(buffer);

-  if (fit || globalParams->getPSPaperWidth() > 0)
-  {
-    // Only set paper size and area if we are fitting to the job's
-    // page size or the pdftops.conf file does not contain
-    // "psPaperSize match"...
-    globalParams->setPSPaperWidth(width);
-    globalParams->setPSPaperHeight(length);
-    globalParams->setPSImageableArea(left, bottom, right, top);
-  }
-
+  globalParams->setPSPaperWidth(width);
+  globalParams->setPSPaperHeight(length);
+  globalParams->setPSImageableArea(left, bottom, right, top);
  globalParams->setPSDuplex(duplex);
  globalParams->setPSExpandSmaller(fit);
  globalParams->setPSShrinkLarger(fit);
@@ -3,7 +3,7 @@
 *
 *   Printer class routines for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -366,21 +366,7 @@ cupsdLoadAllClasses(void)
      {
        cupsdLogMessage(CUPSD_LOG_DEBUG, "Loading class %s...", value);

-       /*
-        * Since prior classes may have implicitly defined this class,
-	* see if it already exists...
-	*/
-
-        if ((p = cupsdFindDest(value)) != NULL)
-	{
-	  p->type = CUPS_PRINTER_CLASS;
-	  cupsdSetStringf(&p->uri, "ipp://%s:%d/classes/%s", ServerName,
-	                  LocalPort, value);
-	  cupsdSetString(&p->error_policy, "retry-job");
-	}
-	else
-          p = cupsdAddClass(value);
-
+        p = cupsdAddClass(value);
 	p->accepting = 1;
 	p->state     = IPP_PRINTER_IDLE;

@@ -717,7 +703,6 @@ cupsdSaveAllClasses(void)
  time_t		curtime;	/* Current time */
  struct tm		*curdate;	/* Current date */
  cups_option_t		*option;	/* Current option */
-  const char		*ptr;		/* Pointer into info/location */


 /*
@@ -792,40 +777,10 @@ cupsdSaveAllClasses(void)
      cupsFilePrintf(fp, "<Class %s>\n", pclass->name);

    if (pclass->info)
-    {
-      if ((ptr = strchr(pclass->info, '#')) != NULL)
-      {
-       /*
-        * Need to quote the first # in the info string...
-	*/
-
-        cupsFilePuts(fp, "Info ");
-	cupsFileWrite(fp, pclass->info, ptr - pclass->info);
-	cupsFilePutChar(fp, '\\');
-	cupsFilePuts(fp, ptr);
-	cupsFilePutChar(fp, '\n');
-      }
-      else
-        cupsFilePrintf(fp, "Info %s\n", pclass->info);
-    }
+      cupsFilePrintf(fp, "Info %s\n", pclass->info);

    if (pclass->location)
-    {
-      if ((ptr = strchr(pclass->info, '#')) != NULL)
-      {
-       /*
-        * Need to quote the first # in the location string...
-	*/
-
-        cupsFilePuts(fp, "Location ");
-	cupsFileWrite(fp, pclass->location, ptr - pclass->location);
-	cupsFilePutChar(fp, '\\');
-	cupsFilePuts(fp, ptr);
-	cupsFilePutChar(fp, '\n');
-      }
-      else
-        cupsFilePrintf(fp, "Location %s\n", pclass->location);
-    }
+      cupsFilePrintf(fp, "Location %s\n", pclass->location);

    if (pclass->state == IPP_PRINTER_STOPPED)
    {
@@ -3472,7 +3472,7 @@ make_certificate(cupsd_client_t *con)	/* I - Client connection */
  int		pid,			/* Process ID of command */
 		status;			/* Status of command */
  char		command[1024],		/* Command */
-		*argv[12],		/* Command-line arguments */
+		*argv[11],		/* Command-line arguments */
 		*envp[MAX_ENV + 1],	/* Environment variables */
 		home[1024],		/* HOME environment variable */
 		infofile[1024],		/* Type-in information for cert */
@@ -96,8 +96,7 @@ static int	get_printer(http_t *http, const char *name, char *dest,
 		            int destsize, cups_option_t **options,
 			    int *accepting, int *shared, ipp_pstate_t *state);
 static int	print_file(http_t *http, int id, const char *filename,
-		           const char *docname, const char *user,
-			   const char *format, int last);
+		           const char *docname, const char *user, int last);
 static int	recv_print_job(const char *name, int num_defaults,
 		               cups_option_t *defaults);
 static int	remove_jobs(const char *name, const char *agent,
@@ -825,7 +824,6 @@ print_file(http_t     *http,		/* I - HTTP connection */
 	   const char *filename,	/* I - File to print */
           const char *docname,		/* I - document-name */
 	   const char *user,		/* I - requesting-user-name */
-	   const char *format,		/* I - document-format */
 	   int        last)		/* I - 1 = last file in job */
 {
  ipp_t		*request;		/* IPP request */
@@ -848,10 +846,6 @@ print_file(http_t     *http,		/* I - HTTP connection */
    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
        	 "document-name", NULL, docname);

-  if (format)
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
-                 "document-format", NULL, format);
-
  if (last)
    ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", 1);

@@ -1284,8 +1278,6 @@ recv_print_job(
        	docnumber ++;

        	if (print_file(http, id, temp[i], docname, user,
-		               cupsGetOption("document-format", num_options,
-			                     options),
 	                       docnumber == doccount))
                  status = 1;
 		else
@@ -2396,9 +2396,6 @@ process_implicit_classes(void)
        cupsdSetString(&pclass->location, p->location);
        cupsdSetString(&pclass->info, p->info);

-        cupsdSetString(&pclass->job_sheets[0], p->job_sheets[0]);
-        cupsdSetString(&pclass->job_sheets[1], p->job_sheets[1]);
-
        update = 1;

        cupsdLogMessage(CUPSD_LOG_DEBUG, "Added implicit class \"%s\"...",
@@ -5466,6 +5466,9 @@ get_jobs(cupsd_client_t  *con,		/* I - Client connection */
    if ((job->dtype & dmask) != dtype &&
        (!job->printer || (job->printer->type & dmask) != dtype))
      continue;
+    if (username[0] && strcasecmp(username, job->username))
+      continue;
+
    if (completed && job->state_value <= IPP_JOB_STOPPED)
      continue;

@@ -5477,9 +5480,6 @@ get_jobs(cupsd_client_t  *con,		/* I - Client connection */
    if (!job->attrs)
      continue;

-    if (username[0] && strcasecmp(username, job->username))
-      continue;
-
    if (count > 0)
      ippAddSeparator(con->response);

@@ -414,10 +414,9 @@ static int				/* O  - 1 if log file open */
 check_log_file(cups_file_t **lf,	/* IO - Log file */
 	       const char  *logname)	/* I  - Log filename */
 {
-  char		backname[1024],		/* Backup log filename */
-		filename[1024],		/* Formatted log filename */
-		*ptr;			/* Pointer into filename */
-  const char	*logptr;		/* Pointer into log filename */
+  char	backname[1024],			/* Backup log filename */
+	filename[1024],			/* Formatted log filename */
+	*ptr;				/* Pointer into filename */


 /*
@@ -449,17 +448,17 @@ check_log_file(cups_file_t **lf,	/* IO - Log file */
    else
      filename[0] = '\0';

-    for (logptr = logname, ptr = filename + strlen(filename);
-         *logptr && ptr < (filename + sizeof(filename) - 1);
-	 logptr ++)
-      if (*logptr == '%')
+    for (ptr = filename + strlen(filename);
+         *logname && ptr < (filename + sizeof(filename) - 1);
+	 logname ++)
+      if (*logname == '%')
      {
       /*
        * Format spec...
 	*/

-        logptr ++;
-	if (*logptr == 's')
+        logname ++;
+	if (*logname == 's')
 	{
 	 /*
 	  * Insert the server name...
@@ -474,11 +473,11 @@ check_log_file(cups_file_t **lf,	/* IO - Log file */
 	  * Otherwise just insert the character...
 	  */

-	  *ptr++ = *logptr;
+	  *ptr++ = *logname;
 	}
      }
      else
-	*ptr++ = *logptr;
+	*ptr++ = *logname;

    *ptr = '\0';
  }
@@ -1286,7 +1286,6 @@ cupsdSaveAllPrinters(void)
  time_t		curtime;	/* Current time */
  struct tm		*curdate;	/* Current date */
  cups_option_t		*option;	/* Current option */
-  const char		*ptr;		/* Pointer into info/location */


 /*
@@ -1361,40 +1360,11 @@ cupsdSaveAllPrinters(void)
      cupsFilePrintf(fp, "<Printer %s>\n", printer->name);

    if (printer->info)
-    {
-      if ((ptr = strchr(printer->info, '#')) != NULL)
-      {
-       /*
-        * Need to quote the first # in the info string...
-	*/
-
-        cupsFilePuts(fp, "Info ");
-	cupsFileWrite(fp, printer->info, ptr - printer->info);
-	cupsFilePutChar(fp, '\\');
-	cupsFilePuts(fp, ptr);
-	cupsFilePutChar(fp, '\n');
-      }
-      else
-        cupsFilePrintf(fp, "Info %s\n", printer->info);
-    }
+      cupsFilePrintf(fp, "Info %s\n", printer->info);

    if (printer->location)
-    {
-      if ((ptr = strchr(printer->info, '#')) != NULL)
-      {
-       /*
-        * Need to quote the first # in the location string...
-	*/
+      cupsFilePrintf(fp, "Location %s\n", printer->location);

-        cupsFilePuts(fp, "Location ");
-	cupsFileWrite(fp, printer->location, ptr - printer->location);
-	cupsFilePutChar(fp, '\\');
-	cupsFilePuts(fp, ptr);
-	cupsFilePutChar(fp, '\n');
-      }
-      else
-        cupsFilePrintf(fp, "Location %s\n", printer->location);
-    }
    if (printer->device_uri)
      cupsFilePrintf(fp, "DeviceURI %s\n", printer->device_uri);

@@ -184,11 +184,6 @@ main(int  argc,				/* I - Number of command-line arguments */
    status = status_long(cupslpd_stdin[1], cupslpd_stdout[0], dest, opargs);
  else if (!strcmp(op, "status-short"))
    status = status_short(cupslpd_stdin[1], cupslpd_stdout[0], dest, opargs);
-  else
-  {
-    printf("Unknown operation \"%s\"!\n", op);
-    status = 1;
-  }

 /*
  * Kill the test program...
@@ -301,8 +296,8 @@ print_job(int  outfd,			/* I - Command file descriptor */
           "Hlocalhost\n"
           "P%s\n"
           "J%s\n"
-           "ldfA%03dlocalhost\n"
-           "UdfA%03dlocalhost\n"
+           "ldfA%03.3dlocalhost\n"
+           "UdfA%03.3dlocalhost\n"
           "N%s\n",
 	   cupsUser(), jobname, sequence, sequence, jobname);

@@ -312,7 +307,7 @@ print_job(int  outfd,			/* I - Command file descriptor */

  bytes = strlen(control);

-  snprintf(command, sizeof(command), "\002%d cfA%03dlocalhost\n",
+  snprintf(command, sizeof(command), "\002%d cfA%03.3dlocalhost\n",
           bytes, sequence);

  if ((status = do_command(outfd, infd, command)) != 0)
@@ -349,7 +344,7 @@ print_job(int  outfd,			/* I - Command file descriptor */
  * Send the data file...
  */

-  snprintf(command, sizeof(command), "\003%d dfA%03dlocalhost\n",
+  snprintf(command, sizeof(command), "\003%d dfA%03.3dlocalhost\n",
           (int)fileinfo.st_size, sequence);

  if ((status = do_command(outfd, infd, command)) != 0)
@@ -3,7 +3,7 @@
 *
 *   PPD test program for the Common UNIX Printing System (CUPS).
 *
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Easy Software Products and are protected by Federal
@@ -30,7 +30,6 @@
 *   main()           - Main entry for test program.
 *   show_conflicts() - Show option conflicts in a PPD file.
 *   usage()          - Show program usage...
- *   valid_utf8()     - Check whether a string contains valid UTF-8 text.
 */

 /*
@@ -78,7 +77,7 @@ enum
 void	check_basics(const char *filename);
 void	show_conflicts(ppd_file_t *ppd);
 void	usage(void);
-int	valid_utf8(const char *s);
+

 /*
 * 'main()' - Main entry for test program.
@@ -1069,7 +1068,7 @@ main(int  argc,			/* I - Number of command-line arguments */
 	       option = ppdNextOption(ppd))
 	  {
 	    snprintf(keyword, sizeof(keyword), "%s.Translation", langstart);
-	    if ((attr = ppdFindAttr(ppd, keyword, option->keyword)) == NULL)
+	    if (!ppdFindAttr(ppd, keyword, option->keyword))
 	    {
 	      if (verbose >= 0)
 	      {
@@ -1084,21 +1083,6 @@ main(int  argc,			/* I - Number of command-line arguments */

 	      errors ++;
 	    }
-	    else if (!valid_utf8(attr->text))
-	    {
-	      if (verbose >= 0)
-	      {
-		if (!errors && !verbose)
-		  _cupsLangPuts(stdout, _(" FAIL\n"));
-
-		_cupsLangPrintf(stdout,
-	                	_("      **FAIL**  Bad UTF-8 \"%s\" translation "
-				  "string for option %s!\n"),
-				langstart, option->keyword);
-              }
-
-	      errors ++;
-	    }

            for (ptr = option->text; *ptr; ptr ++)
 	      if (*ptr & 128)
@@ -1132,7 +1116,7 @@ main(int  argc,			/* I - Number of command-line arguments */
 		snprintf(ckeyword, sizeof(ckeyword), "%s.Custom%s",
 		         langstart, option->keyword);

-		if ((attr = ppdFindAttr(ppd, ckeyword, "True")) == NULL)
+		if (!ppdFindAttr(ppd, ckeyword, "True"))
 		{
 		  if (verbose >= 0)
 		  {
@@ -1149,23 +1133,6 @@ main(int  argc,			/* I - Number of command-line arguments */

 		  errors ++;
 		}
-		else if (!valid_utf8(attr->text))
-	        {
-	          if (verbose >= 0)
-	          {
-		    if (!errors && !verbose)
-		      _cupsLangPuts(stdout, _(" FAIL\n"));
-
-		    _cupsLangPrintf(stdout,
-	                	    _("      **FAIL**  Bad UTF-8 \"%s\" "
-				      "translation string for option %s, "
-				      "choice %s!\n"),
-				    langstart, ckeyword + 1 + strlen(langstart),
-				    "True");
-        	  }
-
-		  errors ++;
-		}

                if (strcasecmp(option->keyword, "PageSize"))
 		{
@@ -1175,7 +1142,7 @@ main(int  argc,			/* I - Number of command-line arguments */
 		  {
 		    snprintf(ckeyword, sizeof(ckeyword), "%s.ParamCustom%s",
 		             langstart, option->keyword);
-		    if ((attr = ppdFindAttr(ppd, ckeyword, cparam->name)) == NULL)
+		    if (!ppdFindAttr(ppd, ckeyword, cparam->name))
 		    {
 		      if (verbose >= 0)
 		      {
@@ -1191,30 +1158,12 @@ main(int  argc,			/* I - Number of command-line arguments */
 				        cparam->name);
        	      }

-		      errors ++;
-		    }
-		    else if (!valid_utf8(attr->text))
-		    {
-		      if (verbose >= 0)
-		      {
-			if (!errors && !verbose)
-			  _cupsLangPuts(stdout, _(" FAIL\n"));
-
-			_cupsLangPrintf(stdout,
-	                		_("      **FAIL**  Bad UTF-8 \"%s\" "
-					  "translation string for option %s, "
-					  "choice %s!\n"),
-					langstart,
-					ckeyword + 1 + strlen(langstart),
-				        cparam->name);
-        	      }
-
 		      errors ++;
 		    }
                  }
                }
 	      }
-	      else if ((attr = ppdFindAttr(ppd, keyword, option->choices[j].choice)) == NULL)
+	      else if (!ppdFindAttr(ppd, keyword, option->choices[j].choice))
 	      {
 		if (verbose >= 0)
 		{
@@ -1231,23 +1180,6 @@ main(int  argc,			/* I - Number of command-line arguments */

 		errors ++;
 	      }
-	      else if (!valid_utf8(attr->text))
-	      {
-		if (verbose >= 0)
-		{
-		  if (!errors && !verbose)
-		    _cupsLangPuts(stdout, _(" FAIL\n"));
-
-		  _cupsLangPrintf(stdout,
-	                	  _("      **FAIL**  Bad UTF-8 \"%s\" "
-				    "translation string for option %s, "
-				    "choice %s!\n"),
-				  langstart, option->keyword,
-				  option->choices[j].choice);
-        	}
-
-		errors ++;
-	      }

              for (ptr = option->choices[j].text; *ptr; ptr ++)
 		if (*ptr & 128)
@@ -1486,7 +1418,8 @@ main(int  argc,			/* I - Number of command-line arguments */
      if (verbose > 0)
      {
        if (errors)
-          _cupsLangPrintf(stdout, _("    %d ERRORS FOUND\n"), errors);
+          _cupsLangPrintf(stdout, _("    %d ERROR%s FOUND\n"),
+			  errors, errors == 1 ? "" : "S");
 	else
 	  _cupsLangPuts(stdout, _("    NO ERRORS FOUND\n"));
      }
@@ -1856,82 +1789,6 @@ usage(void)
 }


-/*
- * 'valid_utf8()' - Check whether a string contains valid UTF-8 text.
- */
-
-int					/* O - 1 if valid, 0 if not */
-valid_utf8(const char *s)		/* I - String to check */
-{
-  while (*s)
-  {
-    if (*s & 0x80)
-    {
-     /*
-      * Check for valid UTF-8 sequence...
-      */
-
-      if ((*s & 0xc0) == 0x80)
-        return (0);			/* Illegal suffix byte */
-      else if ((*s & 0xe0) == 0xc0)
-      {
-       /*
-        * 2-byte sequence...
-        */
-
-        s ++;
-
-        if ((*s & 0xc0) != 0x80)
-          return (0);			/* Missing suffix byte */
-      }
-      else if ((*s & 0xf0) == 0xe0)
-      {
-       /*
-        * 3-byte sequence...
-        */
-
-        s ++;
-
-        if ((*s & 0xc0) != 0x80)
-          return (0);			/* Missing suffix byte */
-
-        s ++;
-
-        if ((*s & 0xc0) != 0x80)
-          return (0);			/* Missing suffix byte */
-      }
-      else if ((*s & 0xf8) == 0xf0)
-      {
-       /*
-        * 4-byte sequence...
-        */
-
-        s ++;
-
-        if ((*s & 0xc0) != 0x80)
-          return (0);			/* Missing suffix byte */
-
-        s ++;
-
-        if ((*s & 0xc0) != 0x80)
-          return (0);			/* Missing suffix byte */
-
-        s ++;
-
-        if ((*s & 0xc0) != 0x80)
-          return (0);			/* Missing suffix byte */
-      }
-      else
-        return (0);			/* Bad sequence */
-    }
-
-    s ++;
-  }
-
-  return (1);
-}
-
-
 /*
 * End of "$Id$".
 */
@@ -31,3 +31,36 @@
 </TABLE>

 </FORM>
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+
+<H2 CLASS="title">Ajouter une classe</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Nom :</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Lieu :</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Description :</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Membres :</TH>
+<TD>
+<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
+{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-add-class.gif" ALT="Ajouter une classe"></TD>
+</TR>
+</TABLE>
+
+</FORM>
@@ -1,23 +1,50 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{device_uri?<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">:}

 <H2 CLASS="title">Ajouter une nouvelle imprimante</H2>

 <TABLE>
 <TR>
 <TH CLASS="label">Nom :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127" VALUE="{?template_name}"><BR>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
 <SMALL>( Peut comporter tout caractère imprimable, "/", "#", et espace exceptés )</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Lieu :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_LOCATION}"><BR>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
 <SMALL>( Lieu compréhensible pour un utilisateur, comme "Labo 1" )</SMALL></TD>
 </TR>
 <TR>
 <TH CLASS="label">Description :</TH>
-<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127" VALUE="{?PRINTER_INFO}"><BR>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>( Description compréhensible pour un utilisateur, comme "HP LaserJet recto/verso" )</SMALL></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
+</TR>
+</TABLE>
+
+</FORM>
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+
+<H2 CLASS="title">Ajouter une nouvelle imprimante</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Nom :</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_NAME" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>( Peut comporter tout caractère imprimable, "/", "#", et espace exceptés )</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Lieu :</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>( Lieu compréhensible pour un utilisateur, comme "Labo 1" )</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Description :</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" SIZE="40" MAXLENGTH="127"><BR>
 <SMALL>( Description compréhensible pour un utilisateur, comme "HP LaserJet recto/verso" )</SMALL></TD>
 </TR>
 <TR>
@@ -1,5 +1,5 @@
 <TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Tâches d'administration">
-<TR><TD VALIGN="TOP">
+<TR><TD VALIGN="TOP" NOWRAP>

 <H2 CLASS="title">Imprimantes</H2>

@@ -36,7 +36,90 @@ ALT="Administrer les classes" CLASS="button"></A>
 tâches" CLASS="button"></A>
 </P>

-</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
+</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">
+
+<H2 CLASS="title">Serveur</H2>
+
+<P>
+<A HREF="/admin?op=config-server"><IMG
+SRC="/images/button-edit-configuration-file.gif" ALT="Éditer le fichier de
+configuration" CLASS="button"></A>
+<A HREF="/admin/log/access_log" TARGET="_blank"><IMG
+SRC="/images/button-view-access-log.gif" ALT="Liste des accès"
+CLASS="button"></A>
+<A HREF="/admin/log/error_log" TARGET="_blank"><IMG
+SRC="/images/button-view-error-log.gif" ALT="Liste des erreurs"
+CLASS="button"></A>
+<A HREF="/admin/log/page_log" TARGET="_blank"><IMG
+SRC="/images/button-view-page-log.gif" ALT="Liste des pages"
+CLASS="button"></A>
+</P>
+
+{SETTINGS_ERROR?<P>{SETTINGS_MESSAGE}</P>
+<BLOCKQUOTE>{SETTINGS_ERROR}</BLOCKQUOTE>:
+
+<FORM METHOD="POST" ACTION="/admin">
+
+<P><B>Paramètres de base du serveur :</B></P>
+
+<P><INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_PRINTERS" {?remote_printers}> Afficher les
+imprimantes partagées par d'autres systèmes<BR>
+<INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Partager les
+imprimantes publiques connectées à ce système<BR>
+<INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Autoriser
+l'administration à distance<BR>
+<INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Autoriser les
+utilisateurs à annuler n'importe quelle tâche ( pas seulement les leurs )<BR>
+<INPUT TYPE="CHECKBOX" NAME="DEBUG_LOGGING" {?debug_logging}> Enregistrer les
+informations de <I>debug</I> pour la résolution de problèmes</P>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-change-settings.gif" ALT="Modifier
+les paramètres"></P>
+
+</FORM>}
+
+</TD></TR>
+</TABLE>
+<TABLE CELLPADDING="0" CELLSPACING="0" WIDTH="100%" SUMMARY="Tâches d'administration">
+<TR><TD VALIGN="TOP" NOWRAP>
+
+<H2 CLASS="title">Imprimantes</H2>
+
+<P>
+<A HREF="/admin?op=add-printer"><IMG
+SRC="/images/button-add-printer.gif" ALT="Ajouter une imprimante" CLASS="button"></A>
+<A HREF="/printers/"><IMG SRC="/images/button-manage-printers.gif"
+ALT="Administrer les imprimantes" CLASS="button"></A>
+{have_samba?<A HREF="/admin/?op=export-samba"><IMG
+SRC="/images/button-export-samba.gif" ALT="Exporter les imprimantes vers SAMBA"
+CLASS="button"></A>:}
+</P>
+
+{#device_uri=0?:<P><B>Nouvelles imprimantes détectées:</B></P><UL>{[device_uri]
+<LI><A HREF="/admin?op=add-printer&amp;{device_options}"><IMG
+SRC="/images/button-add-this-printer.gif" ALT="Ajouter cette imprimante" CLASS="button"
+ALIGN="MIDDLE"></A>
+{device_make_and_model} ({device_info})</LI>
+}</UL>}
+
+<H2 CLASS="title">Classes</H2>
+
+<P>
+<A HREF="/admin?op=add-class"><IMG SRC="/images/button-add-class.gif"
+ALT="Ajouter une classe" CLASS="button"></A>
+<A HREF="/classes/"><IMG SRC="/images/button-manage-classes.gif"
+ALT="Administrer les classes" CLASS="button"></A>
+</P>
+
+<H2 CLASS="title">Tâches d'impression</H2>
+
+<P>
+<A HREF="/jobs/"><IMG SRC="/images/button-manage-jobs.gif" ALT="Administrer les
+tâches" CLASS="button"></A>
+</P>
+
+</TD><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TD VALIGN="TOP">

 <H2 CLASS="title">Serveur</H2>

@@ -67,7 +150,6 @@ CLASS="button"></A>
 imprimantes partagées par d'autres systèmes<BR>
 <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Partager les
 imprimantes publiques connectées à ce système<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Allow printing from the Internet<BR>
 <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Autoriser
 l'administration à distance<BR>
 <INPUT TYPE="CHECKBOX" NAME="USER_CANCEL_ANY" {?user_cancel_any}> Autoriser les
@@ -24,3 +24,29 @@
 </TABLE>

 </FORM>
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
+<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
+
+<H2 CLASS="title">Matériel pour {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Matériel :</TH>
+<TD>
+<SELECT NAME="DEVICE_URI">
+{[device_uri]<OPTION VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" {?current_device_uri={device_uri}?SELECTED:{current_device_scheme={device_uri}?SELECTED:}}>
+{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</OPTION>
+}</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
+</TR>
+</TABLE>
+
+</FORM>
@@ -40,3 +40,45 @@ TYPE="FILE" NAME="PPD_FILE"></TD>
 </TABLE>

 </FORM>
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
+<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
+
+<H2 CLASS="title">Marque/Fabricant pour {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Marque :</TH>
+<TD>
+<SELECT NAME="PPD_MAKE" SIZE="10">
+{[ppd_make]<OPTION VALUE="{ppd_make}" {?current_make={ppd_make}?SELECTED:}>{ppd_make}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR>
+<TH CLASS="label">Ou donnez un fichier PPD :</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Ajouter une imprimante:Modifier l'imprimante}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
@@ -32,3 +32,37 @@ TYPE="FILE" NAME="PPD_FILE"></TD>
 </TABLE>

 </FORM>
+<FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
+<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
+<INPUT TYPE="HIDDEN" NAME="BAUDRATE" VALUE="{?baudrate}">
+<INPUT TYPE="HIDDEN" NAME="BITS" VALUE="{?bits}">
+<INPUT TYPE="HIDDEN" NAME="PARITY" VALUE="{?parity}">
+<INPUT TYPE="HIDDEN" NAME="FLOW" VALUE="{?flow}">
+
+<H2 CLASS="title">Modèle/Pilote pour {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Modèle:</TH>
+<TD>
+<SELECT NAME="PPD_NAME" SIZE="10">
+{[ppd_name]<OPTION VALUE="{ppd_name}" {?current_make_and_model={ppd_make_and_model}?SELECTED:}>{ppd_make_and_model} ({ppd_natural_language})
+}</SELECT>
+</TD>
+</TR>
+<TR>
+<TH CLASS="label">Ou donnez un fichier PPD :</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="MAX_FILE_SIZE" VALUE="262144"><INPUT
+TYPE="FILE" NAME="PPD_FILE"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-{op}.gif" ALT="{op=add-printer?Ajouter une imprimante:Modifier l'imprimante}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
@@ -45,3 +45,50 @@
 </TABLE>

 </FORM>
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
+<INPUT TYPE="HIDDEN" NAME="DEVICE_URI" VALUE="{device_uri}">
+
+<H2 CLASS="title">Paramètres du port série pour {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Baud/s :</TH>
+<TD><SELECT NAME="BAUDRATE">
+{[baudrates]<OPTION {?baudrate={baudrates}?SELECTED:}>{baudrates}}
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Parité :</TH>
+<TD><SELECT NAME="PARITY">
+<OPTION VALUE="none" {?parity=none?SELECTED:}>Aucune
+<OPTION VALUE="even" {?parity=even?SELECTED:}>Paire
+<OPTION VALUE="odd" {?parity=odd?SELECTED:}>Impaire
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Bits données :</TH>
+<TD><SELECT NAME="BITS">
+<OPTION {?bits=8?SELECTED:}>8
+<OPTION {?bits=7?SELECTED:}>7
+</SELECT></TD>
+</TR>
+<TR>
+<TH CLASS="label">Contrôle de flux :</TH>
+<TD><SELECT NAME="FLOW">
+<OPTION VALUE="none" {?flow=none?SELECTED:}>Auncun
+<OPTION VALUE="soft" {?flow=soft?SELECTED:}>XON/XOFF ( Logiciel )
+<OPTION VALUE="hard" {?flow=hard?SELECTED:}>RTS/CTS ( Matériel )
+<OPTION VALUE="dtrdsr" {?flow=dtrdsr?SELECTED:}>DTR/DSR ( Matériel )
+</SELECT></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
+</TR>
+</TABLE>
+
+</FORM>
@@ -40,3 +40,45 @@ Printers"</A> pour construire l'URI à employer avec votre imprimante.</P>
 </TABLE>

 </FORM>
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_LOCATION" VALUE="{?printer_location}">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_INFO" VALUE="{?printer_info}">
+<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{?current_make_and_model}">
+
+<H2 CLASS="title">URI du matériel pour {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">URI du matériel :</TH>
+<TD><INPUT TYPE="TEXT" SIZE="60" MAXLENGTH="1024" NAME="DEVICE_URI" VALUE="{device_uri}"></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>Exemples :
+<PRE>
+    http://nom_machine:631/ipp/
+    http://nom_machine:631/ipp/port1
+
+    ipp://nom_machine/ipp/
+    ipp://nom_machine/ipp/port1
+
+    lpd://nom_machine/queue
+
+    socket://nom_machine
+    socket://nom_machine:9100
+</PRE>
+
+<P>cf. <A HREF="/help/network.html" TARGET="_blank">"Network
+Printers"</A> pour construire l'URI à employer avec votre imprimante.</P>
+
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
+</TR>
+</TABLE>
+
+</FORM>
@@ -1 +1,2 @@
 <P>La classe <A HREF="/classes/{printer_name}">{printer_name}</A> a bien été ajoutée.
+<P>La classe <A HREF="/classes/{printer_name}">{printer_name}</A> a bien été ajoutée.
@@ -5,3 +5,10 @@
 HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
 SRC="/images/button-delete-class.gif" ALT="Supprimer la classe"
 CLASS="button"></A></P>
+<P><B>Attention :</B> Êtes vous sûr(e) de vouloir supprimer la classe
+{printer_name}?</P>
+
+<P ALIGN="CENTER"><A
+HREF="/admin?op=delete-class&printer_name={printer_name}&confirm=yes"><IMG
+SRC="/images/button-delete-class.gif" ALT="Supprimer la classe"
+CLASS="button"></A></P>
@@ -1 +1,2 @@
 <P>La classe {printer_name} a bien été supprimée.
+<P>La classe {printer_name} a bien été supprimée.
@@ -1 +1,2 @@
 <H3 CLASS="title">Tâches d'impression</H3>
+<H3 CLASS="title">Tâches d'impression</H3>
@@ -1 +1,2 @@
 <P>La classe <A HREF="/classes/{printer_name}">{printer_name}</A> a bien été modifiée.
+<P>La classe <A HREF="/classes/{printer_name}">{printer_name}</A> a bien été modifiée.
@@ -1 +1,2 @@
 <P ALIGN="CENTER">{total=0?Aucune classe:Affichage de {#printer_name} classe{#printer_name=1?:s} sur {total}}.</P>
+<P ALIGN="CENTER">{total=0?Aucune classe:Affichage de {#printer_name} classe{#printer_name=1?:s} sur {total}}.</P>
@@ -52,3 +52,57 @@
 </TR>
 </TABLE>
 }}
+{#printer_name=0?:
+{[printer_name]
+<H2 CLASS="title"><A HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? ( Imprimante par défaut ) :}
+{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
+
+<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
+<TR>
+<TD VALIGN=TOP><A HREF="{printer_uri_supported}">
+<IMG SRC="/images/classes.gif" CLASS="button" ALT=""></A></TD>
+<TD VALIGN=TOP><B>Description :</B> {printer_info}<BR>
+<B>Lieu :</B> {printer_location}<BR>
+<B>État de la classe:</B> {printer_state=3?ne fait rien:{printer_state=4?en cours d'impression:arrêtée}},
+{printer_is_accepting_jobs=0?rejette les tâches:accepte les tâches}, {printer_is_shared=0?cachée:publique}.
+{?member_uris=?:<BR>Membres : {member_uris}}
+
+<P>
+<A HREF="{printer_uri_supported}?op=print-test-page">
+<IMG SRC="/images/button-print-test-page.gif" ALT="Imprimer une page de test" CLASS="button"></A>
+{printer_state=5?
+<A HREF="{admin_uri}?op=start-class&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-start-class.gif" ALT="Démarrer la classe" CLASS="button"></A>
+:
+<A HREF="{admin_uri}?op=stop-class&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-stop-class.gif" ALT="Arrêter la classe" CLASS="button"></A>
+}
+{printer_is_accepting_jobs=0?
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-accept-jobs.gif" ALT="Accepter les tâches" CLASS="button"></A>
+:
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-reject-jobs.gif" ALT="Rejeter les tâches" CLASS="button"></A>
+}
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Annuler toutes les tâches" CLASS="button"></A>
+{printer_is_shared=0?
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1&amp;is_class=Y">
+<IMG SRC="/images/button-publish-printer.gif" ALT="Publier l'imprimante" CLASS="button"></A>
+:
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0&amp;is_class=Y">
+<IMG SRC="/images/button-unpublish-printer.gif" ALT="Cacher l'imprimante" CLASS="button"></A>
+}
+<A HREF="{admin_uri}?op=modify-class&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-modify-class.gif" ALT="Modifier la classe" CLASS="button"></A>
+<A HREF="{admin_uri}?op=delete-class&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-delete-class.gif" ALT="Supprimer la classe" CLASS="button"></A>
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-set-as-default.gif" ALT="Choisir par défaut" CLASS="button"></A>
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}&amp;is_class=Y">
+<IMG SRC="/images/button-set-allowed-users.gif" ALT="Définir les autorisations" CLASS="button"></A>
+</P>
+</TD>
+</TR>
+</TABLE>
+}}
@@ -9,7 +9,6 @@ function reset_config()
 "\\n" +
 "# Groupe des utilisateurs UNIX pour les administrateurs CUPS...\\n" +
 "SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
-"@CUPS_SYSTEM_AUTHKEY@\\n" +
 "\\n" +
 "\\n" +
 "# N'accepter que les connexions de la machine locale.\\n" +
@@ -20,7 +19,98 @@ function reset_config()
 "# Publier les imprimantes partagées sur le réseau local.\\n" +
 "Browsing On\\n" +
 "BrowseOrder allow,deny\\n" +
-"BrowseAllow all\\n" +
+"BrowseAllow @LOCAL\\n" +
+"\\n" +
+"\\n" +
+"# S'authentifier par défaut via les comptes UNIX...\\n" +
+"DefaultAuthType Basic\\n" +
+"\\n" +
+"# Restreindre l'accès au serveur...\\n" +
+"<Location />\\n" +
+"  Order allow,deny\\n" +
+"  Allow localhost\\n" +
+"</Location>\\n" +
+"\\n" +
+"# Restreindre l'accès aux pages d'administration...\\n" +
+"<Location /admin>\\n" +
+"@ENCRYPTION_REQUIRED@\\n" +
+"  Order allow,deny\\n" +
+"  Allow localhost\\n" +
+"</Location>\\n" +
+"\\n" +
+"# Restreindre l'accès au ficher de configuration...\\n" +
+"<Location /admin/conf>\\n" +
+"  AuthType Basic\\n" +
+"  Require user @SYSTEM\\n" +
+"  Order allow,deny\\n" +
+"  Allow localhost\\n" +
+"</Location>\\n" +
+"\\n" +
+"# Définir la politique par défaut des tâches d'impression...\\n" +
+"<Policy default>\\n" +
+"  # Les opérations sur les tâches doivent être faites par leur propriétaire ou un adminstrateur...\\n" +
+"  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>\\n" +
+"    Require user @OWNER @SYSTEM\\n" +
+"    Order deny,allow\\n" +
+"  </Limit>\\n" +
+"\\n" +
+"  # Toutes les opérations d'administration nécessite l'authentification d'un adminstrateur...\\n" +
+"  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>\\n" +
+"    AuthType Basic\\n" +
+"    Require user @SYSTEM\\n" +
+"    Order deny,allow\\n" +
+"  </Limit>\\n" +
+"\\n" +
+"  # Seuls le propriétaire et un administrateur peuvent annuler ou authentifier une tâche...\\n" +
+"  <Limit Cancel-Job CUPS-Authenticate-Job>\\n" +
+"    Require user @OWNER @SYSTEM\\n" +
+"    Order deny,allow\\n" +
+"  </Limit>\\n" +
+"\\n" +
+"  <Limit All>\\n" +
+"    Order deny,allow\\n" +
+"  </Limit>\\n" +
+"</Policy>\\n";
+}
+</SCRIPT>
+
+<H2 CLASS="title">Ficher de configuration du serveur</H2>
+
+<FORM NAME="cups" METHOD="POST" ACTION="/admin/">
+
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
+
+<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>
+
+<P><INPUT TYPE="IMAGE" SRC="/images/button-save-changes.gif"
+ALT="Enregistrer les modifications"> <A
+HREF="javascript:reset_config();"><IMG
+SRC="/images/button-use-default-config.gif" CLASS="button"
+ALT="Utiliser la configuration par défaut"></A></P>
+
+</FORM>
+<SCRIPT TYPE="text/javascript">
+function reset_config()
+{
+  document.cups.CUPSDCONF.value =
+"# Écrire des informations générales dans error_log - changez \\"info\\" en \\"debug\\"\\n" +
+"# pour la résolution de problème...\\n" +
+"LogLevel info\\n" +
+"\\n" +
+"\\n" +
+"# Groupe des utilisateurs UNIX pour les administrateurs CUPS...\\n" +
+"SystemGroup @CUPS_SYSTEM_GROUPS@\\n" +
+"\\n" +
+"\\n" +
+"# N'accepter que les connexions de la machine locale.\\n" +
+"Listen localhost:@DEFAULT_IPP_PORT@\\n" +
+"@CUPS_LISTEN_DOMAINSOCKET@\\n" +
+"\\n" +
+"\\n" +
+"# Publier les imprimantes partagées sur le réseau local.\\n" +
+"Browsing On\\n" +
+"BrowseOrder allow,deny\\n" +
+"BrowseAllow @LOCAL\\n" +
 "\\n" +
 "\\n" +
 "# S'authentifier par défaut via les comptes UNIX...\\n" +
@@ -1,3 +1,6 @@
 <P>Erreur :</P>

 <BLOCKQUOTE>Opération inconnue : "{op}"!</BLOCKQUOTE>
+<P>Erreur :</P>
+
+<BLOCKQUOTE>Opération inconnue : "{op}"!</BLOCKQUOTE>
@@ -1,3 +1,6 @@
 <P>{?message?{message}:Erreur :}</P>

 <BLOCKQUOTE>{error}</BLOCKQUOTE>
+<P>{?message?{message}:Erreur :}</P>
+
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
@@ -61,3 +61,66 @@ BORDER="0" ALT=""></A>
 <TR CLASS="page">
 <TD WIDTH="15">&nbsp;</TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+	<TITLE>{title} - CUPS @CUPS_VERSION@@CUPS_REVISION@</TITLE>
+	<!-- Prevent caching of CGI content -->
+	<META HTTP-EQUIV="Expires" CONTENT="now">
+	<META HTTP-EQUIV="Pragma" CONTENT="no-cache"> 
+	{refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
+	<LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
+	<LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
+</HEAD>
+<BODY>
+<TABLE WIDTH="100%" STYLE="height: 100%;" BORDER="0" CELLSPACING="0" CELLPADDING="0" SUMMARY="{title}">
+<TR CLASS="HEADER">
+<TD VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG SRC="/images/top-left.gif" WIDTH="15" HEIGHT="80" ALT=""></TD>
+<TD VALIGN="TOP" WIDTH="55" ROWSPAN="2"><IMG SRC="/images/top-middle.gif" WIDTH="55" HEIGHT="80" ALT=""></TD>
+<TD WIDTH="100%" HEIGHT="60"><H1>{title}</H1></TD>
+<TD ALIGN="RIGHT" VALIGN="TOP" WIDTH="15" ROWSPAN="2"><IMG
+SRC="/images/top-right.gif" WIDTH="15" HEIGHT="15" ALT=""></TD>
+</TR>
+<TR CLASS="HEADER"><TD WIDTH="100%" VALIGN="BOTTOM" NOWRAP>
+
+<A CLASS="unsel" HREF="/"><IMG SRC="/images/tab-left.gif"
+WIDTH="4" HEIGHT="4" ALIGN="TOP" BORDER="0"
+ALT="">&nbsp;&nbsp;Accueil&nbsp;&nbsp;<IMG
+SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
+BORDER="0" ALT=""></A>
+
+&nbsp;<A CLASS="{SECTION=admin?:un}sel" HREF="/admin"><IMG
+SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
+BORDER="0" ALT="">&nbsp;&nbsp;Administration&nbsp;&nbsp;<IMG
+SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
+BORDER="0" ALT=""></A>
+
+&nbsp;<A CLASS="{SECTION=classes?:un}sel" HREF="/classes/"><IMG
+SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
+BORDER="0" ALT="">&nbsp;&nbsp;Classes&nbsp;&nbsp;<IMG
+SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
+BORDER="0" ALT=""></A>
+
+&nbsp;<A CLASS="{SECTION=help?:un}sel" HREF="/help/"><IMG
+SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
+BORDER="0" ALT="">&nbsp;&nbsp;Documentation/Aide&nbsp;&nbsp;<IMG
+SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
+BORDER="0" ALT=""></A>
+
+&nbsp;<A CLASS="{SECTION=jobs?:un}sel" HREF="/jobs/"><IMG
+SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
+BORDER="0" ALT="">&nbsp;&nbsp;Tâches&nbsp;&nbsp;<IMG
+SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
+BORDER="0" ALT=""></A>
+
+&nbsp;<A CLASS="{SECTION=printers?:un}sel" HREF="/printers/"><IMG
+SRC="/images/tab-left.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
+BORDER="0" ALT="">&nbsp;&nbsp;Imprimantes&nbsp;&nbsp;<IMG
+SRC="/images/tab-right.gif" WIDTH="4" HEIGHT="4" ALIGN="TOP"
+BORDER="0" ALT=""></A>
+
+</TD></TR>
+<TR CLASS="page">
+<TD WIDTH="15">&nbsp;</TD>
+<TD COLSPAN="2" WIDTH="100%" STYLE="height: 100%;" VALIGN="TOP" CLASS="page">
@@ -50,3 +50,55 @@ accès à de nombreuses ressources, comme des forums de discussion pour les
 utilisateurs, des réponses aux questions fréquentes, et un formulaire pour
 soumettre des rapports de <I>bug</I> ou des demandes pour de nouvelles
 fonctionnalités.</P>}
+<FORM ACTION="/help/{?HELPFILE}" METHOD="GET">
+{TOPIC?<INPUT TYPE="HIDDEN" NAME="TOPIC" VALUE="{TOPIC}">:}
+
+<P ALIGN="CENTER"><B>Rechercher dans 
+{HELPTITLE?{HELPTITLE}:{TOPIC?{TOPIC}:Tous les Documents}}:</B> <INPUT
+TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
+TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Search">
+<A HREF="/help/{?HELPFILE}{QUERY?{TOPIC??TOPIC={TOPIC}:}:}"><IMG
+SRC="/images/button-clear.gif" ALT="Clear" CLASS="button"></A></P>
+
+</FORM>
+
+<!-- Bookmarks -->
+<DIV CLASS="sidebar">
+<H3 CLASS="title">Documents d'aide en ligne</H3>
+
+<P CLASS="l0"><A HREF="/help/{QUERY??QUERY={QUERY}:}">Tous les documents</A></P>
+<HR>
+
+{[BMTEXT]<P CLASS="l{BMINDENT}"><A HREF="{BMLINK}">{BMTEXT}</A></P>
+}
+</DIV>
+
+{QUERY?<P>Résultats de la recherche dans {HELPFILE?{HELPTITLE}:{TOPIC?{TOPIC}:Tous les Documents}}\:</P>
+{QTEXT?<UL>
+{[QTEXT]<LI><A HREF="{QLINK}">{QTEXT}</A>{QPTEXT? (in <I><A HREF="{QPLINK}">{QPTEXT}</A></I>):}</LI>}
+{QTEXT?</UL>:}
+:<P>Aucun résultat.</P>}
+<HR NOSHADE>:}
+{HELPTITLE?<H1>{HELPTITLE}
+<A HREF="/help/{HELPFILE}?PRINTABLE=YES" TARGET="_blank"><IMG
+SRC="/images/button-view-printable-version.gif" ALT="Version imprimable"
+CLASS="button"></A></H1>:<H1>Pages d'aide de CUPS</H1>
+
+<P>Voici l'interface d'aide en ligne de CUPS. Entrez ci-dessus les mots à rechercher
+ou cliquez sur un lien ci-contre pour afficher l'ade en ligne du document.</P>
+
+<P><SMALL><B>NDT:</B> Cette interface n'a pas été traduite en Français. Si vous souhaitez vous
+atteler à cette tâche, merci d'aller au préalable sur le forum <A
+HREF="http://www.cups.org/newsgroups.php?gcups.development">cups.development</A>
+pour en informer les développeurs.</SMALL></P>
+
+<P>Si vous êtes un nouvel utilisateur de CUPS, lisez la page "<a
+href="overview.html">Overview of CUPS</a>". Il est conseillé aux utilisateurs
+habitués de lire la page "<a href="whatsnew.html">What's New in CUPS
+1.2</a>".</P>
+
+<P>La <A HREF="http://www.cups.org/">page d'accueil de CUPS</A> donne aussi
+accès à de nombreuses ressources, comme des forums de discussion pour les
+utilisateurs, des réponses aux questions fréquentes, et un formulaire pour
+soumettre des rapports de <I>bug</I> ou des demandes pour de nouvelles
+fonctionnalités.</P>}
@@ -9,3 +9,14 @@
 <BODY>

 <H1>{HELPTITLE}</H1>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
+	<TITLE>{HELPTITLE}</TITLE>
+	<LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups-printable.css">
+	<LINK REL="SHORTCUT ICON" HREF="/favicon.ico" TYPE="image/x-icon">
+</HEAD>
+<BODY>
+
+<H1>{HELPTITLE}</H1>
@@ -1 +1,2 @@
 <P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> a été annulée.
+<P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> a été annulée.
@@ -1 +1,2 @@
 <P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> est retenue en attente.
+<P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> est retenue en attente.
@@ -20,3 +20,25 @@
 </TABLE>

 </FORM>
+<FORM METHOD="POST" ACTION="/{SECTION}/{job_id?:{printer_name}}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{job_id?<INPUT TYPE="HIDDEN" NAME="JOB_ID" VALUE="{job_id}">:}
+
+<H2 CLASS="title">{job_id?Transférer la tâche n°{job_id}:Transférer toutes les tâches}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Nouvelle destination :</TH>
+<TD>
+<SELECT NAME="JOB_PRINTER_URI" SIZE="10">
+{[job_printer_uri]<OPTION VALUE="{job_printer_uri}">{job_printer_name}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-move-job{job_id?:s}.gif" ALT="Transférer {job_id?la tâche:les tâches}"></TD>
+</TR>
+</TABLE>
+
+</FORM>
@@ -1,2 +1,4 @@
 <P>{job_id?<A HREF="/jobs/{job_id}">La tâche n°{job_id}</A>:Toutes les tâches}
 ont été transférées vers <A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>
+<P>{job_id?<A HREF="/jobs/{job_id}">La tâche n°{job_id}</A>:Toutes les tâches}
+ont été transférées vers <A HREF="{job_printer_uri}">{job_printer_name}</A>.</P>
@@ -1 +1,2 @@
 <P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> a été libérée pour l'impression.
+<P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> a été libérée pour l'impression.
@@ -1 +1,2 @@
 <P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> a été redémarrée.
+<P><A HREF="{job_printer_uri}">La tâche n°{job_id}</A> a été redémarrée.
@@ -14,3 +14,19 @@ SRC="/images/button-show-all.gif" CLASS="button" ALT="Montrer toutes les tâches

 <P ALIGN="CENTER">{total=0?Aucune tâche:Affichage de {#job_id}
 tâche{#job_id=1?:s} {?which_jobs=?en cours:{which_jobs=all?:terminée{#job_id=1?:s}}} sur {total}}.</P>
+<P>{?which_jobs=?<A
+HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
+SRC="/images/button-show-completed.gif" CLASS="button" ALT="Montrer les tâches terminées"></A>
+<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
+SRC="/images/button-show-all.gif" CLASS="button" ALT="Montrer toutes les tâches">:{which_jobs=all?<A
+HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=completed"><IMG
+SRC="/images/button-show-completed.gif" CLASS="button" ALT="Montrer les tâches terminées"></A>
+<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
+SRC="/images/button-show-active.gif" CLASS="button" ALT="Montrer les tâches en cours">:<A
+HREF="{?printer_name=?/jobs:{printer_uri_supported}}"><IMG
+SRC="/images/button-show-active.gif" CLASS="button" ALT="Montrer les tâches en cours"></A>
+<A HREF="{?printer_name=?/jobs:{printer_uri_supported}}?which_jobs=all"><IMG
+SRC="/images/button-show-all.gif" CLASS="button" ALT="Montrer toutes les tâches">}}</A></P>
+
+<P ALIGN="CENTER">{total=0?Aucune tâche:Affichage de {#job_id}
+tâche{#job_id=1?:s} {?which_jobs=?en cours:{which_jobs=all?:terminée{#job_id=1?:s}}} sur {total}}.</P>
@@ -40,3 +40,45 @@ SRC="/images/button-move-job.gif" ALT="Transférer la tâche" CLASS="button"></A
 }
 </TABLE>
 }
+{#job_id=0?:
+<TABLE CELLPADDING="0" CELLSPACING="0" CLASS="button" WIDTH="100%" SUMMARY="Liste de tâches">
+<TR CLASS="data">
+<TH>N°&nbsp;</TH>
+<TH>Nom&nbsp;</TH>
+<TH>Utilisateur&nbsp;</TH>
+<TH>Taille&nbsp;</TH>
+<TH>Pages&nbsp;</TH>
+<TH>État&nbsp;</TH>
+<TH>Contrôle&nbsp;</TH>
+</TR>
+
+{[job_id]
+<TR CLASS="data" VALIGN="TOP">
+<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
+<TD>{?job_name=?Inconnue:{job_name}}&nbsp;</TD>
+<TD>{job_originating_user_name}&nbsp;</TD>
+<TD>{job_k_octets}ko&nbsp;</TD>
+<TD>{job_media_sheets_completed=0?Inconnue:{?job_media_sheets_completed}}</TD>
+<TD>{job_state=3?en attente depuis le<BR>{time_at_creation}:{job_state=4?retenue depuis le<BR>{time_at_creation}:
+{job_state=5?en cours depuis le<BR>{time_at_processing}:{job_state=6?arrêtée:
+{job_state=7?annulée le<BR>{time_at_completed}:{job_state=8?abandonnée:terminée le<BR>{time_at_completed}}}}}}}&nbsp;</TD>
+<TD>
+{job_preserved>0?
+<A HREF="/jobs/?op=restart-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
+<IMG SRC="/images/button-restart-job.gif" ALT="Redémarrer la tâche" CLASS="button"></A>:}
+{job_state=4?
+<A HREF="/jobs/?op=release-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
+<IMG SRC="/images/button-release-job.gif" ALT="Libérer la tâche" CLASS="button"></A>:}
+{job_state=3?
+<A HREF="/jobs/?op=hold-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
+<IMG SRC="/images/button-hold-job.gif" ALT="Retenir la tâche" CLASS="button"></A>:}
+{job_state<7?
+<A HREF="/jobs/?op=cancel-job&amp;job_id={job_id}&amp;job_printer_uri={job_printer_uri}">
+<IMG SRC="/images/button-cancel-job.gif" ALT="Annuler la tâche" CLASS="button"></A>
+<A HREF="/jobs/?op=move-job&amp;job_id={job_id}"><IMG
+SRC="/images/button-move-job.gif" ALT="Transférer la tâche" CLASS="button"></A>:}
+&nbsp;</TD>
+</TR>
+}
+</TABLE>
+}
@@ -1,2 +1,4 @@
 <P>Les commandes de maintenance ont été envoyées ; l'identifiant de tâche est <A
 HREF="/printers/{printer_name}"> {printer_name}-{job_id}</A>.</P>
+<P>Les commandes de maintenance ont été envoyées ; l'identifiant de tâche est <A
+HREF="/printers/{printer_name}"> {printer_name}-{job_id}</A>.</P>
@@ -32,3 +32,37 @@
 </TABLE>

 </FORM>
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+
+<H2 CLASS="title">Modifier la classe {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Nom :</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+{printer_name}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Lieu :</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Description :</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"></TD>
+</TR>
+<TR>
+<TH CLASS="label">Membres :</TH>
+<TD>
+<SELECT NAME="MEMBER_URIS" SIZE="10" MULTIPLE>
+{[member_uris]<OPTION VALUE="{member_uris}" {?member_selected}>{member_names}}
+</SELECT>
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-modify-class.gif" ALT="Modifier la classe"></TD>
+</TR>
+</TABLE>
+
+</FORM>
@@ -27,3 +27,32 @@
 </TABLE>

 </FORM>
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+{?device_uri=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_DEVICE_URI" VALUE="{device_uri}">}
+{?printer_make_and_model=?:<INPUT TYPE="HIDDEN" NAME="CURRENT_MAKE_AND_MODEL" VALUE="{printer_make_and_model}">}
+
+<H2 CLASS="title">Modifier l'imprimante {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Nom :</TH>
+<TD><INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">{printer_name}</TD>
+</TR>
+<TR>
+<TH CLASS="label">Lieu :</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_LOCATION" VALUE="{?printer_location}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>( Lieu compréhensible pour un utilisateur, comme "Labo 1" )</SMALL></TD>
+</TR>
+<TR>
+<TH CLASS="label">Description :</TH>
+<TD><INPUT TYPE="TEXT" NAME="PRINTER_INFO" VALUE="{?printer_info}" SIZE="40" MAXLENGTH="127"><BR>
+<SMALL>( Description compréhensible pour un utilisateur, comme "HP LaserJet recto/verso" )</SMALL></TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-continue.gif" ALT="Poursuivre"></TD>
+</TR>
+</TABLE>
+
+</FORM>
@@ -1 +1,2 @@
 <p>Le serveur n'a pas été redémarré parce que la configuration n'a pas été modifiée...</p>
+<p>Le serveur n'a pas été redémarré parce que la configuration n'a pas été modifiée...</p>
@@ -5,3 +5,10 @@ NAME="{keyword}">{keytext}</A> :</TH>
 {[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
 </TD>
 </TR>
+<TR>
+<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A
+NAME="{keyword}">{keytext}</A> :</TH>
+<TD>
+{[choices]<INPUT TYPE="RADIO" NAME="{keyword}" {choices={defchoice}?CHECKED:} VALUE="{choices}">{text}}
+</TD>
+</TR>
@@ -5,3 +5,10 @@
 }</UL>

 <P>Veuillez modifier une ou plusieurs des ces options pour résoudre les conflits.</P>
+<P><B>Erreur :</B> Les options suivantes sont incompatibles entre elles :</P>
+
+<UL>
+{[ckeyword]<LI><A HREF="#{ckeyword}">{ckeytext}</A></LI>
+}</UL>
+
+<P>Veuillez modifier une ou plusieurs des ces options pour résoudre les conflits.</P>
@@ -1,3 +1,6 @@
 <H2 CLASS="title">{printer_name} : {group}</H2>

 <TABLE>
+<H2 CLASS="title">{printer_name} : {group}</H2>
+
+<TABLE>
@@ -5,3 +5,10 @@ NAME="{keyword}">{keytext}</A> :</TH>
 {[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>
+<TR>
+<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A
+NAME="{keyword}">{keytext}</A> :</TH>
+<TD><SELECT NAME="{keyword}" MULTIPLE SIZE="10">
+{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+</SELECT></TD>
+</TR>
@@ -5,3 +5,10 @@ NAME="{keyword}">{keytext}</A> :</TH>
 {[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
 </SELECT></TD>
 </TR>
+<TR>
+<TH CLASS="label"{conflicted=1? CLASS="conflict":}><A
+NAME="{keyword}">{keytext}</A> :</TH>
+<TD><SELECT NAME="{keyword}">
+{[choices]<OPTION {choices={defchoice}?SELECTED:} VALUE="{choices}">{text}}
+</SELECT></TD>
+</TR>
@@ -4,3 +4,9 @@
 ALT="Définir les options de l'imprimante"></TD>
 </TR>
 </TABLE>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-set-printer-options.gif"
+ALT="Définir les options de l'imprimante"></TD>
+</TR>
+</TABLE>
@@ -9,3 +9,14 @@
        SRC="/images/button-show-next.gif" ALT="Montrer les suivantes" CLASS="button"></A>:&nbsp;}</TD>
 </TR>
 </TABLE>
+<TABLE WIDTH="100%" CLASS="pager" SUMMARY="Mise en page">
+<TR>
+	<TD WIDTH="33%">{PREVURL?<A HREF="{PREVURL}"><IMG
+        SRC="/images/button-show-previous.gif" ALT="Montrer les précédentes" CLASS="button"></A>:&nbsp;}</TD>
+	<TD WIDTH="34%" ALIGN="CENTER">{ORDER=dec?<A
+        HREF="{THISURL}&amp;ORDER=asc"><IMG
+        SRC="/images/button-sort-ascending.gif" ALT="Par ordre croissant" CLASS="button"></A>:<A HREF="{THISURL}&amp;ORDER=dec"><IMG SRC="/images/button-sort-descending.gif" ALT="Par ordre décroissant" CLASS="button"></A>}</TD>
+	<TD WIDTH="33%" ALIGN="RIGHT">{NEXTURL?<A HREF="{NEXTURL}"><IMG
+        SRC="/images/button-show-next.gif" ALT="Montrer les suivantes" CLASS="button"></A>:&nbsp;}</TD>
+</TR>
+</TABLE>
@@ -1,3 +1,6 @@
 <P>{is_class?Class:Printer} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 accepte désormais les tâches d'impression.</P>
+<P>{is_class?Class:Printer} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+accepte désormais les tâches d'impression.</P>
@@ -1 +1,2 @@
 <P>L'imprimante <A HREF="/printers/{printer_name}">{printer_name}</A> a bien été ajoutée.
+<P>L'imprimante <A HREF="/printers/{printer_name}">{printer_name}</A> a bien été ajoutée.
@@ -1 +1,2 @@
 <P>L'imprimante <A HREF="/printers/{printer_name}">{printer_name}</A> a bien été configurée.
+<P>L'imprimante <A HREF="/printers/{printer_name}">{printer_name}</A> a bien été configurée.
@@ -5,3 +5,10 @@
 HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
 SRC="/images/button-delete-printer.gif" ALT="Supprimer l'imprimante"
 CLASS="button"></A></P>
+<P><B>Attention :</B> Êtes-vous sûr(e) de vouloir supprimer l'imprimante
+{printer_name} ?</P>
+
+<P ALIGN="CENTER"><A
+HREF="/admin?op=delete-printer&printer_name={printer_name}&confirm=yes"><IMG
+SRC="/images/button-delete-printer.gif" ALT="Supprimer l'imprimante"
+CLASS="button"></A></P>
@@ -5,3 +5,10 @@ a été définie comme imprimante par défaut sur le serveur.</P>
 <BLOCKQUOTE><B>NB:</B> Pour un utilisateur qui a défini un paramètre par défaut
 via la commande <TT>lpoptions</TT>, le paramètre du serveur sera
 ignoré.</BLOCKQUOTE>
+<P>{is_class?La classe:L'imprimante} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+a été définie comme imprimante par défaut sur le serveur.</P>
+
+<BLOCKQUOTE><B>NB:</B> Pour un utilisateur qui a défini un paramètre par défaut
+via la commande <TT>lpoptions</TT>, le paramètre du serveur sera
+ignoré.</BLOCKQUOTE>
@@ -1 +1,2 @@
 <P>L'imprimante {printer_name} a bien été supprimée.
+<P>L'imprimante {printer_name} a bien été supprimée.
@@ -1 +1,2 @@
 <H3 CLASS="title">Tâches d'impression</H3>
+<H3 CLASS="title">Tâches d'impression</H3>
@@ -1 +1,2 @@
 <P>L'imprimante <A HREF="/printers/{printer_name}">{printer_name}</A> a bien été modifiée.
+<P>L'imprimante <A HREF="/printers/{printer_name}">{printer_name}</A> a bien été modifiée.
@@ -1,3 +1,6 @@
 <P>{is_class?La classe:L'imprimante} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 a été nettoyée de toute tâche... d'impression !</P>
+<P>{is_class?La classe:L'imprimante} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+a été nettoyée de toute tâche... d'impression !</P>
@@ -1,3 +1,6 @@
 <P>{is_class?La classe:L'imprimante} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 n'accepte plus les tâches d'impression.</P>
+<P>{is_class?La classe:L'imprimante} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+n'accepte plus les tâches d'impression.</P>
@@ -1,3 +1,6 @@
 <P>{is_class?La classe:L'imprimante} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 a été démarrée.</P>
+<P>{is_class?La classe:L'imprimante} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+a été démarrée.</P>
@@ -1,3 +1,6 @@
 <P>{is_class?La classe:L'imprimante} <A
 HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
 a été arrêtée.</P>
+<P>{is_class?La classe:L'imprimante} <A
+HREF="/{is_class?classes:printers}/{printer_name}">{printer_name}</A>
+a été arrêtée.</P>
@@ -1 +1,2 @@
 <P ALIGN="CENTER">{total=0?Aucune imprimante:Affichage de {#printer_name} imprimante{#printer_name=1?:s}} sur {total}.</P>
+<P ALIGN="CENTER">{total=0?Aucune imprimante:Affichage de {#printer_name} imprimante{#printer_name=1?:s}} sur {total}.</P>
@@ -64,3 +64,69 @@ imprimante par défaut ) :}
 </TR>
 </TABLE>
 }}
+{printer_type?:}{#printer_name=0?:
+{[printer_name]
+<H2 CLASS="title"><A
+HREF="{printer_uri_supported}">{printer_name}</A>{default_name={printer_name}? (
+imprimante par défaut ) :}
+{?printer_state_message=?:<SPAN CLASS="message">"{printer_state_message}"</SPAN>}</H2>
+
+<TABLE WIDTH="100%" CLASS="button" CELLSPACING="0" CELLPADDING="0" SUMMARY="{printer_name}">
+<TR>
+<TD VALIGN="TOP"><A HREF="{printer_uri_supported}">
+<IMG SRC="/images/printer-{printer_state=3?idle:{printer_state=4?processing:stopped}}.gif" CLASS="button" ALT=""></A>
+</TD>
+<TD VALIGN="TOP"><B>Description :</B> {printer_info}<BR>
+<B>Lieu :</B> {printer_location}<BR>
+<B>Marque et modèle :</B> {printer_make_and_model}<BR>
+<B>État de l'imprimante :</B> {printer_state=3?ne fait rien:{printer_state=4?en cours d'impression:arrêtée}},
+{printer_is_accepting_jobs=0?rejette les tâches:accepte les tâches}, {printer_is_shared=0?cachée:publique}.
+{?device_uri=?:<BR><B>URI du matériel :</B> {device_uri}}
+
+<P>
+<A HREF="{printer_uri_supported}?op=print-test-page">
+<IMG SRC="/images/button-print-test-page.gif" ALT="Imprimer la page de test CUPS" CLASS="button"></A>
+{?cupscommand=1?<A HREF="{printer_uri_supported}?op=clean-print-heads">
+<IMG SRC="/images/button-clean-print-heads.gif" ALT="Nettoyer les têtes d'impression" CLASS="button"></A>
+<A HREF="{printer_uri_supported}?op=print-self-test-page">
+<IMG SRC="/images/button-print-self-test-page.gif" ALT="Imprimer la page de test de l'imprimante" CLASS="button"></A>:}
+{printer_state=5?
+<A HREF="{admin_uri}?op=start-printer&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-start-printer.gif" ALT="Démarrer l'imprimante" CLASS="button"></A>
+:
+<A HREF="{admin_uri}?op=stop-printer&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-stop-printer.gif" ALT="Arrêter l'imprimante" CLASS="button"></A>
+}
+{printer_is_accepting_jobs=0?
+<A HREF="{admin_uri}?op=accept-jobs&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-accept-jobs.gif" ALT="Accepter les tâches" CLASS="button"></A>
+:
+<A HREF="{admin_uri}?op=reject-jobs&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-reject-jobs.gif" ALT="Rejeter les tâches" CLASS="button"></A>
+}
+<A HREF="{printer_uri_supported}?op=move-jobs&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-move-jobs.gif" ALT="Transférer toutes les tâches" CLASS="button"></A>
+<A HREF="{admin_uri}?op=purge-jobs&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-cancel-all-jobs.gif" ALT="Annuler toutes les tâches" CLASS="button"></A>
+{printer_is_shared=0?
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=1">
+<IMG SRC="/images/button-publish-printer.gif" ALT="Publier l'imprimante" CLASS="button"></A>
+:
+<A HREF="{admin_uri}?op=set-sharing&amp;printer_name={%printer_name}&amp;shared=0">
+<IMG SRC="/images/button-unpublish-printer.gif" ALT="Cacher l'imprimante" CLASS="button"></A>
+}
+<A HREF="{admin_uri}?op=modify-printer&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-modify-printer.gif" ALT="Modifier l'imprimante" CLASS="button"></A>
+<A HREF="{admin_uri}?op=set-printer-options&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-set-printer-options.gif" ALT="Définir les options de l'imprimante" CLASS="button"></A>
+<A HREF="{admin_uri}?op=delete-printer&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-delete-printer.gif" ALT="Supprimer l'imprimante" CLASS="button"></A>
+<A HREF="{admin_uri}?op=set-as-default&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-set-as-default.gif" ALT="Définir par défaut" CLASS="button"></A>
+<A HREF="{admin_uri}?op=set-allowed-users&amp;printer_name={%printer_name}">
+<IMG SRC="/images/button-set-allowed-users.gif" ALT="Définir les autorisations" CLASS="button"></A>
+</P>
+</TD>
+</TR>
+</TABLE>
+}}
@@ -1 +1,2 @@
 <p>Attendez s'il vous plaît, que le serveur redémarre...</p>
+<p>Attendez s'il vous plaît, que le serveur redémarre...</p>
@@ -51,3 +51,56 @@ ALT="Exporter les imprimantes vers SAMBA"></TD>
 </TABLE>

 </FORM>
+<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="OP" VALUE="export-samba">
+
+<H2 CLASS="title">Exporter des imprimantes vers SAMBA</H2>
+
+{error?<P>Impossible d'exporter les imprimantes vers SAMBA \:</P>
+<BLOCKQUOTE>{error}</BLOCKQUOTE>
+<P>Regardez 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éder via l'icône <VAR>Voisinage réseau</VAR> ou
+<VAR>Favoris réseau</VAR> du bureau. Vous devez au préalable installer les
+pilotes Windows d'imprimante PostScript : cf. la page <i>man</i> <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"{export_all? CHECKED:}
+onChange="select_printers()"> Exporter toutes les imprimantes
+</TD>
+</TR>
+<TR>
+<TH CLASS="label">Utilisateur SAMBA :</TH>
+<TD><INPUT TYPE="TEXT" NAME="USERNAME" VALUE="{?USERNAME}"> ( indispensable )</TD>
+</TR>
+<TR>
+<TH CLASS="label">Mot-de-passe SAMBA :</TH>
+<TD><INPUT TYPE="PASSWORD" NAME="PASSWORD" VALUE=""> ( indispensable )</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD><INPUT TYPE="IMAGE" SRC="/images/button-export-samba.gif"
+ALT="Exporter les imprimantes vers SAMBA"></TD>
+</TR>
+</TABLE>
+
+</FORM>
@@ -1 +1,2 @@
 <P>Les imprimantes ont bien été exportées vers SAMBA.</P>
+<P>Les imprimantes ont bien été exportées vers SAMBA.</P>
@@ -11,3 +11,16 @@ HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;O
 SRC="/images/button-clear.gif" ALT="Nettoyer" CLASS="button"></A></P>

 </FORM>
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
+{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
+{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
+
+<P ALIGN="CENTER"><B>Rechercher dans 
+{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?les classes:{SECTION=jobs?les tâches:les imprimantes}}} :</B>
+<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
+TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Rechercher">
+<A
+HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&amp;ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
+SRC="/images/button-clear.gif" ALT="Nettoyer" CLASS="button"></A></P>
+
+</FORM>
@@ -1,3 +1,6 @@
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
+<FORM METHOD="POST" ACTION="/admin">
+<INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
+<INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
@@ -1 +1,2 @@
 </FORM>
+</FORM>
@@ -1,2 +1,4 @@
 <P>La page de test a été envoyée ; l'identifiant de la tâche est <A HREF="/{SECTION}/{printer_name}">
 {printer_name}-{job_id}</A>.</P>
+<P>La page de test a été envoyée ; l'identifiant de la tâche est <A HREF="/{SECTION}/{printer_name}">
+{printer_name}-{job_id}</A>.</P>
@@ -19,3 +19,24 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 </TABLE>
 </BODY>
 </HTML>
+</TD>
+<TD WIDTH="15">&nbsp;</TD>
+</TR>
+<TR CLASS="trailer">
+<TD VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-left.gif"
+WIDTH="15" HEIGHT="15" ALT=""></TD>
+<TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
+
+<P><SMALL>Le logiciel CUPS ( Common UNIX Printing System ) et son logo sont
+propriété commerciale de <A HREF="http://www.easysw.com">Easy Software
+Products</A>. CUPS est sous copyright 1997-2006 par Easy Software Products, Tous
+Droits Réservés.</SMALL></P>
+
+</TD>
+
+<TD ALIGN="RIGHT" VALIGN="BOTTOM" WIDTH="15"><IMG SRC="/images/bottom-right.gif"
+WIDTH="15" HEIGHT="15" ALT=""></TD>
+</TR>
+</TABLE>
+</BODY>
+</HTML>
@@ -24,3 +24,29 @@
 </TABLE>

 </FORM>
+<FORM METHOD="POST" ACTION="/admin">
+<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}">:}
+
+<H2 CLASS="title">Utilisateurs autorisés à utiliser {printer_name}</H2>
+
+<TABLE>
+<TR>
+<TH CLASS="label">Utilisateurs :</TH>
+<TD>
+<INPUT TYPE='TEXT' NAME='users' SIZE='60' VALUE='{?requesting_user_name_allowed}{?requesting_user_name_denied}'>
+<BR>
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-allowed' {requesting_user_name_allowed?checked:}>Autoriser ces utilisateurs à imprimer
+<INPUT TYPE='RADIO' NAME='type' VALUE='requesting-user-name-denied' {requesting_user_name_denied?checked:}>Empêcher ces utilisateurs d'imprimer
+</TD>
+</TR>
+<TR>
+<TD></TD>
+<TD>
+<INPUT TYPE="IMAGE" SRC="/images/button-set-allowed-users.gif" ALT="Définir les autorisations">
+</TD>
+</TR>
+</TABLE>
+
+</FORM>