Add more CSRF protections #3498

Closed
michaelrsweet opened this Issue Feb 8, 2010 · 9 comments

Comments

Projects
None yet
1 participant
Collaborator

michaelrsweet commented Feb 8, 2010

Version: 1.4-current
CUPS.org User: mike

Currently CUPS offers limited CSRF protection against things like IFRAME attacks. Adding the use of session cookies (created and managed by the CGI programs) would make it impossible for these attacks to work.

Collaborator

michaelrsweet commented Feb 8, 2010

CUPS.org User: mike

Fixed in CUPS trunk, r8976. Waiting for 1.4.4 to open up.

Collaborator

michaelrsweet commented Mar 30, 2010

CUPS.org User: mike

Fixed in Subversion repository.

Collaborator

michaelrsweet commented Apr 29, 2010

CUPS.org User: mike

Patch for CUPS 1.3.x.

Collaborator

michaelrsweet commented Apr 29, 2010

"str3498.patch":

Index: templates/add-printer.tmpl

--- templates/add-printer.tmpl (revision 8976)
+++ templates/add-printer.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Add Printer

+

Index: templates/printer-confirm.tmpl

--- templates/printer-confirm.tmpl (revision 8976)
+++ templates/printer-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Warning: Are you sure you want to delete printer {printer_name}?

-


+

Index: templates/choose-model.tmpl

--- templates/choose-model.tmpl (revision 8976)
+++ templates/choose-model.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modify {printer_name}:Add Printer}

+ {printer_name?:}

Index: templates/ja/add-printer.tmpl

--- templates/ja/add-printer.tmpl (revision 8976)
+++ templates/ja/add-printer.tmpl (revision 8977)
@@ -3,6 +3,7 @@

���������追�

+

Index: templates/ja/printer-confirm.tmpl

--- templates/ja/printer-confirm.tmpl (revision 8976)
+++ templates/ja/printer-confirm.tmpl (revision 8977)
@@ -4,6 +4,6 @@

警�: �������� {printer_name} �����������

-


+

Index: templates/ja/choose-model.tmpl

--- templates/ja/choose-model.tmpl (revision 8976)
+++ templates/ja/choose-model.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?{printer_name}�追�:������追�}

+ {printer_name?:}

Index: templates/ja/samba-export.tmpl

--- templates/ja/samba-export.tmpl (revision 8976)
+++ templates/ja/samba-export.tmpl (revision 8977)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

������ Samba �������

Index: templates/ja/class.tmpl

--- templates/ja/class.tmpl (revision 8976)
+++ templates/ja/class.tmpl (revision 8977)
@@ -5,6 +5,7 @@
{server_is_sharing_printers=0?�:{printer_is_shared=0?�:}}��{default_name={printer_name}?, ����������:})

+ ������ ��������� @@ -17,6 +18,7 @@ + 管� Index: templates/ja/modify-printer.tmpl --- templates/ja/modify-printer.tmpl (revision 8976) +++ templates/ja/modify-printer.tmpl (revision 8977) @@ -3,6 +3,7 @@ ����� {printer_name} ��� +

Index: templates/ja/choose-device.tmpl

--- templates/ja/choose-device.tmpl (revision 8976)
+++ templates/ja/choose-device.tmpl (revision 8977)
@@ -6,6 +6,7 @@
ALT="Busy Indicator"> ������������...

}

+ {printer_name?:}

Index: templates/ja/admin.tmpl

--- templates/ja/admin.tmpl (revision 8976)
+++ templates/ja/admin.tmpl (revision 8977)
@@ -4,16 +4,16 @@

�����

-

- + + -{have_samba?:} +{have_samba?:}

���

-

+

@@ -28,7 +28,7 @@

����

-

+ @@ -38,6 +38,7 @@
{SETTINGS_ERROR}
: +

{ADVANCEDSETTINGS?

����設�:

@@ -95,7 +96,7 @@

RSS 購読

-

+

@@ -104,6 +105,6 @@ ���������� {[notify_subscription_id] {notify_recipient_name}
- {notify_events} {notify_printer_name?{notify_printer_name}:ã��ã�¹ã�¦ã�®ã�­ã�¥ã�¼}} + {notify_events} {notify_printer_name?{notify_printer_name}:ã��ã�¹ã�¦ã�®ã�­ã�¥ã�¼}} :}

Index: templates/ja/modify-class.tmpl

--- templates/ja/modify-class.tmpl (revision 8976)
+++ templates/ja/modify-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

��� {printer_name} ���

+

Index: templates/ja/choose-make.tmpl

--- templates/ja/choose-make.tmpl (revision 8976)
+++ templates/ja/choose-make.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?{printer_name}���:������追�}

+ {printer_name?:}

Index: templates/ja/list-available-printers.tmpl

--- templates/ja/list-available-printers.tmpl (revision 8976)
+++ templates/ja/list-available-printers.tmpl (revision 8977)
@@ -4,7 +4,7 @@

{#device_uri=0?

��������������


:
    {[device_uri]
    -

  • +

  • {device_make_and_model} ({device_info})

  • }
}

Index: templates/ja/users.tmpl

--- templates/ja/users.tmpl (revision 8976)
+++ templates/ja/users.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {IS_CLASS?:}

Index: templates/ja/job-move.tmpl

--- templates/ja/job-move.tmpl (revision 8976)
+++ templates/ja/job-move.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {job_id?:}

Index: templates/ja/printer.tmpl

--- templates/ja/printer.tmpl (revision 8976)
+++ templates/ja/printer.tmpl (revision 8977)
@@ -6,6 +6,7 @@
{server_is_sharing_printers=0?�:{printer_is_shared=0?�:}}��{default_name={printer_name}?, ����������:})

+ ������ ��������� @@ -20,6 +21,7 @@ + 管� Index: templates/ja/edit-config.tmpl --- templates/ja/edit-config.tmpl (revision 8976) +++ templates/ja/edit-config.tmpl (revision 8977) @@ -10,7 +10,7 @@ 設������設� +

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/ja/set-printer-options-header.tmpl

--- templates/ja/set-printer-options-header.tmpl (revision 8976)
+++ templates/ja/set-printer-options-header.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{printer_name} �������������

+ {HAVE_AUTOCONFIGURE?:}

Index: templates/ja/add-class.tmpl

--- templates/ja/add-class.tmpl (revision 8976)
+++ templates/ja/add-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

����追�

+

Index: templates/ja/jobs.tmpl

--- templates/ja/jobs.tmpl (revision 8976)
+++ templates/ja/jobs.tmpl (revision 8977)
@@ -17,18 +17,18 @@
"{job_printer_state_message}":}

}

Index: templates/ja/choose-serial.tmpl

--- templates/ja/choose-serial.tmpl (revision 8976)
+++ templates/ja/choose-serial.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?{printer_name}���:������追�}

+ {printer_name?:}

Index: templates/ja/class-confirm.tmpl

--- templates/ja/class-confirm.tmpl (revision 8976)
+++ templates/ja/class-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

警�: ������ {printer_name} ������������

-


+

Index: templates/ja/choose-uri.tmpl

--- templates/ja/choose-uri.tmpl (revision 8976)
+++ templates/ja/choose-uri.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?{printer_name}���:������追�}

+ {printer_name?:}

Index: templates/ja/add-rss-subscription.tmpl

--- templates/ja/add-rss-subscription.tmpl (revision 8976)
+++ templates/ja/add-rss-subscription.tmpl (revision 8977)
@@ -1,4 +1,5 @@

+

RSS 購読�追�

Index: templates/samba-export.tmpl

--- templates/samba-export.tmpl (revision 8976)
+++ templates/samba-export.tmpl (revision 8977)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Export Printers to Samba

Index: templates/class.tmpl

--- templates/class.tmpl (revision 8976)
+++ templates/class.tmpl (revision 8977)
@@ -5,6 +5,7 @@
{server_is_sharing_printers=0?Not:{printer_is_shared=0?Not:}} Shared{default_name={printer_name}?, Server Default:})

+ Maintenance Print Test Page @@ -17,6 +18,7 @@ + Administration Index: templates/modify-printer.tmpl --- templates/modify-printer.tmpl (revision 8976) +++ templates/modify-printer.tmpl (revision 8977) @@ -3,6 +3,7 @@ Modify {printer_name} +

Index: templates/ru/add-printer.tmpl

--- templates/ru/add-printer.tmpl (revision 8976)
+++ templates/ru/add-printer.tmpl (revision 8977)
@@ -3,6 +3,7 @@

�обавление п�ин�е�а

+

Index: templates/ru/printer-confirm.tmpl

--- templates/ru/printer-confirm.tmpl (revision 8976)
+++ templates/ru/printer-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

��ед�п�еждение: в� дей��ви�ел�но �о�и�е �дали�� п�ин�е� «{printer_name}»?

-


+

Index: templates/ru/choose-model.tmpl

--- templates/ru/choose-model.tmpl (revision 8976)
+++ templates/ru/choose-model.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?�зменение {printer_name}:�обавление п�ин�е�а}

+ {printer_name?:}

Index: templates/ru/samba-export.tmpl

--- templates/ru/samba-export.tmpl (revision 8976)
+++ templates/ru/samba-export.tmpl (revision 8977)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Эк�по�� п�ин�е�ов в Samba

Index: templates/ru/class.tmpl

--- templates/ru/class.tmpl (revision 8976)
+++ templates/ru/class.tmpl (revision 8977)
@@ -5,6 +5,7 @@
{server_is_sharing_printers=0?не� �овме��ного до���па:{printer_is_shared=0?не� �овме��ного до���па:�аз�е�ен �овме��н�й до���п}})

+ �б�л�живание �е�а�� п�обной ���ани�� @@ -17,6 +18,7 @@ + �дмини���и�ование Index: templates/ru/modify-printer.tmpl --- templates/ru/modify-printer.tmpl (revision 8976) +++ templates/ru/modify-printer.tmpl (revision 8977) @@ -3,6 +3,7 @@ �зменение п�ин�е�а {printer_name} +

Index: templates/ru/choose-device.tmpl

--- templates/ru/choose-device.tmpl (revision 8976)
+++ templates/ru/choose-device.tmpl (revision 8977)
@@ -6,6 +6,7 @@
ALT="Busy Indicator"> �ои�к п�ин�е�ов...

}

+ {printer_name?:}

Index: templates/ru/admin.tmpl

--- templates/ru/admin.tmpl (revision 8976)
+++ templates/ru/admin.tmpl (revision 8977)
@@ -4,16 +4,16 @@

��ин�е��

- - + + -{have_samba?:} +{have_samba?:}

���пп�

- +

@@ -28,7 +28,7 @@

Се�ве�

- + @@ -38,6 +38,7 @@

{SETTINGS_ERROR}
: +

{ADVANCEDSETTINGS?

�а�аме��� �е�ве�а:

@@ -95,7 +96,7 @@

�одпи�ка по RSS

- +

@@ -104,6 +105,6 @@ {[notify_subscription_id] } + }
{job_preserved>0?{job_state>5? - + :}:} {job_state=4? - + :} {job_state=3? - + :} {job_state<7? - + -:} +:}  
�азваниеСоб��и���е�ед�
{notify_recipient_name}
{notify_events} {notify_printer_name?{notify_printer_name}:Ð�Ñ�е оÑ�еÑ�еди}
{notify_events} {notify_printer_name?{notify_printer_name}:Ð�Ñ�е оÑ�еÑ�еди}
:}

Index: templates/ru/modify-class.tmpl

--- templates/ru/modify-class.tmpl (revision 8976)
+++ templates/ru/modify-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

�зменение г��пп� {printer_name}

+

Index: templates/ru/choose-make.tmpl

--- templates/ru/choose-make.tmpl (revision 8976)
+++ templates/ru/choose-make.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?�зменение {printer_name}:�обавление п�ин�е�а}

+ {printer_name?:}

Index: templates/ru/list-available-printers.tmpl

--- templates/ru/list-available-printers.tmpl (revision 8976)
+++ templates/ru/list-available-printers.tmpl (revision 8977)
@@ -4,7 +4,7 @@

{#device_uri=0?

�е обна��жено ни одного п�ин�е�а.


:
    {[device_uri]
    -

  • +

  • {device_make_and_model} ({device_info})

  • }
}

Index: templates/ru/users.tmpl

--- templates/ru/users.tmpl (revision 8976)
+++ templates/ru/users.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {IS_CLASS?:}

Index: templates/ru/job-move.tmpl

--- templates/ru/job-move.tmpl (revision 8976)
+++ templates/ru/job-move.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {job_id?:}

Index: templates/ru/printer.tmpl

--- templates/ru/printer.tmpl (revision 8976)
+++ templates/ru/printer.tmpl (revision 8977)
@@ -6,6 +6,7 @@
{server_is_sharing_printers=0?не� �овме��ного до���па:{printer_is_shared=0?не� �овме��ного до���па:�аз�е�ен �овме��н�й до���п}})

+ �б�л�живание �е�а�� п�обной ���ани�� @@ -20,6 +21,7 @@ + �дмини���и�ование Index: templates/ru/edit-config.tmpl --- templates/ru/edit-config.tmpl (revision 8976) +++ templates/ru/edit-config.tmpl (revision 8977) @@ -10,7 +10,7 @@ Редак�и�ование кон�иг��а�ионного �айла +

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/ru/add-class.tmpl

--- templates/ru/add-class.tmpl (revision 8976)
+++ templates/ru/add-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

�ова� г��ппа

+

Index: templates/ru/set-printer-options-header.tmpl

--- templates/ru/set-printer-options-header.tmpl (revision 8976)
+++ templates/ru/set-printer-options-header.tmpl (revision 8977)
@@ -3,6 +3,7 @@

У��анови�� па�аме��� по �мол�ани� дл� {printer_name}

+ {HAVE_AUTOCONFIGURE?:}

Index: templates/ru/jobs.tmpl

--- templates/ru/jobs.tmpl (revision 8976)
+++ templates/ru/jobs.tmpl (revision 8977)
@@ -17,18 +17,18 @@
"{job_printer_state_message}":}

}

Index: templates/ru/choose-serial.tmpl

--- templates/ru/choose-serial.tmpl (revision 8976)
+++ templates/ru/choose-serial.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?�зменение {printer_name}:�обавление п�ин�е�а}

+ {printer_name?:}

Index: templates/ru/class-confirm.tmpl

--- templates/ru/class-confirm.tmpl (revision 8976)
+++ templates/ru/class-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

��ед�п�еждение: в� дей��ви�ел�но �о�и�е �дали�� г��пп� «{printer_name}»?

-


+

Index: templates/ru/choose-uri.tmpl

--- templates/ru/choose-uri.tmpl (revision 8976)
+++ templates/ru/choose-uri.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?�зменение {printer_name}:�обавление п�ин�е�а}

+ {printer_name?:}

Index: templates/ru/add-rss-subscription.tmpl

--- templates/ru/add-rss-subscription.tmpl (revision 8976)
+++ templates/ru/add-rss-subscription.tmpl (revision 8977)
@@ -1,4 +1,5 @@

+

�обавление подпи�ки по RSS

Index: templates/choose-device.tmpl

--- templates/choose-device.tmpl (revision 8976)
+++ templates/choose-device.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modify {printer_name}:Add Printer}

{CUPS_GET_DEVICES_DONE?
+

{printer_name?:}

Index: templates/admin.tmpl

--- templates/admin.tmpl (revision 8976)
+++ templates/admin.tmpl (revision 8977)
@@ -4,16 +4,16 @@

Printers

- - + + -{have_samba?:} +{have_samba?:}

Classes

- +

@@ -28,7 +28,7 @@

Server

- + @@ -38,6 +38,7 @@

{SETTINGS_ERROR}
: +

{ADVANCEDSETTINGS?

Server Settings:

@@ -95,7 +96,7 @@

RSS Subscriptions

- +

Index: templates/modify-class.tmpl

--- templates/modify-class.tmpl (revision 8976)
+++ templates/modify-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Modify Class {printer_name}

+

Index: templates/choose-make.tmpl

--- templates/choose-make.tmpl (revision 8976)
+++ templates/choose-make.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modify {printer_name}:Add Printer}

+ {printer_name?:}

Index: templates/list-available-printers.tmpl

--- templates/list-available-printers.tmpl (revision 8976)
+++ templates/list-available-printers.tmpl (revision 8977)
@@ -4,7 +4,7 @@

{#device_uri=0?

No printers found.


:
    {[device_uri]
    -

  • +

  • {device_make_and_model} ({device_info})

  • }
}

Index: templates/users.tmpl

--- templates/users.tmpl (revision 8976)
+++ templates/users.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {IS_CLASS?:}

Index: templates/de/add-printer.tmpl

--- templates/de/add-printer.tmpl (revision 8976)
+++ templates/de/add-printer.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Drucker hinzufügen

+

Index: templates/de/printer-confirm.tmpl

--- templates/de/printer-confirm.tmpl (revision 8976)
+++ templates/de/printer-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Warnung: Sind Sie sicher, dass Sie den Drucker {printer_name} löschen wollen?

-


+

Index: templates/de/choose-model.tmpl

--- templates/de/choose-model.tmpl (revision 8976)
+++ templates/de/choose-model.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?{printer_name} ändern:Drucker hinzufügen}

+ {printer_name?:}

Index: templates/de/samba-export.tmpl

--- templates/de/samba-export.tmpl (revision 8976)
+++ templates/de/samba-export.tmpl (revision 8977)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Drucker für Samba freigeben

Index: templates/de/class.tmpl

--- templates/de/class.tmpl (revision 8976)
+++ templates/de/class.tmpl (revision 8977)
@@ -5,6 +5,7 @@
{server_is_sharing_printers=0?Nicht:{printer_is_shared=0?Nicht:}} Freigegeben{default_name={printer_name}?, Standarddrucker:})

+ Wartung Drucke Testseite @@ -17,6 +18,7 @@ + Administration Index: templates/de/modify-printer.tmpl --- templates/de/modify-printer.tmpl (revision 8976) +++ templates/de/modify-printer.tmpl (revision 8977) @@ -3,6 +3,7 @@ {printer_name} ändern +

Index: templates/de/choose-device.tmpl

--- templates/de/choose-device.tmpl (revision 8976)
+++ templates/de/choose-device.tmpl (revision 8977)
@@ -6,6 +6,7 @@
ALT="Busy Indicator"> Suche nach Druckern...

}

+ {printer_name?:}

Index: templates/de/admin.tmpl

--- templates/de/admin.tmpl (revision 8976)
+++ templates/de/admin.tmpl (revision 8977)
@@ -4,16 +4,16 @@

Drucker

- - + + -{have_samba?:} +{have_samba?:}

{job_preserved>0?{job_state>5? - + :}:} {job_state=4? - + :} {job_state=3? - + :} {job_state<7? - + -:} +:}  
Collaborator

michaelrsweet commented Apr 29, 2010

Klassen

-

+

@@ -28,7 +28,7 @@

Server

-

+ @@ -38,6 +38,7 @@
{SETTINGS_ERROR}
: +

{ADVANCEDSETTINGS?

Erweiterte Servereinstellungen:

@@ -95,7 +96,7 @@

RSS Subskriptionen

-

+

@@ -104,6 +105,6 @@ NameEreignisWarteschlange {[notify_subscription_id] {notify_recipient_name}
- {notify_events} {notify_printer_name?{notify_printer_name}:Alle Warteschlangen}} + {notify_events} {notify_printer_name?{notify_printer_name}:Alle Warteschlangen}} :}

Index: templates/de/modify-class.tmpl

--- templates/de/modify-class.tmpl (revision 8976)
+++ templates/de/modify-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Klasse {printer_name} ändern

+

Index: templates/de/choose-make.tmpl

--- templates/de/choose-make.tmpl (revision 8976)
+++ templates/de/choose-make.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?{printer_name} ändern:Drucker hinzufügen}

+ {printer_name?:}

Index: templates/de/list-available-printers.tmpl

--- templates/de/list-available-printers.tmpl (revision 8976)
+++ templates/de/list-available-printers.tmpl (revision 8977)
@@ -4,7 +4,7 @@

{#device_uri=0?

Keine Drucker gefunden.


:
    {[device_uri]
    -

  • +

  • {device_make_and_model} ({device_info})

  • }
}

Index: templates/de/users.tmpl

--- templates/de/users.tmpl (revision 8976)
+++ templates/de/users.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {IS_CLASS?:}

Index: templates/de/job-move.tmpl

--- templates/de/job-move.tmpl (revision 8976)
+++ templates/de/job-move.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {job_id?:}

Index: templates/de/printer.tmpl

--- templates/de/printer.tmpl (revision 8976)
+++ templates/de/printer.tmpl (revision 8977)
@@ -6,6 +6,7 @@
{server_is_sharing_printers=0?Nicht:{printer_is_shared=0?Nicht:}} freigegeben{default_name={printer_name}?, Standarddrucker:})

+ Wartung Testseite drucken @@ -20,6 +21,7 @@ + Administration Index: templates/de/edit-config.tmpl --- templates/de/edit-config.tmpl (revision 8976) +++ templates/de/edit-config.tmpl (revision 8977) @@ -10,7 +10,7 @@ Konfigurationsdatei ändern +

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/de/set-printer-options-header.tmpl

--- templates/de/set-printer-options-header.tmpl (revision 8976)
+++ templates/de/set-printer-options-header.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Standardeinstellungen für {printer_name} festlegen

+ {HAVE_AUTOCONFIGURE?:}

Index: templates/de/add-class.tmpl

--- templates/de/add-class.tmpl (revision 8976)
+++ templates/de/add-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

>Klasse hinzufügen

+

Index: templates/de/jobs.tmpl

--- templates/de/jobs.tmpl (revision 8976)
+++ templates/de/jobs.tmpl (revision 8977)
@@ -17,18 +17,18 @@
"{job_printer_state_message}":}

}

Index: templates/de/choose-serial.tmpl

--- templates/de/choose-serial.tmpl (revision 8976)
+++ templates/de/choose-serial.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?{printer_name} ändern:Drucker hinzufügen}

+ {printer_name?:}

Index: templates/de/class-confirm.tmpl

--- templates/de/class-confirm.tmpl (revision 8976)
+++ templates/de/class-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Warnung: Sind Sie sicher, dass Sie die Klasse {printer_name} löschen wollen?

-


+

Index: templates/de/choose-uri.tmpl

--- templates/de/choose-uri.tmpl (revision 8976)
+++ templates/de/choose-uri.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?{printer_name} ändern:Drucker hinzufügen}

+ {printer_name?:}

Index: templates/de/add-rss-subscription.tmpl

--- templates/de/add-rss-subscription.tmpl (revision 8976)
+++ templates/de/add-rss-subscription.tmpl (revision 8977)
@@ -1,4 +1,5 @@

+

>RSS Subskription hinzufügen

Index: templates/job-move.tmpl

--- templates/job-move.tmpl (revision 8976)
+++ templates/job-move.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {job_id?:}

Index: templates/printer.tmpl

--- templates/printer.tmpl (revision 8976)
+++ templates/printer.tmpl (revision 8977)
@@ -6,6 +6,7 @@
{server_is_sharing_printers=0?Not:{printer_is_shared=0?Not:}} Shared{default_name={printer_name}?, Server Default:})

+ Maintenance Print Test Page @@ -20,6 +21,7 @@ + Administration Index: templates/edit-config.tmpl --- templates/edit-config.tmpl (revision 8976) +++ templates/edit-config.tmpl (revision 8977) @@ -10,7 +10,7 @@ Edit Configuration File +

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/add-class.tmpl

--- templates/add-class.tmpl (revision 8976)
+++ templates/add-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Add Class

+
{job_preserved>0?{job_state>5? - + :}:} {job_state=4? - + :} {job_state=3? - + :} {job_state<7? - + -:} +:}  

Index: templates/set-printer-options-header.tmpl

--- templates/set-printer-options-header.tmpl (revision 8976)
+++ templates/set-printer-options-header.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Set Default Options for {printer_name}

+ {HAVE_AUTOCONFIGURE?:}

Index: templates/jobs.tmpl

--- templates/jobs.tmpl (revision 8976)
+++ templates/jobs.tmpl (revision 8977)
@@ -17,18 +17,17 @@
"{job_printer_state_message}":}

}

Index: templates/choose-serial.tmpl

--- templates/choose-serial.tmpl (revision 8976)
+++ templates/choose-serial.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modify {printer_name}:Add Printer}

+ {printer_name?:}

Index: templates/pl/add-printer.tmpl

--- templates/pl/add-printer.tmpl (revision 8976)
+++ templates/pl/add-printer.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Dodawanie drukarki

+

Index: templates/pl/printer-confirm.tmpl

--- templates/pl/printer-confirm.tmpl (revision 8976)
+++ templates/pl/printer-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Ostrzeżenie: usun�� drukark� {printer_name}?

-


+

Index: templates/pl/choose-model.tmpl

--- templates/pl/choose-model.tmpl (revision 8976)
+++ templates/pl/choose-model.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modyfikowanie {printer_name}:Dodawanie drukarki}

+ {printer_name?:}

Index: templates/pl/samba-export.tmpl

--- templates/pl/samba-export.tmpl (revision 8976)
+++ templates/pl/samba-export.tmpl (revision 8977)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Eksportowanie drukarek do Samby

Index: templates/pl/class.tmpl

--- templates/pl/class.tmpl (revision 8976)
+++ templates/pl/class.tmpl (revision 8977)
@@ -5,6 +5,7 @@
{server_is_sharing_printers=0?Nie:{printer_is_shared=0?Nie:}} Wspó�dzielona{default_name={printer_name}?, Domy�lne serwera:})

+ Konserwacja Drukowanie strony próbnej @@ -17,6 +18,7 @@ + Administracja Index: templates/pl/modify-printer.tmpl --- templates/pl/modify-printer.tmpl (revision 8976) +++ templates/pl/modify-printer.tmpl (revision 8977) @@ -3,6 +3,7 @@ Modyfikowanie {printer_name} +

Index: templates/pl/choose-device.tmpl

--- templates/pl/choose-device.tmpl (revision 8976)
+++ templates/pl/choose-device.tmpl (revision 8977)
@@ -6,6 +6,7 @@
ALT="Busy Indicator"> Wyszukiwanie drukarek...

}

+ {printer_name?:}

Index: templates/pl/admin.tmpl

--- templates/pl/admin.tmpl (revision 8976)
+++ templates/pl/admin.tmpl (revision 8977)
@@ -4,16 +4,16 @@

Drukarki

- - + + -{have_samba?:} +{have_samba?:}

Klasy

- +

@@ -28,7 +28,7 @@

Serwery

- + @@ -38,6 +38,7 @@

{SETTINGS_ERROR}
: +

{ADVANCEDSETTINGS?

Ustawienia serwera:

@@ -95,7 +96,7 @@

Subskrypcje RSS

- +

@@ -104,6 +105,6 @@ {[notify_subscription_id] } + }
{job_preserved>0?{job_state>5? - -:}:} +:}:} {job_state=4? - + :} {job_state=3? - + :} {job_state<7? - + -:} +:}  
NameZdarzeniaNazwa kolejki
{notify_recipient_name}
{notify_events} {notify_printer_name?{notify_printer_name}:Wszystkie kolejki}
{notify_events} {notify_printer_name?{notify_printer_name}:Wszystkie kolejki}
:}

Index: templates/pl/modify-class.tmpl

--- templates/pl/modify-class.tmpl (revision 8976)
+++ templates/pl/modify-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Modyfikowanie klasy {printer_name}

+

Index: templates/pl/choose-make.tmpl

--- templates/pl/choose-make.tmpl (revision 8976)
+++ templates/pl/choose-make.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modify {printer_name}:Dodawanie drukarki}

+ {printer_name?:}

Index: templates/pl/list-available-printers.tmpl

--- templates/pl/list-available-printers.tmpl (revision 8976)
+++ templates/pl/list-available-printers.tmpl (revision 8977)
@@ -4,7 +4,7 @@

{#device_uri=0?

Nie znaleziono drukarek.


:
    {[device_uri]
    -

  • +

  • {device_make_and_model} ({device_info})

  • }
}

Index: templates/pl/users.tmpl

--- templates/pl/users.tmpl (revision 8976)
+++ templates/pl/users.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {IS_CLASS?:}

Index: templates/pl/job-move.tmpl

--- templates/pl/job-move.tmpl (revision 8976)
+++ templates/pl/job-move.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {job_id?:}

Index: templates/pl/printer.tmpl

--- templates/pl/printer.tmpl (revision 8976)
+++ templates/pl/printer.tmpl (revision 8977)
@@ -6,6 +6,7 @@
{server_is_sharing_printers=0?Nie:{printer_is_shared=0?Nie:}} Wspó�dzielona{default_name={printer_name}?, Domy�lne serwera:})

+ Konserwacja Wydrukuj stron� próbn� @@ -20,6 +21,7 @@ + Administracja Index: templates/pl/edit-config.tmpl --- templates/pl/edit-config.tmpl (revision 8976) +++ templates/pl/edit-config.tmpl (revision 8977) @@ -10,7 +10,7 @@ Modyfikowanie pliku konfiguracji +

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/pl/set-printer-options-header.tmpl

--- templates/pl/set-printer-options-header.tmpl (revision 8976)
+++ templates/pl/set-printer-options-header.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Ustawianie domy�lnych opcji dla {printer_name}

+ {HAVE_AUTOCONFIGURE?:}

Index: templates/pl/add-class.tmpl

--- templates/pl/add-class.tmpl (revision 8976)
+++ templates/pl/add-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Dodawanie klasy

+

Index: templates/pl/jobs.tmpl

--- templates/pl/jobs.tmpl (revision 8976)
+++ templates/pl/jobs.tmpl (revision 8977)
@@ -17,18 +17,18 @@
"{job_printer_state_message}":}

}

Index: templates/pl/choose-serial.tmpl

--- templates/pl/choose-serial.tmpl (revision 8976)
+++ templates/pl/choose-serial.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modyfikowanie {printer_name}:Dodawanie drukarki}

+ {printer_name?:}

Index: templates/pl/class-confirm.tmpl

--- templates/pl/class-confirm.tmpl (revision 8976)
+++ templates/pl/class-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Ostrzeżenie: Usun�� klas� {printer_name}?

-


+

Index: templates/pl/choose-uri.tmpl

--- templates/pl/choose-uri.tmpl (revision 8976)
+++ templates/pl/choose-uri.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modyfikowanie {printer_name}:Dodawanie drukarki}

+ {printer_name?:}

Index: templates/pl/add-rss-subscription.tmpl

--- templates/pl/add-rss-subscription.tmpl (revision 8976)
+++ templates/pl/add-rss-subscription.tmpl (revision 8977)
@@ -1,4 +1,5 @@

+

Dodawanie subskrypcji RSS

Index: templates/class-confirm.tmpl

--- templates/class-confirm.tmpl (revision 8976)
+++ templates/class-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Warning: Are you sure you want to delete class {printer_name}?

-


+

Index: templates/choose-uri.tmpl

--- templates/choose-uri.tmpl (revision 8976)
+++ templates/choose-uri.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modify {printer_name}:Add Printer}

+ {printer_name?:}

Index: templates/add-rss-subscription.tmpl

--- templates/add-rss-subscription.tmpl (revision 8976)
+++ templates/add-rss-subscription.tmpl (revision 8977)
@@ -1,4 +1,5 @@

+

Add RSS Subscription

Index: templates/id/add-printer.tmpl

--- templates/id/add-printer.tmpl (revision 8976)
+++ templates/id/add-printer.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Add Printer

+ {?current_make!?:} {?current_make_and_model!?:}

Index: templates/id/printer-confirm.tmpl

--- templates/id/printer-confirm.tmpl (revision 8976)
+++ templates/id/printer-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Peringatan: Anda yakin untuk menghapus {printer_name}?

-


+

Index: templates/id/choose-model.tmpl

--- templates/id/choose-model.tmpl (revision 8976)
+++ templates/id/choose-model.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modify {printer_name}:Tambah Pencetak}

+ {printer_name?:}

Index: templates/id/samba-export.tmpl

--- templates/id/samba-export.tmpl (revision 8976)
+++ templates/id/samba-export.tmpl (revision 8977)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Ekspor Pencetak ke Samba

Index: templates/id/class.tmpl

--- templates/id/class.tmpl (revision 8976)
+++ templates/id/class.tmpl (revision 8977)
@@ -5,6 +5,7 @@
{server_is_sharing_printers=0?Jangan:{printer_is_shared=0?Jangan:}} Berbagi{default_name={printer_name}?, Server Baku:})

+ Perawatan Halaman Uji Cetak @@ -17,6 +18,7 @@ + Administrasi Index: templates/id/modify-printer.tmpl --- templates/id/modify-printer.tmpl (revision 8976) +++ templates/id/modify-printer.tmpl (revision 8977) @@ -3,6 +3,7 @@ Ubah {printer_name} +

Index: templates/id/choose-device.tmpl

--- templates/id/choose-device.tmpl (revision 8976)
+++ templates/id/choose-device.tmpl (revision 8977)
@@ -6,6 +6,7 @@
ALT="Busy Indicator"> Mencari pencetak...

}

+ {printer_name?:}

Index: templates/id/admin.tmpl

--- templates/id/admin.tmpl (revision 8976)
+++ templates/id/admin.tmpl (revision 8977)
@@ -4,16 +4,16 @@

Pencetak

- - + + -{have_samba?:} +{have_samba?:}

Kelas

- +

@@ -28,7 +28,7 @@

Server

- + @@ -38,6 +38,7 @@

{SETTINGS_ERROR}
: +

{ADVANCEDSETTINGS?

Pengaturan Server:

@@ -95,7 +96,7 @@

Subskripsi RSS

- +

@@ -104,6 +105,6 @@ {[notify_subscription_id] } + }
{job_preserved>0?{job_state>5? - + :}:} {job_state=4? - + :} {job_state=3? - + :} {job_state<7? - + -:} +:}  
NamaKejadianNama Antrian
{notify_recipient_name}
{notify_events} {notify_printer_name?{notify_printer_name}:Semua Antrian}
{notify_events} {notify_printer_name?{notify_printer_name}:Semua Antrian}
:}

Index: templates/id/modify-class.tmpl

--- templates/id/modify-class.tmpl (revision 8976)
+++ templates/id/modify-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Ubah Kelas {printer_name}

+

Index: templates/id/choose-make.tmpl

--- templates/id/choose-make.tmpl (revision 8976)
+++ templates/id/choose-make.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Ubah {printer_name}:Tambah Pencetak}

+ {printer_name?:}

Index: templates/id/list-available-printers.tmpl

--- templates/id/list-available-printers.tmpl (revision 8976)
+++ templates/id/list-available-printers.tmpl (revision 8977)
@@ -4,7 +4,7 @@

{#device_uri=0?

Tidak ada pencetak.


:
    {[device_uri]
    -

  • +

  • {device_make_and_model} ({device_info})

  • }
}

Index: templates/id/users.tmpl

--- templates/id/users.tmpl (revision 8976)
+++ templates/id/users.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {IS_CLASS?:}

Index: templates/id/job-move.tmpl

--- templates/id/job-move.tmpl (revision 8976)
+++ templates/id/job-move.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {job_id?:}

Index: templates/id/printer.tmpl

--- templates/id/printer.tmpl (revision 8976)
+++ templates/id/printer.tmpl (revision 8977)
@@ -6,6 +6,7 @@
{server_is_sharing_printers=0?Tidak:{printer_is_shared=0?Tidak:}} Berbagi{default_name={printer_name}?, Server Baku:})

+ Perawatan Cetak Halaman Uji @@ -20,6 +21,7 @@ + Administrasi Index: templates/id/edit-config.tmpl --- templates/id/edit-config.tmpl (revision 8976) +++ templates/id/edit-config.tmpl (revision 8977) @@ -10,7 +10,7 @@ Sunting Berkas Konfigurasi +

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/id/set-printer-options-header.tmpl

--- templates/id/set-printer-options-header.tmpl (revision 8976)
+++ templates/id/set-printer-options-header.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Atur Opsi Baku untuk {printer_name}

+ {HAVE_AUTOCONFIGURE?:}

Index: templates/id/add-class.tmpl

--- templates/id/add-class.tmpl (revision 8976)
+++ templates/id/add-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Tambah Kelas

+

Index: templates/id/jobs.tmpl

--- templates/id/jobs.tmpl (revision 8976)
+++ templates/id/jobs.tmpl (revision 8977)
@@ -17,18 +17,17 @@
"{job_printer_state_message}":}

}

Index: templates/id/choose-serial.tmpl

--- templates/id/choose-serial.tmpl (revision 8976)
+++ templates/id/choose-serial.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modify {printer_name}:Tambah Pencetak}

+ {printer_name?:}

Index: templates/id/class-confirm.tmpl

--- templates/id/class-confirm.tmpl (revision 8976)
+++ templates/id/class-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Peringatan: Anda yakin untuk menghapus kelas {printer_name}?

-


+

Index: templates/id/choose-uri.tmpl

--- templates/id/choose-uri.tmpl (revision 8976)
+++ templates/id/choose-uri.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modify {printer_name}:Tambah Pencetak}

+ {printer_name?:}

Index: templates/id/add-rss-subscription.tmpl

--- templates/id/add-rss-subscription.tmpl (revision 8976)
+++ templates/id/add-rss-subscription.tmpl (revision 8977)
@@ -1,4 +1,5 @@

+
{job_preserved>0?{job_state>5? - -:}:} +:}:} {job_state=4? - + :} {job_state=3? - + :} {job_state<7? - + -:} +:}  
Collaborator

michaelrsweet commented Apr 29, 2010

Tambah Subskripsi RSS

Index: templates/es/add-printer.tmpl

--- templates/es/add-printer.tmpl (revision 8976)
+++ templates/es/add-printer.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Añadir impresora

+

Index: templates/es/printer-confirm.tmpl

--- templates/es/printer-confirm.tmpl (revision 8976)
+++ templates/es/printer-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Advertencia: ¿Está seguro de querer borrar la impresora {printer_name}?

-


+

Index: templates/es/choose-model.tmpl

--- templates/es/choose-model.tmpl (revision 8976)
+++ templates/es/choose-model.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modificar {printer_name}:Añadir impresora}

+ {printer_name?:}

Index: templates/es/samba-export.tmpl

--- templates/es/samba-export.tmpl (revision 8976)
+++ templates/es/samba-export.tmpl (revision 8977)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Exportar impresoras a Samba

Index: templates/es/class.tmpl

--- templates/es/class.tmpl (revision 8976)
+++ templates/es/class.tmpl (revision 8977)
@@ -5,6 +5,7 @@
{server_is_sharing_printers=0?no:{printer_is_shared=0?no:}} compartida{default_name={printer_name}?, predeterminada del servidor:})

+ Mantenimiento Imprimir página de prueba @@ -17,6 +18,7 @@ + Administración Index: templates/es/modify-printer.tmpl --- templates/es/modify-printer.tmpl (revision 8976) +++ templates/es/modify-printer.tmpl (revision 8977) @@ -3,6 +3,7 @@ Modificar {printer_name} +

Index: templates/es/choose-device.tmpl

--- templates/es/choose-device.tmpl (revision 8976)
+++ templates/es/choose-device.tmpl (revision 8977)
@@ -6,6 +6,7 @@
ALT="Busy Indicator"> Buscando impresoras...

}

+ {printer_name?:}

Index: templates/es/admin.tmpl

--- templates/es/admin.tmpl (revision 8976)
+++ templates/es/admin.tmpl (revision 8977)
@@ -4,16 +4,16 @@

Impresoras

-

- + + -{have_samba?:} +{have_samba?:}

Clases

-

+

@@ -28,7 +28,7 @@

Servidor

-

+ @@ -38,6 +38,7 @@
{SETTINGS_ERROR}
: +

{ADVANCEDSETTINGS?

Configuración del servidor:

@@ -95,7 +96,7 @@

Subscripciones RSS

-

+

@@ -104,6 +105,6 @@ NombreEventosNombre de la cola {[notify_subscription_id] {notify_recipient_name}
- {notify_events} {notify_printer_name?{notify_printer_name}:Todas las colas}} + {notify_events} {notify_printer_name?{notify_printer_name}:Todas las colas}} :}

Index: templates/es/modify-class.tmpl

--- templates/es/modify-class.tmpl (revision 8976)
+++ templates/es/modify-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Modificar clase {printer_name}

+

Index: templates/es/choose-make.tmpl

--- templates/es/choose-make.tmpl (revision 8976)
+++ templates/es/choose-make.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modificar {printer_name}:Añadir impresora}

+ {printer_name?:}

Index: templates/es/list-available-printers.tmpl

--- templates/es/list-available-printers.tmpl (revision 8976)
+++ templates/es/list-available-printers.tmpl (revision 8977)
@@ -4,7 +4,7 @@

{#device_uri=0?

No se encuentran impresoras.


:
    {[device_uri]
    -

  • +

  • {device_make_and_model} ({device_info})

  • }
}

Index: templates/es/users.tmpl

--- templates/es/users.tmpl (revision 8976)
+++ templates/es/users.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {IS_CLASS?:}

Index: templates/es/job-move.tmpl

--- templates/es/job-move.tmpl (revision 8976)
+++ templates/es/job-move.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {job_id?:}

Index: templates/es/printer.tmpl

--- templates/es/printer.tmpl (revision 8976)
+++ templates/es/printer.tmpl (revision 8977)
@@ -6,6 +6,7 @@
{server_is_sharing_printers=0?no:{printer_is_shared=0?no:}} compartida{default_name={printer_name}?, predeterminada del servidor:})

+ Mantenimiento Imprimir página de prueba @@ -20,6 +21,7 @@ + Administración Index: templates/es/edit-config.tmpl --- templates/es/edit-config.tmpl (revision 8976) +++ templates/es/edit-config.tmpl (revision 8977) @@ -10,7 +10,7 @@ Editar archivo de configuración +

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/es/set-printer-options-header.tmpl

--- templates/es/set-printer-options-header.tmpl (revision 8976)
+++ templates/es/set-printer-options-header.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Establecer opciones predeterminadas de {printer_name}

+ {HAVE_AUTOCONFIGURE?:}

Index: templates/es/add-class.tmpl

--- templates/es/add-class.tmpl (revision 8976)
+++ templates/es/add-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Añadir clase

+

Index: templates/es/jobs.tmpl

--- templates/es/jobs.tmpl (revision 8976)
+++ templates/es/jobs.tmpl (revision 8977)
@@ -17,18 +17,18 @@
"{job_printer_state_message}":}

}

Index: templates/es/choose-serial.tmpl

--- templates/es/choose-serial.tmpl (revision 8976)
+++ templates/es/choose-serial.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modificar {printer_name}:Añadir impresora}

+ {printer_name?:}

Index: templates/es/class-confirm.tmpl

--- templates/es/class-confirm.tmpl (revision 8976)
+++ templates/es/class-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Advertencia: ¿Está seguro de querer borrar la clase {printer_name}?

-


+

Index: templates/es/choose-uri.tmpl

--- templates/es/choose-uri.tmpl (revision 8976)
+++ templates/es/choose-uri.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modificar {printer_name}:Añadir impresora}

+ {printer_name?:}

Index: templates/es/add-rss-subscription.tmpl

--- templates/es/add-rss-subscription.tmpl (revision 8976)
+++ templates/es/add-rss-subscription.tmpl (revision 8977)
@@ -1,4 +1,5 @@

+

Añadir subscripción RSS

Index: templates/eu/add-printer.tmpl

--- templates/eu/add-printer.tmpl (revision 8976)
+++ templates/eu/add-printer.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Gehitu inprimagailua

+

Index: templates/eu/printer-confirm.tmpl

--- templates/eu/printer-confirm.tmpl (revision 8976)
+++ templates/eu/printer-confirm.tmpl (revision 8977)
@@ -4,6 +4,6 @@

Abisua: ziur zaude {printer_name} inprimagailua ezabatzea nahi duzula?

-


+

Index: templates/eu/choose-model.tmpl

--- templates/eu/choose-model.tmpl (revision 8976)
+++ templates/eu/choose-model.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}

+ {printer_name?:}

Index: templates/eu/samba-export.tmpl

--- templates/eu/samba-export.tmpl (revision 8976)
+++ templates/eu/samba-export.tmpl (revision 8977)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Esportatu inprimagailuak Samba-ra

Index: templates/eu/class.tmpl

--- templates/eu/class.tmpl (revision 8976)
+++ templates/eu/class.tmpl (revision 8977)
@@ -5,6 +5,7 @@
{default_name={printer_name}?, zerbitzariaren lehenetsiak:} partekatuta {server_is_sharing_printers=0?ez:{printer_is_shared=0?ez:}} daude)

+ Mantenimendua Inprimatu probako orrialdea @@ -17,6 +18,7 @@ + Administrazioa Index: templates/eu/modify-printer.tmpl --- templates/eu/modify-printer.tmpl (revision 8976) +++ templates/eu/modify-printer.tmpl (revision 8977) @@ -3,6 +3,7 @@ Aldatu {printer_name} +

Index: templates/eu/choose-device.tmpl

--- templates/eu/choose-device.tmpl (revision 8976)
+++ templates/eu/choose-device.tmpl (revision 8977)
@@ -6,6 +6,7 @@
ALT="Busy Indicator"> Inprimagailuak bilatzen...

}

+ {printer_name?:}

Index: templates/eu/admin.tmpl

--- templates/eu/admin.tmpl (revision 8976)
+++ templates/eu/admin.tmpl (revision 8977)
@@ -4,16 +4,16 @@

Inprimagailuak

- - + + -{have_samba?:} +{have_samba?:}

Klaseak

- +

@@ -28,7 +28,7 @@

Zerbitzaria

- + @@ -38,6 +38,7 @@

{SETTINGS_ERROR}
: +

{ADVANCEDSETTINGS?

Zerbitzariaren ezarpenak:

@@ -95,7 +96,7 @@

RSS harpidetzak

- +

@@ -104,6 +105,6 @@ {[notify_subscription_id] } + }
{job_preserved>0?{job_state>5? - + :}:} {job_state=4? - + :} {job_state=3? - + :} {job_state<7? - + -:} +:}  
IzenaGertaerakIlararen izena
{notify_recipient_name}
{notify_events} {notify_printer_name?{notify_printer_name}:Ilara guztiak}
{notify_events} {notify_printer_name?{notify_printer_name}:Ilara guztiak}
:}

Index: templates/eu/modify-class.tmpl

--- templates/eu/modify-class.tmpl (revision 8976)
+++ templates/eu/modify-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Aldatu {printer_name} klasea

+

Index: templates/eu/choose-make.tmpl

--- templates/eu/choose-make.tmpl (revision 8976)
+++ templates/eu/choose-make.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}

+ {printer_name?:}

Index: templates/eu/list-available-printers.tmpl

--- templates/eu/list-available-printers.tmpl (revision 8976)
+++ templates/eu/list-available-printers.tmpl (revision 8977)
@@ -4,7 +4,7 @@

{#device_uri=0?

Ez da inprimagailurik aurkitu.


:
    {[device_uri]
    -

  • +

  • {device_make_and_model} ({device_info})

  • }
}

Index: templates/eu/users.tmpl

--- templates/eu/users.tmpl (revision 8976)
+++ templates/eu/users.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {IS_CLASS?:}

Index: templates/eu/job-move.tmpl

--- templates/eu/job-move.tmpl (revision 8976)
+++ templates/eu/job-move.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {job_id?:}

Index: templates/eu/printer.tmpl

--- templates/eu/printer.tmpl (revision 8976)
+++ templates/eu/printer.tmpl (revision 8977)
@@ -6,6 +6,7 @@
{default_name={printer_name}?, Zerbitzariaren lehenetsia:} partekatuta {server_is_sharing_printers=0?ez:{printer_is_shared=0?ez:}} dago)

+ Mantenimendua Inprimatu probako orrialdea @@ -20,6 +21,7 @@ + Administrazioa Index: templates/eu/edit-config.tmpl --- templates/eu/edit-config.tmpl (revision 8976) +++ templates/eu/edit-config.tmpl (revision 8977) @@ -10,7 +10,7 @@ Editatu konfigurazioko fitxategia +

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/eu/set-printer-options-header.tmpl

--- templates/eu/set-printer-options-header.tmpl (revision 8976)
+++ templates/eu/set-printer-options-header.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Ezarri {printer_name}(r)en aukera lehenetsiak

+ {HAVE_AUTOCONFIGURE?:}

Index: templates/eu/add-class.tmpl

--- templates/eu/add-class.tmpl (revision 8976)
+++ templates/eu/add-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Gehitu klasea

+

Index: templates/eu/jobs.tmpl

--- templates/eu/jobs.tmpl (revision 8976)
+++ templates/eu/jobs.tmpl (revision 8977)
@@ -17,18 +17,18 @@
"{job_printer_state_message}":}

}

Index: templates/eu/choose-serial.tmpl

--- templates/eu/choose-serial.tmpl (revision 8976)
+++ templates/eu/choose-serial.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}

+ {printer_name?:}

Index: templates/eu/class-confirm.tmpl

--- templates/eu/class-confirm.tmpl (revision 8976)
+++ templates/eu/class-confirm.tmpl (revision 8977)
@@ -4,6 +4,6 @@

Abisua: ziur zaude {printer_name} klasea ezabatu nahi duzula?

-


+

Index: templates/eu/choose-uri.tmpl

--- templates/eu/choose-uri.tmpl (revision 8976)
+++ templates/eu/choose-uri.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Aldatu {printer_name}:Gehitu inprimagailua}

+ {printer_name?:}

Index: templates/eu/add-rss-subscription.tmpl

--- templates/eu/add-rss-subscription.tmpl (revision 8976)
+++ templates/eu/add-rss-subscription.tmpl (revision 8977)
@@ -1,4 +1,5 @@

+

Gehitu RSS harpidetza

Index: templates/it/add-printer.tmpl

--- templates/it/add-printer.tmpl (revision 8976)
+++ templates/it/add-printer.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Aggiungi stampante

+ {?current_make!?:} {?current_make_and_model!?:}

Index: templates/it/printer-confirm.tmpl

--- templates/it/printer-confirm.tmpl (revision 8976)
+++ templates/it/printer-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Avviso: Sei sicuro di voler eliminare la stampante {printer_name}?

-


+

Index: templates/it/choose-model.tmpl

--- templates/it/choose-model.tmpl (revision 8976)
+++ templates/it/choose-model.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modify {printer_name}:Aggiungi stampante}

+ {printer_name?:}

Index: templates/it/samba-export.tmpl

--- templates/it/samba-export.tmpl (revision 8976)
+++ templates/it/samba-export.tmpl (revision 8977)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Esporta stampanti a Samba

Index: templates/it/class.tmpl

--- templates/it/class.tmpl (revision 8976)
+++ templates/it/class.tmpl (revision 8977)
@@ -5,6 +5,7 @@
{server_is_sharing_printers=0?Not:{printer_is_shared=0?Not:}} Shared{default_name={printer_name}?, Server Default:})

+ Manutenzione Stampa pagina di prova @@ -17,6 +18,7 @@ + Amministrazione Index: templates/it/modify-printer.tmpl --- templates/it/modify-printer.tmpl (revision 8976) +++ templates/it/modify-printer.tmpl (revision 8977) @@ -3,6 +3,7 @@ Modifica {printer_name} +

Index: templates/it/choose-device.tmpl

--- templates/it/choose-device.tmpl (revision 8976)
+++ templates/it/choose-device.tmpl (revision 8977)
@@ -6,6 +6,7 @@
ALT="Busy Indicator"> Ricerca stampanti...

}

+ {printer_name?:}

Index: templates/it/admin.tmpl

--- templates/it/admin.tmpl (revision 8976)
+++ templates/it/admin.tmpl (revision 8977)
@@ -4,16 +4,16 @@

Stampanti

- - + + -{have_samba?:} +{have_samba?:}

Classi

- +

@@ -28,7 +28,7 @@

Server

- + @@ -38,6 +38,7 @@

{SETTINGS_ERROR}
: +

{ADVANCEDSETTINGS?

Impostazioni del server:

@@ -95,7 +96,7 @@

Iscrizioni RSS

- +

@@ -104,6 +105,6 @@ {[notify_subscription_id] } + }
{job_preserved>0?{job_state>5? - + :}:} {job_state=4? - + :} {job_state=3? - + :} {job_state<7? - + -:} +:}  
NomeEventiNome coda
{notify_recipient_name}
{notify_events} {notify_printer_name?{notify_printer_name}:Tutte le code}
{notify_events} {notify_printer_name?{notify_printer_name}:Tutte le code}
:}

Index: templates/it/modify-class.tmpl

--- templates/it/modify-class.tmpl (revision 8976)
+++ templates/it/modify-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Modifica classe {printer_name}

+

Index: templates/it/choose-make.tmpl

--- templates/it/choose-make.tmpl (revision 8976)
+++ templates/it/choose-make.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modify {printer_name}:Aggiungi stampante}

+ {printer_name?:}

Index: templates/it/list-available-printers.tmpl

--- templates/it/list-available-printers.tmpl (revision 8976)
+++ templates/it/list-available-printers.tmpl (revision 8977)
@@ -4,7 +4,7 @@

{#device_uri=0?

Nessuna stampante trovata.


:
    {[device_uri]
    -

  • +

  • {device_make_and_model} ({device_info})

  • }
}

Index: templates/it/users.tmpl

--- templates/it/users.tmpl (revision 8976)
+++ templates/it/users.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {IS_CLASS?:}

Index: templates/it/job-move.tmpl

--- templates/it/job-move.tmpl (revision 8976)
+++ templates/it/job-move.tmpl (revision 8977)
@@ -1,6 +1,7 @@

+ {job_id?:}

Index: templates/it/printer.tmpl

--- templates/it/printer.tmpl (revision 8976)
+++ templates/it/printer.tmpl (revision 8977)
@@ -6,6 +6,7 @@
{server_is_sharing_printers=0?Not:{printer_is_shared=0?Not:}} Shared{default_name={printer_name}?, Server Default:})

+ Maintenance Print Test Page @@ -20,6 +21,7 @@ + Administration Index: templates/it/edit-config.tmpl --- templates/it/edit-config.tmpl (revision 8976) +++ templates/it/edit-config.tmpl (revision 8977) @@ -10,7 +10,7 @@ Modifica file di configurazione +

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/it/set-printer-options-header.tmpl

--- templates/it/set-printer-options-header.tmpl (revision 8976)
+++ templates/it/set-printer-options-header.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Imposta opzioni predefinite per {printer_name}

+ {HAVE_AUTOCONFIGURE?:}

Index: templates/it/add-class.tmpl

--- templates/it/add-class.tmpl (revision 8976)
+++ templates/it/add-class.tmpl (revision 8977)
@@ -3,6 +3,7 @@

Aggiungi classe

+

Index: templates/it/choose-serial.tmpl

--- templates/it/choose-serial.tmpl (revision 8976)
+++ templates/it/choose-serial.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modifica {printer_name}:Aggiungi stampante}

+ {printer_name?:}

Index: templates/it/jobs.tmpl

--- templates/it/jobs.tmpl (revision 8976)
+++ templates/it/jobs.tmpl (revision 8977)
@@ -17,18 +17,18 @@
"{job_printer_state_message}":}

}

Index: templates/it/class-confirm.tmpl

--- templates/it/class-confirm.tmpl (revision 8976)
+++ templates/it/class-confirm.tmpl (revision 8977)
@@ -5,6 +5,6 @@

Warning: Sei sicuro di voler eliminare la classe {printer_name}?

-


+

Index: templates/it/choose-uri.tmpl

--- templates/it/choose-uri.tmpl (revision 8976)
+++ templates/it/choose-uri.tmpl (revision 8977)
@@ -3,6 +3,7 @@

{op=modify-printer?Modifica {printer_name}:Aggiungi stampante}

+ {printer_name?:}

Index: templates/it/add-rss-subscription.tmpl

--- templates/it/add-rss-subscription.tmpl (revision 8976)
+++ templates/it/add-rss-subscription.tmpl (revision 8977)
@@ -1,4 +1,5 @@

+

Aggiungi iscrizione RSS

Index: cgi-bin/libcupscgi.exp

--- cgi-bin/libcupscgi.exp (revision 8976)
+++ cgi-bin/libcupscgi.exp (revision 8977)
@@ -10,6 +10,7 @@
_cgiFreeSearch
_cgiGetArray
_cgiGetAttributes
+_cgiGetCookie
_cgiGetFile
_cgiGetIPPObjects
_cgiGetSize
@@ -24,6 +25,7 @@
_cgiSetArray
_cgiSetIPPObjectVars
_cgiSetIPPVars
+_cgiSetCookie
_cgiSetServerVersion
_cgiSetSize
_cgiSetVariable

Index: cgi-bin/cgi.h

--- cgi-bin/cgi.h (revision 8976)
+++ cgi-bin/cgi.h (revision 8977)
@@ -1,9 +1,9 @@
/*

  • "$Id$"
    *
    • * CGI support library definitions.
    • * CGI support library definitions for CUPS.
      *
    • * Copyright 2007-2009 by Apple Inc.
    • * Copyright 2007-2010 by Apple Inc.
  • Copyright 1997-2006 by Easy Software Products.
  • These coded instructions, statements, and computer programs are the
    @@ -69,11 +69,12 @@
    extern int cgiDoSearch(void *search, const char *text);
    extern void cgiEndHTML(void);
    extern void cgiEndMultipart(void);
    -extern char *cgiFormEncode(char *dst, const char *src, size_t dstsize);
    +extern char *cgiFormEncode(char *dst, const char *src,
  •                      size_t dstsize);
    

    extern void cgiFreeSearch(void *search);
    extern const char *cgiGetArray(const char *name, int element);
    extern void cgiGetAttributes(ipp_t *request, const char *tmpl);
    -extern char *cgiGetCookie(const char *name, char *buf, int buflen);
    +extern const char *cgiGetCookie(const char *name);
    extern const cgi_file_t *cgiGetFile(void);
    extern cups_array_t *cgiGetIPPObjects(ipp_t *response, void *search);
    extern int cgiGetSize(const char *name);
    Index: cgi-bin/template.c

    --- cgi-bin/template.c (revision 8976)
    +++ cgi-bin/template.c (revision 8977)
    @@ -369,6 +369,20 @@
{job_preserved>0?{job_state>5? - + :}:} {job_state=4? - + :} {job_state=3? - + :} {job_state<7? - + -:} +:}  
Collaborator

michaelrsweet commented Apr 29, 2010

     continue;
   }
  •  else if (name[0] == '$')
    
  •  {
    
  •   /*
    
  •    \* Insert cookie value or nothing if not defined.
    
  • */
  •    if ((value = cgiGetCookie(name + 1)) != NULL)
    
  • outptr = value;
    
  • else

  • {

  • outval[0] = '\0';
    
  • outptr    = outval;
    
  • }

  •  }
    

    else
    {
    /*
    Index: cgi-bin/var.c

    --- cgi-bin/var.c (revision 8976)
    +++ cgi-bin/var.c (revision 8977)
    @@ -1,9 +1,9 @@
    /*

    • "$Id$"
      *
  • * CGI form variable and array functions.

  • * CGI form variable and array functions for CUPS.
    *

  • * Copyright 2007-2009 by Apple Inc.

  • * Copyright 2007-2010 by Apple Inc.

    • Copyright 1997-2005 by Easy Software Products.
    • These coded instructions, statements, and computer programs are the
      @@ -14,25 +14,34 @@
    • Contents:
      *
  • * cgiCheckVariables() - Check for the presence of "required" variables.

  • * cgiCheckVariables() - Check for the presence of "required"

  • * variables.

    • cgiClearVariables() - Clear all form variables.
  • * cgiGetArray() - Get an element from a form array...

  • * cgiGetFile() - Get the file (if any) that was submitted in the form.

  • * cgiGetArray() - Get an element from a form array.

  • * cgiGetCookie() - Get a cookie value.

  • * cgiGetFile() - Get the file (if any) that was submitted in

  • * the form.

    • cgiGetSize() - Get the size of a form array value.
  • * cgiGetVariable() - Get a CGI variable from the database...

  • * cgiInitialize() - Initialize the CGI variable "database"...

  • * cgiGetVariable() - Get a CGI variable from the database.

  • * cgiInitialize() - Initialize the CGI variable "database".

    • cgiIsPOST() - Determine whether this page was POSTed.
    • cgiSetArray() - Set array element N to the specified string.
  • * cgiSetCookie() - Set a cookie value.

    • cgiSetSize() - Set the array size.
  • * cgiSetVariable() - Set a CGI variable in the database...

  • * cgiSetVariable() - Set a CGI variable in the database.

    • cgi_add_variable() - Add a form variable.
    • cgi_compare_variables() - Compare two variables.
  • * cgi_find_variable() - Find a variable...

  • * cgi_initialize_get() - Initialize form variables using the GET method.

  • * cgi_initialize_multipart() - Initialize variables and file using the POST method.

  • * cgi_find_variable() - Find a variable.

  • * cgi_initialize_cookies() - Initialize cookies.

  • * cgi_initialize_get() - Initialize form variables using the GET

  • * method.

  • * cgi_initialize_multipart() - Initialize variables and file using the POST

  • * method.

    • cgi_initialize_post() - Initialize variables using the POST method.
    • cgi_initialize_string() - Initialize form variables from a string.
  • * cgi_passwd() - Catch authentication requests and notify the server.

  • * cgi_passwd() - Catch authentication requests and notify the

  • * server.

    • cgi_set_sid() - Set the CUPS session ID.
    • cgi_sort_variables() - Sort all form variables for faster lookup.
    • cgi_unlink_file() - Remove the uploaded form.
      /
      @@ -40,9 +49,18 @@
      /
      #define DEBUG*/
      #include "cgi-private.h"
      #include <errno.h>
      +#include <cups/http.h>
      +#include <cups/md5.h>

    /*

  • * Session ID name

  • /
    +
    +#define CUPS_SID "org.cups.sid"
    +
    +
    +/

    • Data structure to hold all the CGI form variables and arrays...
      */

@@ -59,6 +77,8 @@

  • Local globals...
    */

+static int num_cookies = 0;/* Number of cookies /
+static cups_option_t *cookies = NULL;/
Cookies /
static int form_count = 0, /
Form variable count /
form_alloc = 0; /
Number of variables allocated */
static _cgi_var_t *form_vars = NULL;
@@ -76,11 +96,13 @@
static int cgi_compare_variables(const _cgi_var_t *v1,
const _cgi_var_t *v2);
static _cgi_var_t *cgi_find_variable(const char *name);
+static void cgi_initialize_cookies(void);
static int cgi_initialize_get(void);
static int cgi_initialize_multipart(const char *boundary);
static int cgi_initialize_post(void);
static int cgi_initialize_string(const char *data);
static const char *cgi_passwd(const char *prompt);
+static const char *cgi_set_sid(void);
static void cgi_sort_variables(void);
static void cgi_unlink_file(void);

@@ -161,7 +183,7 @@

/*

  • * 'cgiGetArray()' - Get an element from a form array...

    • 'cgiGetArray()' - Get an element from a form array.
      */

    const char * /* O - Element value or NULL */
    @@ -182,6 +204,17 @@

    /*

  • * 'cgiGetCookie()' - Get a cookie value.

  • /
    +
    +const char * /
    O - Value or NULL /
    +cgiGetCookie(const char *name) /
    I - Name of cookie */
    +{

  • return (cupsGetOption(name, num_cookies, cookies));
    +}

+/*

  • 'cgiGetFile()' - Get the file (if any) that was submitted in the form.
    */

@@ -210,10 +243,10 @@

/*

  • * 'cgiGetVariable()' - Get a CGI variable from the database...

  • * 'cgiGetVariable()' - Get a CGI variable from the database.
    *

    • Returns NULL if the variable doesn't exist. If the variable is an
  • * array of values, returns the last element...

    • array of values, returns the last element.
      */

    const char * /* O - Value of variable */
    @@ -237,14 +270,16 @@

    /*

  • * 'cgiInitialize()' - Initialize the CGI variable "database"...

    • 'cgiInitialize()' - Initialize the CGI variable "database".
      */

    int /* O - Non-zero if there was form data */
    cgiInitialize(void)
    {

  • const char method; / Form posting method */

  • const char content_type; / Content-Type of post data */

  • const char method, / Form posting method */

  •   _content_type,      /_ Content-Type of post data */
    
  •   _cups_sid_cookie,   /_ SID cookie */
    
  •   *cups_sid_form;     /* SID form variable */
    

    /*
    @@ -268,6 +303,20 @@
    #endif /* DEBUG */

    /*

  • * Get cookies...

  • */

  • cgi_initialize_cookies();
  • if ((cups_sid_cookie = cgiGetCookie(CUPS_SID)) == NULL)
  • {
  • fputs("DEBUG: " CUPS_SID " cookie not found, initializing!\n", stderr);
  • cups_sid_cookie = cgi_set_sid();
  • }
  • fprintf(stderr, "DEBUG: " CUPS_SID " cookie is "%s"\n", cups_sid_cookie);
  • /*
    • Get the request method (GET or POST)...
      */

@@ -290,9 +339,27 @@
boundary += 9;

 if (content_type && !strncmp(content_type, "multipart/form-data; ", 21))
  •  return (cgi_initialize_multipart(boundary));
    
  • {
  •  if (!cgi_initialize_multipart(boundary))
    
  •    return (0);
    
  • }
  • else if (!cgi_initialize_post())
  •  return (0);
    
  • if ((cups_sid_form = cgiGetVariable(CUPS_SID)) == NULL ||
  • strcmp(cups_sid_cookie, cups_sid_form))
  • {
  •  if (cups_sid_form)
    
  • fprintf(stderr, "DEBUG: " CUPS_SID " form variable is "%s"\n",
  •       cups_sid_form);
    
  •  else
    
  • fputs("DEBUG: " CUPS_SID " form variable is not present.\n", stderr);
  •  cgiClearVariables();
    
  •  return (0);
    
  • }
    else

  •  return (cgi_initialize_post());
    
  •  return (1);
    

    }
    else
    return (0);
    @@ -371,6 +438,38 @@

    /*

  • * 'cgiSetCookie()' - Set a cookie value.

  • /
    +
    +void
    +cgiSetCookie(const char *name, /
    I - Name */

  •         const char _value,        /_ I - Value */
    
  •         const char _path,     /_ I - Path (typically "/") */
    
  •    const char _domain,    /_ I - Domain name */
    
  •    time_t     expires,    /\* I - Expiration date (0 for session) */
    
  •    int        secure)     /\* I - Require SSL */
    

    +{

  • num_cookies = cupsAddOption(name, value, num_cookies, &cookies);

  • printf("Set-Cookie: %s=%s;", name, value);
  • if (path)
  • printf("; path=%s", path);
  • if (domain)
  • printf("; domain=%s", domain);
  • if (expires)
  • {
  • char date[256]; /* Date string */
  • printf("; expires=%s", httpGetDateString2(expires, date, sizeof(date)));
  • }
  • if (secure)
  • puts("; secure;");
  • else
  • puts(";");
    +}

+/*

  • 'cgiSetSize()' - Set the array size.
    */

@@ -418,7 +517,7 @@

/*

  • * 'cgiSetVariable()' - Set a CGI variable in the database...

    • 'cgiSetVariable()' - Set a CGI variable in the database.
      *
    • If the variable is an array, this truncates the array to a single element.
      */
      @@ -514,7 +613,7 @@

    /*

  • * 'cgi_find_variable()' - Find a variable...

    • 'cgi_find_variable()' - Find a variable.
      */

    static _cgi_var_t * /* O - Variable pointer or NULL */
    @@ -534,6 +633,91 @@

    /*

  • * 'cgi_initialize_cookies()' - Initialize cookies.

  • */
    +
    +static void
    +cgi_initialize_cookies(void)
    +{

  • const char cookie; / HTTP_COOKIE environment variable */

  • char name[128], /* Name string */

  •   value[512],     /\* Value string */
    
  •   _ptr;           /_ Pointer into name/value */
    
  • if ((cookie = getenv("HTTP_COOKIE")) == NULL)

  • return;

  • while (*cookie)
  • {
  • /*
  • * Skip leading whitespace...
  • */
  • while (isspace(*cookie & 255))
  •  cookie ++;
    
  • if (!*cookie)
  •  break;
    
  • /*
  • * Copy the name...
  • */
  • for (ptr = name; *cookie && *cookie != '=';)
  •  if (ptr < (name + sizeof(name) - 1))
    
  •    *ptr++ = *cookie++;
    
  •  else
    
  •    break;
    
  • if (*cookie != '=')
  •  break;
    
  • *ptr = '\0';
  • cookie ++;
  • /*
  • * Then the value...
  • */
  • if (*cookie == '"')
  • {
  •  for (cookie ++, ptr = value; *cookie && *cookie != '\"';)
    
  •    if (ptr < (value + sizeof(value) - 1))
    
  • *ptr++ = *cookie++;
    
  • else
  • break;
    
  •  if (*cookie == '\"')
    
  •    cookie ++;
    
  • }
  • else
  • {
  •  for (ptr = value; *cookie && *cookie != ';';)
    
  •    if (ptr < (value + sizeof(value) - 1))
    
  • *ptr++ = *cookie++;
    
  • else
  • break;
    
  • }
  • if (*cookie == ';')
  •  cookie ++;
    
  • else if (*cookie)
  •  break;
    
  • *ptr = '\0';
  • /*
  • * Then add the cookie to an array as long as the name doesn't start with
  • * "$"...
  • */
  • if (name[0] != '$')
  •  num_cookies = cupsAddOption(name, value, num_cookies, &cookies);
    
  • }
    +}

+/*

  • 'cgi_initialize_get()' - Initialize form variables using the GET method.
    */

@@ -562,7 +746,8 @@

/*

  • * 'cgi_initialize_multipart()' - Initialize variables and file using the POST method.
  • * 'cgi_initialize_multipart()' - Initialize variables and file using the POST
  • * method.
    *
    • TODO: Update to support files > 2GB.
      /
      @@ -874,7 +1059,7 @@
      char *s, /
      Pointer to current form string /
      ch, /
      Temporary character /
      name[255], /
      Name of form variable */
  • value[65536]; /* Variable value... */
  • value[65536]; /* Variable value */

/*
@@ -1015,6 +1200,45 @@

/*

  • * 'cgi_set_sid()' - Set the CUPS session ID.
  • /
    +
    +static const char * /
    O - New session ID */
    +cgi_set_sid(void)
    +{
  • char buffer[512], /* SID data */
  •       sid[33];    /\* SID string */
    
  • _cups_md5_state_t md5; /* MD5 state */
  • unsigned char sum[16]; /* MD5 sum */
  • const char remote_addr, / REMOTE_ADDR */
  •       _server_name,   /_ SERVER_NAME */
    
  •       _server_port;   /_ SERVER_PORT */
    
  • if ((remote_addr = getenv("REMOTE_ADDR")) == NULL)
  • remote_addr = "REMOTE_ADDR";
  • if ((server_name = getenv("SERVER_NAME")) == NULL)
  • server_name = "SERVER_NAME";
  • if ((server_port = getenv("SERVER_PORT")) == NULL)
  • server_port = "SERVER_PORT";
  • CUPS_SRAND(time(NULL));
  • snprintf(buffer, sizeof(buffer), "%s:%s:%s:%02X%02X%02X%02X%02X%02X%02X%02X",
  •       remote_addr, server_name, server_port, CUPS_RAND() & 255,
    
  •  CUPS_RAND() & 255, CUPS_RAND() & 255, CUPS_RAND() & 255,
    
  •  CUPS_RAND() & 255, CUPS_RAND() & 255, CUPS_RAND() & 255,
    
  •  CUPS_RAND() & 255);
    
  • _cupsMD5Init(&md5);
  • _cupsMD5Append(&md5, (unsigned char *)buffer, (int)strlen(buffer));
  • _cupsMD5Finish(&md5, sum);
  • cgiSetCookie(CUPS_SID, httpMD5String(sum, sid), "/", server_name, 0, 0);
  • return (cupsGetOption(CUPS_SID, num_cookies, cookies));
    +}

+/*

  • 'cgi_sort_variables()' - Sort all form variables for faster lookup.
    */
Collaborator

michaelrsweet commented Apr 29, 2010

"str3498-1.3.patch":

Index: templates/add-printer.tmpl

--- templates/add-printer.tmpl (revision 2066)
+++ templates/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {device_uri?:}

Index: templates/choose-model.tmpl

--- templates/choose-model.tmpl (revision 2066)
+++ templates/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/ja/add-printer.tmpl

--- templates/ja/add-printer.tmpl (revision 2066)
+++ templates/ja/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {device_uri?:}

Index: templates/ja/job-move.tmpl

--- templates/ja/job-move.tmpl (revision 2066)
+++ templates/ja/job-move.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {job_id?:}

Index: templates/ja/choose-model.tmpl

--- templates/ja/choose-model.tmpl (revision 2066)
+++ templates/ja/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/ja/edit-config.tmpl

--- templates/ja/edit-config.tmpl (revision 2066)
+++ templates/ja/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

���設�����

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/ja/add-class.tmpl

--- templates/ja/add-class.tmpl (revision 2066)
+++ templates/ja/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

����追�

Index: templates/ja/choose-serial.tmpl

--- templates/ja/choose-serial.tmpl (revision 2066)
+++ templates/ja/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/ja/samba-export.tmpl

--- templates/ja/samba-export.tmpl (revision 2066)
+++ templates/ja/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

����� Samba �������

Index: templates/ja/modify-printer.tmpl

--- templates/ja/modify-printer.tmpl (revision 2066)
+++ templates/ja/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/ja/choose-device.tmpl

--- templates/ja/choose-device.tmpl (revision 2066)
+++ templates/ja/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/ja/choose-uri.tmpl

--- templates/ja/choose-uri.tmpl (revision 2066)
+++ templates/ja/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/ja/add-rss-subscription.tmpl

--- templates/ja/add-rss-subscription.tmpl (revision 2066)
+++ templates/ja/add-rss-subscription.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

RSS 購読�追�

Index: templates/ja/admin.tmpl

--- templates/ja/admin.tmpl (revision 2066)
+++ templates/ja/admin.tmpl (revision 2067)
@@ -53,6 +53,7 @@

{SETTINGS_ERROR}
: +

�����設�:

Index: templates/ja/modify-class.tmpl

--- templates/ja/modify-class.tmpl (revision 2066)
+++ templates/ja/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

��� {printer_name} ���

Index: templates/ja/choose-make.tmpl

--- templates/ja/choose-make.tmpl (revision 2066)
+++ templates/ja/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/ja/users.tmpl

--- templates/ja/users.tmpl (revision 2066)
+++ templates/ja/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: templates/fr/add-printer.tmpl

--- templates/fr/add-printer.tmpl (revision 2066)
+++ templates/fr/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {device_uri?:}

Index: templates/fr/job-move.tmpl

--- templates/fr/job-move.tmpl (revision 2066)
+++ templates/fr/job-move.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {job_id?:}

Index: templates/fr/choose-model.tmpl

--- templates/fr/choose-model.tmpl (revision 2066)
+++ templates/fr/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/fr/edit-config.tmpl

--- templates/fr/edit-config.tmpl (revision 2066)
+++ templates/fr/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

Ficher de configuration du serveur

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/fr/set-printer-options-header.tmpl

--- templates/fr/set-printer-options-header.tmpl (revision 2066)
+++ templates/fr/set-printer-options-header.tmpl (revision 2067)
@@ -1,3 +1,4 @@

+

Index: templates/fr/add-class.tmpl

--- templates/fr/add-class.tmpl (revision 2066)
+++ templates/fr/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Ajouter une classe

Index: templates/fr/choose-serial.tmpl

--- templates/fr/choose-serial.tmpl (revision 2066)
+++ templates/fr/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/fr/samba-export.tmpl

--- templates/fr/samba-export.tmpl (revision 2066)
+++ templates/fr/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Exporter des imprimantes vers SAMBA

Index: templates/fr/modify-printer.tmpl

--- templates/fr/modify-printer.tmpl (revision 2066)
+++ templates/fr/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/fr/choose-device.tmpl

--- templates/fr/choose-device.tmpl (revision 2066)
+++ templates/fr/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/fr/choose-uri.tmpl

--- templates/fr/choose-uri.tmpl (revision 2066)
+++ templates/fr/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/fr/admin.tmpl

--- templates/fr/admin.tmpl (revision 2066)
+++ templates/fr/admin.tmpl (revision 2067)
@@ -55,6 +55,7 @@

{SETTINGS_ERROR}
: +

Paramètres de base du serveur :

Index: templates/fr/modify-class.tmpl

--- templates/fr/modify-class.tmpl (revision 2066)
+++ templates/fr/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Modifier la classe {printer_name}

Index: templates/fr/choose-make.tmpl

--- templates/fr/choose-make.tmpl (revision 2066)
+++ templates/fr/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/fr/users.tmpl

--- templates/fr/users.tmpl (revision 2066)
+++ templates/fr/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: templates/samba-export.tmpl

--- templates/samba-export.tmpl (revision 2066)
+++ templates/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Export Printers to Samba

Index: templates/modify-printer.tmpl

--- templates/modify-printer.tmpl (revision 2066)
+++ templates/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/choose-device.tmpl

--- templates/choose-device.tmpl (revision 2066)
+++ templates/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/zh_TW/add-printer.tmpl

--- templates/zh_TW/add-printer.tmpl (revision 2066)
+++ templates/zh_TW/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

�����表�

Index: templates/zh_TW/job-move.tmpl

--- templates/zh_TW/job-move.tmpl (revision 2066)
+++ templates/zh_TW/job-move.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {job_id?:}

Index: templates/zh_TW/choose-model.tmpl

--- templates/zh_TW/choose-model.tmpl (revision 2066)
+++ templates/zh_TW/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/zh_TW/edit-config.tmpl

--- templates/zh_TW/edit-config.tmpl (revision 2066)
+++ templates/zh_TW/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

伺���置��

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/zh_TW/set-printer-options-header.tmpl

--- templates/zh_TW/set-printer-options-header.tmpl (revision 2066)
+++ templates/zh_TW/set-printer-options-header.tmpl (revision 2067)
@@ -1,3 +1,4 @@

+

Index: templates/zh_TW/add-class.tmpl

--- templates/zh_TW/add-class.tmpl (revision 2066)
+++ templates/zh_TW/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

����

Index: templates/zh_TW/choose-serial.tmpl

--- templates/zh_TW/choose-serial.tmpl (revision 2066)
+++ templates/zh_TW/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/zh_TW/samba-export.tmpl

--- templates/zh_TW/samba-export.tmpl (revision 2066)
+++ templates/zh_TW/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

���表�� Samba

Index: templates/zh_TW/modify-printer.tmpl

--- templates/zh_TW/modify-printer.tmpl (revision 2066)
+++ templates/zh_TW/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/zh_TW/choose-device.tmpl

--- templates/zh_TW/choose-device.tmpl (revision 2066)
+++ templates/zh_TW/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/zh_TW/choose-uri.tmpl

--- templates/zh_TW/choose-uri.tmpl (revision 2066)
+++ templates/zh_TW/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/zh_TW/admin.tmpl

--- templates/zh_TW/admin.tmpl (revision 2066)
+++ templates/zh_TW/admin.tmpl (revision 2067)
@@ -59,6 +59,7 @@

{SETTINGS_ERROR}
: +

��伺��設���

Index: templates/zh_TW/modify-class.tmpl

--- templates/zh_TW/modify-class.tmpl (revision 2066)
+++ templates/zh_TW/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

修��� {printer_name}

Index: templates/zh_TW/choose-make.tmpl

--- templates/zh_TW/choose-make.tmpl (revision 2066)
+++ templates/zh_TW/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/zh_TW/users.tmpl

--- templates/zh_TW/users.tmpl (revision 2066)
+++ templates/zh_TW/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: templates/admin.tmpl

--- templates/admin.tmpl (revision 2066)
+++ templates/admin.tmpl (revision 2067)
@@ -55,6 +55,7 @@

{SETTINGS_ERROR}
: +

Basic Server Settings:

Index: templates/modify-class.tmpl

--- templates/modify-class.tmpl (revision 2066)
+++ templates/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Modify Class {printer_name}

Index: templates/choose-make.tmpl

--- templates/choose-make.tmpl (revision 2066)
+++ templates/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/users.tmpl

--- templates/users.tmpl (revision 2066)
+++ templates/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: templates/sv/add-printer.tmpl

--- templates/sv/add-printer.tmpl (revision 2066)
+++ templates/sv/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {device_uri?:}

Index: templates/sv/job-move.tmpl

--- templates/sv/job-move.tmpl (revision 2066)
+++ templates/sv/job-move.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {job_id?:}

Index: templates/sv/choose-model.tmpl

--- templates/sv/choose-model.tmpl (revision 2066)
+++ templates/sv/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/sv/edit-config.tmpl

--- templates/sv/edit-config.tmpl (revision 2066)
+++ templates/sv/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

Serverkonfigurationsfil

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/sv/set-printer-options-header.tmpl

--- templates/sv/set-printer-options-header.tmpl (revision 2066)
+++ templates/sv/set-printer-options-header.tmpl (revision 2067)
@@ -1,3 +1,4 @@

+

Index: templates/sv/add-class.tmpl

--- templates/sv/add-class.tmpl (revision 2066)
+++ templates/sv/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Lägg till klass

Index: templates/sv/choose-serial.tmpl

--- templates/sv/choose-serial.tmpl (revision 2066)
+++ templates/sv/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/sv/samba-export.tmpl

--- templates/sv/samba-export.tmpl (revision 2066)
+++ templates/sv/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Exportera skrivare till Samba

Index: templates/sv/modify-printer.tmpl

--- templates/sv/modify-printer.tmpl (revision 2066)
+++ templates/sv/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/sv/choose-device.tmpl

--- templates/sv/choose-device.tmpl (revision 2066)
+++ templates/sv/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/sv/choose-uri.tmpl

--- templates/sv/choose-uri.tmpl (revision 2066)
+++ templates/sv/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/sv/admin.tmpl

--- templates/sv/admin.tmpl (revision 2066)
+++ templates/sv/admin.tmpl (revision 2067)
@@ -59,6 +59,7 @@

{SETTINGS_ERROR}
: +

Grundläggande serverinställningar:

Index: templates/sv/modify-class.tmpl

--- templates/sv/modify-class.tmpl (revision 2066)
+++ templates/sv/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Modifiera klass {printer_name}

Index: templates/sv/choose-make.tmpl

--- templates/sv/choose-make.tmpl (revision 2066)
+++ templates/sv/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/sv/users.tmpl

--- templates/sv/users.tmpl (revision 2066)
+++ templates/sv/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: templates/de/add-printer.tmpl

--- templates/de/add-printer.tmpl (revision 2066)
+++ templates/de/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {device_uri?:}

Index: templates/de/choose-model.tmpl

--- templates/de/choose-model.tmpl (revision 2066)
+++ templates/de/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/de/samba-export.tmpl

--- templates/de/samba-export.tmpl (revision 2066)
+++ templates/de/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Exportiere Drucker für Samba

Index: templates/de/modify-printer.tmpl

--- templates/de/modify-printer.tmpl (revision 2066)
+++ templates/de/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/de/choose-device.tmpl

--- templates/de/choose-device.tmpl (revision 2066)
+++ templates/de/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/de/admin.tmpl

--- templates/de/admin.tmpl (revision 2066)
+++ templates/de/admin.tmpl (revision 2067)
@@ -55,6 +55,7 @@

{SETTINGS_ERROR}
: +

Grundlegende Servereinstellungen:

Index: templates/de/modify-class.tmpl

--- templates/de/modify-class.tmpl (revision 2066)
+++ templates/de/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Klasse {printer_name} ändern

Index: templates/de/choose-make.tmpl

--- templates/de/choose-make.tmpl (revision 2066)
+++ templates/de/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/de/users.tmpl

--- templates/de/users.tmpl (revision 2066)
+++ templates/de/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: templates/de/job-move.tmpl

--- templates/de/job-move.tmpl (revision 2066)
+++ templates/de/job-move.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {job_id?:}

Index: templates/de/edit-config.tmpl

--- templates/de/edit-config.tmpl (revision 2066)
+++ templates/de/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

Server Konfigurationsdatei

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/de/add-class.tmpl

--- templates/de/add-class.tmpl (revision 2066)
+++ templates/de/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Klasse hinzufügen

Index: templates/de/set-printer-options-header.tmpl

--- templates/de/set-printer-options-header.tmpl (revision 2066)
+++ templates/de/set-printer-options-header.tmpl (revision 2067)
@@ -1,3 +1,4 @@

+

Index: templates/de/choose-serial.tmpl

--- templates/de/choose-serial.tmpl (revision 2066)
+++ templates/de/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/de/choose-uri.tmpl

--- templates/de/choose-uri.tmpl (revision 2066)
+++ templates/de/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/de/add-rss-subscription.tmpl

--- templates/de/add-rss-subscription.tmpl (revision 2066)
+++ templates/de/add-rss-subscription.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

RSS Subskription hinzufügen

Index: templates/job-move.tmpl

--- templates/job-move.tmpl (revision 2066)
+++ templates/job-move.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {job_id?:}

Index: templates/he/add-printer.tmpl

--- templates/he/add-printer.tmpl (revision 2066)
+++ templates/he/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

��סף ��פסת ��ש�

Index: templates/he/job-move.tmpl

--- templates/he/job-move.tmpl (revision 2066)
+++ templates/he/job-move.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {job_id?:}

Index: templates/he/choose-model.tmpl

--- templates/he/choose-model.tmpl (revision 2066)
+++ templates/he/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/he/edit-config.tmpl

--- templates/he/edit-config.tmpl (revision 2066)
+++ templates/he/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

ק��ץ ���ר�ת ש� �שרת

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25" dir=ltr>{CUPSDCONF}</TEXTAREA>

Index: templates/he/set-printer-options-header.tmpl

--- templates/he/set-printer-options-header.tmpl (revision 2066)
+++ templates/he/set-printer-options-header.tmpl (revision 2067)
@@ -1,3 +1,4 @@

+

Index: templates/he/add-class.tmpl

--- templates/he/add-class.tmpl (revision 2066)
+++ templates/he/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

��סף ���ק�

Index: templates/he/choose-serial.tmpl

--- templates/he/choose-serial.tmpl (revision 2066)
+++ templates/he/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/he/samba-export.tmpl

--- templates/he/samba-export.tmpl (revision 2066)
+++ templates/he/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

��צ� ��פס�ת � Samba

Index: templates/he/modify-printer.tmpl

--- templates/he/modify-printer.tmpl (revision 2066)
+++ templates/he/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/he/choose-device.tmpl

--- templates/he/choose-device.tmpl (revision 2066)
+++ templates/he/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/he/choose-uri.tmpl

--- templates/he/choose-uri.tmpl (revision 2066)
+++ templates/he/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/he/admin.tmpl

--- templates/he/admin.tmpl (revision 2066)
+++ templates/he/admin.tmpl (revision 2067)
@@ -59,6 +59,7 @@

{SETTINGS_ERROR}
: +

���ר�ת שרת �ס�ס��ת:

Index: templates/he/modify-class.tmpl

--- templates/he/modify-class.tmpl (revision 2066)
+++ templates/he/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

שנ� ���ק� {printer_name}

Index: templates/he/choose-make.tmpl

--- templates/he/choose-make.tmpl (revision 2066)
+++ templates/he/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/he/users.tmpl

--- templates/he/users.tmpl (revision 2066)
+++ templates/he/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: templates/edit-config.tmpl

--- templates/edit-config.tmpl (revision 2066)
+++ templates/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

Server Configuration File

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/set-printer-options-header.tmpl

--- templates/set-printer-options-header.tmpl (revision 2066)
+++ templates/set-printer-options-header.tmpl (revision 2067)
@@ -1,3 +1,4 @@

+

Index: templates/add-class.tmpl

--- templates/add-class.tmpl (revision 2066)
+++ templates/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Add Class

Index: templates/choose-serial.tmpl

--- templates/choose-serial.tmpl (revision 2066)
+++ templates/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/pl/add-printer.tmpl

--- templates/pl/add-printer.tmpl (revision 2066)
+++ templates/pl/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {device_uri?:}

Index: templates/pl/job-move.tmpl

--- templates/pl/job-move.tmpl (revision 2066)
+++ templates/pl/job-move.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {job_id?:}

Index: templates/pl/choose-model.tmpl

--- templates/pl/choose-model.tmpl (revision 2066)
+++ templates/pl/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/pl/edit-config.tmpl

--- templates/pl/edit-config.tmpl (revision 2066)
+++ templates/pl/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

Plik Konfiguracji Serwera

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/pl/set-printer-options-header.tmpl

--- templates/pl/set-printer-options-header.tmpl (revision 2066)
+++ templates/pl/set-printer-options-header.tmpl (revision 2067)
@@ -1,3 +1,4 @@

+

Index: templates/pl/add-class.tmpl

--- templates/pl/add-class.tmpl (revision 2066)
+++ templates/pl/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Dodaj klas�

Index: templates/pl/choose-serial.tmpl

--- templates/pl/choose-serial.tmpl (revision 2066)
+++ templates/pl/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/pl/samba-export.tmpl

--- templates/pl/samba-export.tmpl (revision 2066)
+++ templates/pl/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Wyeksportuj drukarki do Samby

Index: templates/pl/modify-printer.tmpl

--- templates/pl/modify-printer.tmpl (revision 2066)
+++ templates/pl/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/pl/choose-device.tmpl

--- templates/pl/choose-device.tmpl (revision 2066)
+++ templates/pl/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/pl/choose-uri.tmpl

--- templates/pl/choose-uri.tmpl (revision 2066)
+++ templates/pl/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/pl/admin.tmpl

--- templates/pl/admin.tmpl (revision 2066)
+++ templates/pl/admin.tmpl (revision 2067)
@@ -57,6 +57,7 @@

{SETTINGS_ERROR}
: +

Podstawowe ustawienia serwera:

Index: templates/pl/modify-class.tmpl

--- templates/pl/modify-class.tmpl (revision 2066)
+++ templates/pl/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Zmodyfikuj klas� {printer_name}

Index: templates/pl/choose-make.tmpl

--- templates/pl/choose-make.tmpl (revision 2066)
+++ templates/pl/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/pl/users.tmpl

--- templates/pl/users.tmpl (revision 2066)
+++ templates/pl/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: templates/choose-uri.tmpl

--- templates/choose-uri.tmpl (revision 2066)
+++ templates/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/add-rss-subscription.tmpl

--- templates/add-rss-subscription.tmpl (revision 2066)
+++ templates/add-rss-subscription.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Add RSS Subscription

Index: templates/id/add-printer.tmpl

--- templates/id/add-printer.tmpl (revision 2066)
+++ templates/id/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {device_uri?:}

Index: templates/id/choose-model.tmpl

--- templates/id/choose-model.tmpl (revision 2066)
+++ templates/id/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/id/samba-export.tmpl

--- templates/id/samba-export.tmpl (revision 2066)
+++ templates/id/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Mengekspor Pencetak melalui Samba

Index: templates/id/modify-printer.tmpl

--- templates/id/modify-printer.tmpl (revision 2066)
+++ templates/id/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/id/choose-device.tmpl

--- templates/id/choose-device.tmpl (revision 2066)
+++ templates/id/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/id/admin.tmpl

--- templates/id/admin.tmpl (revision 2066)
+++ templates/id/admin.tmpl (revision 2067)
@@ -53,6 +53,7 @@

{SETTINGS_ERROR}
: +

Pengaturan Dasar Server:

Index: templates/id/modify-class.tmpl

--- templates/id/modify-class.tmpl (revision 2066)
+++ templates/id/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Mengubah Kelas {printer_name}

Index: templates/id/choose-make.tmpl

--- templates/id/choose-make.tmpl (revision 2066)
+++ templates/id/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+
Collaborator

michaelrsweet commented Apr 29, 2010

Index: templates/id/users.tmpl

--- templates/id/users.tmpl (revision 2066)
+++ templates/id/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: templates/id/job-move.tmpl

--- templates/id/job-move.tmpl (revision 2066)
+++ templates/id/job-move.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {job_id?:}

Index: templates/id/edit-config.tmpl

--- templates/id/edit-config.tmpl (revision 2066)
+++ templates/id/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

Berkas Konfigurasi Server

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/id/add-class.tmpl

--- templates/id/add-class.tmpl (revision 2066)
+++ templates/id/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Tambah Kelas

Index: templates/id/set-printer-options-header.tmpl

--- templates/id/set-printer-options-header.tmpl (revision 2066)
+++ templates/id/set-printer-options-header.tmpl (revision 2067)
@@ -1,3 +1,4 @@

+

Index: templates/id/choose-serial.tmpl

--- templates/id/choose-serial.tmpl (revision 2066)
+++ templates/id/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/id/choose-uri.tmpl

--- templates/id/choose-uri.tmpl (revision 2066)
+++ templates/id/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/id/add-rss-subscription.tmpl

--- templates/id/add-rss-subscription.tmpl (revision 2066)
+++ templates/id/add-rss-subscription.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Tambah Berlangganan RSS

Index: templates/es/add-printer.tmpl

--- templates/es/add-printer.tmpl (revision 2066)
+++ templates/es/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {device_uri?:}

Index: templates/es/choose-model.tmpl

--- templates/es/choose-model.tmpl (revision 2066)
+++ templates/es/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/es/samba-export.tmpl

--- templates/es/samba-export.tmpl (revision 2066)
+++ templates/es/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Exportar impresoras a Samba

Index: templates/es/modify-printer.tmpl

--- templates/es/modify-printer.tmpl (revision 2066)
+++ templates/es/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/es/choose-device.tmpl

--- templates/es/choose-device.tmpl (revision 2066)
+++ templates/es/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/es/admin.tmpl

--- templates/es/admin.tmpl (revision 2066)
+++ templates/es/admin.tmpl (revision 2067)
@@ -55,6 +55,7 @@

{SETTINGS_ERROR}
: +

Configuración básica del servidor:

Index: templates/es/modify-class.tmpl

--- templates/es/modify-class.tmpl (revision 2066)
+++ templates/es/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Modificar clase {printer_name}

Index: templates/es/choose-make.tmpl

--- templates/es/choose-make.tmpl (revision 2066)
+++ templates/es/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/es/users.tmpl

--- templates/es/users.tmpl (revision 2066)
+++ templates/es/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: templates/es/job-move.tmpl

--- templates/es/job-move.tmpl (revision 2066)
+++ templates/es/job-move.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {job_id?:}

Index: templates/es/edit-config.tmpl

--- templates/es/edit-config.tmpl (revision 2066)
+++ templates/es/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

Archivo de configuración del servidor

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/es/add-class.tmpl

--- templates/es/add-class.tmpl (revision 2066)
+++ templates/es/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Añadir clase

Index: templates/es/set-printer-options-header.tmpl

--- templates/es/set-printer-options-header.tmpl (revision 2066)
+++ templates/es/set-printer-options-header.tmpl (revision 2067)
@@ -1,3 +1,4 @@

+

Index: templates/es/choose-serial.tmpl

--- templates/es/choose-serial.tmpl (revision 2066)
+++ templates/es/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/es/choose-uri.tmpl

--- templates/es/choose-uri.tmpl (revision 2066)
+++ templates/es/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/es/add-rss-subscription.tmpl

--- templates/es/add-rss-subscription.tmpl (revision 2066)
+++ templates/es/add-rss-subscription.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Añadir subscripción RSS

Index: templates/et/add-printer.tmpl

--- templates/et/add-printer.tmpl (revision 2066)
+++ templates/et/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {device_uri?:}

Index: templates/et/choose-model.tmpl

--- templates/et/choose-model.tmpl (revision 2066)
+++ templates/et/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/et/edit-config.tmpl

--- templates/et/edit-config.tmpl (revision 2066)
+++ templates/et/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

Serveri seadistustefail

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/et/set-printer-options-header.tmpl

--- templates/et/set-printer-options-header.tmpl (revision 2066)
+++ templates/et/set-printer-options-header.tmpl (revision 2067)
@@ -1,3 +1,4 @@

+

Index: templates/et/add-class.tmpl

--- templates/et/add-class.tmpl (revision 2066)
+++ templates/et/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Klassi lisamine

Index: templates/et/choose-serial.tmpl

--- templates/et/choose-serial.tmpl (revision 2066)
+++ templates/et/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/et/samba-export.tmpl

--- templates/et/samba-export.tmpl (revision 2066)
+++ templates/et/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Printerite eksport Sambasse

Index: templates/et/modify-printer.tmpl

--- templates/et/modify-printer.tmpl (revision 2066)
+++ templates/et/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/et/choose-device.tmpl

--- templates/et/choose-device.tmpl (revision 2066)
+++ templates/et/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/et/choose-uri.tmpl

--- templates/et/choose-uri.tmpl (revision 2066)
+++ templates/et/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/et/admin.tmpl

--- templates/et/admin.tmpl (revision 2066)
+++ templates/et/admin.tmpl (revision 2067)
@@ -59,6 +59,7 @@

{SETTINGS_ERROR}
: +

Serveri põhiseadistused:

Index: templates/et/modify-class.tmpl

--- templates/et/modify-class.tmpl (revision 2066)
+++ templates/et/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Klassi {printer_name} muutmine

Index: templates/et/choose-make.tmpl

--- templates/et/choose-make.tmpl (revision 2066)
+++ templates/et/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/et/users.tmpl

--- templates/et/users.tmpl (revision 2066)
+++ templates/et/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: templates/it/add-printer.tmpl

--- templates/it/add-printer.tmpl (revision 2066)
+++ templates/it/add-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {device_uri?:}

Index: templates/it/job-move.tmpl

--- templates/it/job-move.tmpl (revision 2066)
+++ templates/it/job-move.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {job_id?:}

Index: templates/it/choose-model.tmpl

--- templates/it/choose-model.tmpl (revision 2066)
+++ templates/it/choose-model.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/it/edit-config.tmpl

--- templates/it/edit-config.tmpl (revision 2066)
+++ templates/it/edit-config.tmpl (revision 2067)
@@ -8,7 +8,7 @@

File di configurazione del server

+

<TEXTAREA NAME="CUPSDCONF" COLS="80" ROWS="25">{CUPSDCONF}</TEXTAREA>

Index: templates/it/set-printer-options-header.tmpl

--- templates/it/set-printer-options-header.tmpl (revision 2066)
+++ templates/it/set-printer-options-header.tmpl (revision 2067)
@@ -1,3 +1,4 @@

+

Index: templates/it/add-class.tmpl

--- templates/it/add-class.tmpl (revision 2066)
+++ templates/it/add-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Aggiungi classe

Index: templates/it/choose-serial.tmpl

--- templates/it/choose-serial.tmpl (revision 2066)
+++ templates/it/choose-serial.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/it/samba-export.tmpl

--- templates/it/samba-export.tmpl (revision 2066)
+++ templates/it/samba-export.tmpl (revision 2067)
@@ -10,6 +10,7 @@
--></SCRIPT>

+

Esporta stampanti su Samba

Index: templates/it/modify-printer.tmpl

--- templates/it/modify-printer.tmpl (revision 2066)
+++ templates/it/modify-printer.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {?device_uri=?:} {?printer_make_and_model=?:}

Index: templates/it/choose-device.tmpl

--- templates/it/choose-device.tmpl (revision 2066)
+++ templates/it/choose-device.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/it/choose-uri.tmpl

--- templates/it/choose-uri.tmpl (revision 2066)
+++ templates/it/choose-uri.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/it/admin.tmpl

--- templates/it/admin.tmpl (revision 2066)
+++ templates/it/admin.tmpl (revision 2067)
@@ -59,6 +59,7 @@

{SETTINGS_ERROR}
: +

Impostazioni di base del server:

Index: templates/it/modify-class.tmpl

--- templates/it/modify-class.tmpl (revision 2066)
+++ templates/it/modify-class.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Modifica classe {printer_name}

Index: templates/it/choose-make.tmpl

--- templates/it/choose-make.tmpl (revision 2066)
+++ templates/it/choose-make.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+

Index: templates/it/users.tmpl

--- templates/it/users.tmpl (revision 2066)
+++ templates/it/users.tmpl (revision 2067)
@@ -1,4 +1,5 @@

+ {IS_CLASS?:}

Index: cgi-bin/cgi.h

--- cgi-bin/cgi.h (revision 2066)
+++ cgi-bin/cgi.h (revision 2067)
@@ -3,7 +3,7 @@
*

  • CGI support library definitions.
  • * Copyright 2007 by Apple Inc.
  • * Copyright 2007-2010 by Apple Inc.
  • Copyright 1997-2006 by Easy Software Products.
  • These coded instructions, statements, and computer programs are the
    @@ -64,7 +64,7 @@
    extern void cgiFreeSearch(void *search);
    extern const char *cgiGetArray(const char *name, int element);
    extern void cgiGetAttributes(ipp_t *request, const char *tmpl);
    -extern char *cgiGetCookie(const char *name, char *buf, int buflen);
    +extern const char *cgiGetCookie(const char *name);
    extern const cgi_file_t *cgiGetFile(void);
    extern cups_array_t *cgiGetIPPObjects(ipp_t *response, void *search);
    extern int cgiGetSize(const char *name);

Index: cgi-bin/template.c

--- cgi-bin/template.c (revision 2066)
+++ cgi-bin/template.c (revision 2067)
@@ -257,7 +257,7 @@
uriencode = 0;

 for (s = name; (ch = getc(in)) != EOF;)
  •    if (strchr("}]<>=! \t\n", ch))
    
  •    if (strchr("}]<>=!~ \t\n", ch))
    

    break;
    else if (s == name && ch == '%')
    uriencode = 1;
    @@ -367,6 +367,20 @@

    continue;
    }

  •  else if (name[0] == '$')
    
  •  {
    
  •   /*
    
  •    \* Insert cookie value or nothing if not defined.
    
  • */

  •    if ((value = cgiGetCookie(name + 1)) != NULL)
    
  • outptr = value;
    
  • else
  • {
  • outval[0] = '\0';
    
  • outptr    = outval;
    
  • }
  •  }
    
    else
    {
    /*
    @@ -434,7 +448,14 @@
    • Test for existance...
      */
  •    result     = cgiGetArray(name, element) != NULL && outptr[0];
    
  •    if (name[0] == '?')
    
  • result = cgiGetArray(name + 1, element) != NULL;
    
  • else if (name[0] == '#')
  • result = cgiGetVariable(name + 1) != NULL;
    
  •    else
    
  •      result = cgiGetArray(name, element) != NULL;
    
  • result = result && outptr[0];
    compare[0] = '\0';
    }
    else

Index: cgi-bin/ipp-var.c

--- cgi-bin/ipp-var.c (revision 2066)
+++ cgi-bin/ipp-var.c (revision 2067)
@@ -113,7 +113,7 @@
*/

 for (nameptr = name; (ch = getc(in)) != EOF;)
  •    if (strchr("}]<>=! \t\n", ch))
    
  •    if (strchr("}]<>=!~ \t\n", ch))
       break;
     else if (nameptr > name && ch == '?')
    

    break;
    Index: cgi-bin/admin.c

    --- cgi-bin/admin.c (revision 2066)
    +++ cgi-bin/admin.c (revision 2067)
    @@ -3,7 +3,7 @@
    *

    • Administration CGI for the Common UNIX Printing System (CUPS).
  • * Copyright 2007-2008 by Apple Inc.

    • Copyright 2007-2010 by Apple Inc.
    • Copyright 1997-2007 by Easy Software Products.
    • These coded instructions, statements, and computer programs are the
      @@ -110,7 +110,7 @@
    • See if we have form data...
      */
  • if (!cgiInitialize())

  • if (!cgiInitialize() || !cgiGetVariable("OP"))
    {
    /*

  • Nope, send the administration menu...
    Index: cgi-bin/var.c

    --- cgi-bin/var.c (revision 2066)
    +++ cgi-bin/var.c (revision 2067)
    @@ -3,7 +3,7 @@
    *

    • CGI form variable and array functions.
  • * Copyright 2007-2008 by Apple Inc.

    • Copyright 2007-2010 by Apple Inc.
    • Copyright 1997-2005 by Easy Software Products.
    • These coded instructions, statements, and computer programs are the
      @@ -40,9 +40,17 @@
      /#define DEBUG/
      #include "cgi-private.h"
      #include <errno.h>
      +#include <cups/md5.h>

    /*

  • * Session ID name

  • /
    +
    +#define CUPS_SID "org.cups.sid"
    +
    +
    +/

    • Data structure to hold all the CGI form variables and arrays...
      */

@@ -59,6 +67,8 @@

  • Local globals...
    */

+static int num_cookies = 0;/* Number of cookies /
+static cups_option_t *cookies = NULL;/
Cookies /
static int form_count = 0, /
Form variable count /
form_alloc = 0; /
Number of variables allocated */
static _cgi_var_t *form_vars = NULL;
@@ -76,11 +86,13 @@
static int cgi_compare_variables(const _cgi_var_t *v1,
const _cgi_var_t *v2);
static _cgi_var_t *cgi_find_variable(const char *name);
+static void cgi_initialize_cookies(void);
static int cgi_initialize_get(void);
static int cgi_initialize_multipart(const char *boundary);
static int cgi_initialize_post(void);
static int cgi_initialize_string(const char *data);
static const char *cgi_passwd(const char *prompt);
+static const char *cgi_set_sid(void);
static void cgi_sort_variables(void);
static void cgi_unlink_file(void);

@@ -185,6 +197,17 @@

/*

  • * 'cgiGetCookie()' - Get a cookie value.
  • /
    +
    +const char * /
    O - Value or NULL /
    +cgiGetCookie(const char *name) /
    I - Name of cookie */
    +{
  • return (cupsGetOption(name, num_cookies, cookies));
    +}

+/*

  • 'cgiGetFile()' - Get the file (if any) that was submitted in the form.
    */

@@ -248,6 +271,8 @@
{
const char method; / Form posting method /
const char *content_type; /
Content-Type of post data */

  • const char cups_sid_cookie, / SID cookie */

  •   *cups_sid_form;     /* SID form variable */
    

    /*
    @@ -272,6 +297,20 @@
    #endif /* DEBUG */

    /*

  • * Get cookies...

  • */

  • cgi_initialize_cookies();
  • if ((cups_sid_cookie = cgiGetCookie(CUPS_SID)) == NULL)
  • {
  • fputs("DEBUG: " CUPS_SID " cookie not found, initializing!\n", stderr);
  • cups_sid_cookie = cgi_set_sid();
  • }
  • fprintf(stderr, "DEBUG: " CUPS_SID " cookie is "%s"\n", cups_sid_cookie);
  • /*
    • Get the request method (GET or POST)...
      */

@@ -294,9 +333,27 @@
boundary += 9;

 if (content_type && !strncmp(content_type, "multipart/form-data; ", 21))
  •  return (cgi_initialize_multipart(boundary));
    
  • {
  •  if (!cgi_initialize_multipart(boundary))
    
  •    return (0);
    
  • }
  • else if (!cgi_initialize_post())
  •  return (0);
    
  • if ((cups_sid_form = cgiGetVariable(CUPS_SID)) == NULL ||
  • strcmp(cups_sid_cookie, cups_sid_form))
  • {
  •  if (cups_sid_form)
    
  • fprintf(stderr, "DEBUG: " CUPS_SID " form variable is "%s"\n",
  •       cups_sid_form);
    
  •  else
    
  • fputs("DEBUG: " CUPS_SID " form variable is not present.\n", stderr);
  •  cgiClearVariables();
    
  •  return (0);
    
  • }
    else

  •  return (cgi_initialize_post());
    
  •  return (1);
    

    }
    else
    return (0);
    @@ -375,6 +432,38 @@

    /*

  • * 'cgiSetCookie()' - Set a cookie value.

  • /
    +
    +void
    +cgiSetCookie(const char *name, /
    I - Name */

  •         const char _value,        /_ I - Value */
    
  •         const char _path,     /_ I - Path (typically "/") */
    
  •    const char _domain,    /_ I - Domain name */
    
  •    time_t     expires,    /\* I - Expiration date (0 for session) */
    
  •    int        secure)     /\* I - Require SSL */
    

    +{

  • num_cookies = cupsAddOption(name, value, num_cookies, &cookies);

  • printf("Set-Cookie: %s=%s", name, value);
  • if (path)
  • printf("; path=%s", path);
  • if (domain)
  • printf("; domain=%s", domain);
  • if (expires)
  • {
  • char date[256]; /* Date string */
  • printf("; expires=%s", httpGetDateString2(expires, date, sizeof(date)));
  • }
  • if (secure)
  • puts("; secure;");
  • else
  • puts(";");
    +}

+/*

  • 'cgiSetSize()' - Set the array size.
    */

@@ -539,6 +628,96 @@

/*

  • * 'cgi_initialize_cookies()' - Initialize cookies.
  • */
    +
    +static void
    +cgi_initialize_cookies(void)
    +{
  • const char cookie; / HTTP_COOKIE environment variable */
  • char name[128], /* Name string */
  •   value[512],     /\* Value string */
    
  •   _ptr;           /_ Pointer into name/value */
    
  • if ((cookie = getenv("HTTP_COOKIE")) == NULL)
  • {
  • fputs("DEBUG: HTTP_COOKIE not defined.\n", stderr);
  • return;
  • }
  • fprintf(stderr, "DEBUG: HTTP_COOKIE="%s"\n", cookie);
  • while (*cookie)
  • {
  • /*
  • * Skip leading whitespace...
  • */
  • while (isspace(*cookie & 255))
  •  cookie ++;
    
  • if (!*cookie)
  •  break;
    
  • /*
  • * Copy the name...
  • */
  • for (ptr = name; *cookie && *cookie != '=';)
  •  if (ptr < (name + sizeof(name) - 1))
    
  •    *ptr++ = *cookie++;
    
  •  else
    
  •    break;
    
  • if (*cookie != '=')
  •  break;
    
  • *ptr = '\0';
  • cookie ++;
  • /*
  • * Then the value...
  • */
  • if (*cookie == '"')
  • {
  •  for (cookie ++, ptr = value; *cookie && *cookie != '\"';)
    
  •    if (ptr < (value + sizeof(value) - 1))
    
  • *ptr++ = *cookie++;
    
  • else
  • break;
    
  •  if (*cookie == '\"')
    
  •    cookie ++;
    
  • }
  • else
  • {
  •  for (ptr = value; *cookie && *cookie != ';';)
    
  •    if (ptr < (value + sizeof(value) - 1))
    
  • *ptr++ = *cookie++;
    
  • else
  • break;
    
  • }
  • if (*cookie == ';')
  •  cookie ++;
    
  • else if (*cookie)
  •  break;
    
  • *ptr = '\0';
  • /*
  • * Then add the cookie to an array as long as the name doesn't start with
  • * "$"...
  • */
  • if (name[0] != '$')
  •  num_cookies = cupsAddOption(name, value, num_cookies, &cookies);
    
  • }
    +}

+/*

  • 'cgi_initialize_get()' - Initialize form variables using the GET method.
    */

@@ -1024,6 +1203,46 @@

/*

  • * 'cgi_set_sid()' - Set the CUPS session ID.
  • /
    +
    +static const char * /
    O - New session ID */
    +cgi_set_sid(void)
    +{
  • char buffer[512], /* SID data */
  •       sid[33];    /\* SID string */
    
  • _cups_md5_state_t md5; /* MD5 state */
  • unsigned char sum[16]; /* MD5 sum */
  • const char remote_addr, / REMOTE_ADDR */
  •       _server_name,   /_ SERVER_NAME */
    
  •       _server_port;   /_ SERVER_PORT */
    
  • if ((remote_addr = getenv("REMOTE_ADDR")) == NULL)
  • remote_addr = "REMOTE_ADDR";
  • if ((server_name = getenv("SERVER_NAME")) == NULL)
  • server_name = "SERVER_NAME";
  • if ((server_port = getenv("SERVER_PORT")) == NULL)
  • server_port = "SERVER_PORT";
  • srand(time(NULL));
  • snprintf(buffer, sizeof(buffer), "%s:%s:%s:%02X%02X%02X%02X%02X%02X%02X%02X",
  •       remote_addr, server_name, server_port,
    
  •  (unsigned)rand() & 255, (unsigned)rand() & 255,
    
  •  (unsigned)rand() & 255, (unsigned)rand() & 255,
    
  •  (unsigned)rand() & 255, (unsigned)rand() & 255,
    
  •  (unsigned)rand() & 255, (unsigned)rand() & 255);
    
  • _cupsMD5Init(&md5);
  • _cupsMD5Append(&md5, (unsigned char *)buffer, (int)strlen(buffer));
  • _cupsMD5Finish(&md5, sum);
  • cgiSetCookie(CUPS_SID, httpMD5String(sum, sid), "/", server_name, 0, 0);
  • return (cupsGetOption(CUPS_SID, num_cookies, cookies));
    +}

+/*

  • 'cgi_sort_variables()' - Sort all form variables for faster lookup.
    */

Index: scheduler/client.c

--- scheduler/client.c (revision 2066)
+++ scheduler/client.c (revision 2067)
@@ -381,7 +381,9 @@
#ifdef AF_INET6
if (temp.addr.sa_family == AF_INET6)
{

  •  if (HostNameLookups)
    
  •  if (httpAddrLocalhost(&temp))
    
  •    strlcpy(con->servername, "localhost", sizeof(con->servername));
    
  •  else if (HostNameLookups)
     httpAddrLookup(&temp, con->servername, sizeof(con->servername));
    
    else
    httpAddrString(&temp, con->servername, sizeof(con->servername));
    @@ -392,7 +394,9 @@
    #endif /* AF_INET6 */
    if (temp.addr.sa_family == AF_INET)
    {
  •  if (HostNameLookups)
    
  •  if (httpAddrLocalhost(&temp))
    
  •    strlcpy(con->servername, "localhost", sizeof(con->servername));
    
  •  else if (HostNameLookups)
     httpAddrLookup(&temp, con->servername, sizeof(con->servername));
    
    else
    httpAddrString(&temp, con->servername, sizeof(con->servername));

michaelrsweet added this to the Stable milestone Mar 17, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment