diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-09-22 22:13:21 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-09-22 22:13:21 +0000 |
commit | 7cf5915ead7c80b3011a37eaade214568d938f5b (patch) | |
tree | 54222dc1e2b1c447232301c6441769d2364f08b6 /cgi-bin | |
parent | 030ae6a14e49fda8ca30a2c0e065600c3984081a (diff) |
Merge changes from CUPS 1.5svn-r9313.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2683 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cgi-bin')
-rw-r--r-- | cgi-bin/Dependencies | 70 | ||||
-rw-r--r-- | cgi-bin/admin.c | 17 |
2 files changed, 50 insertions, 37 deletions
diff --git a/cgi-bin/Dependencies b/cgi-bin/Dependencies index c8a4e51ba..9a5f11d57 100644 --- a/cgi-bin/Dependencies +++ b/cgi-bin/Dependencies @@ -2,74 +2,74 @@ help-index.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h help-index.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h -help-index.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h +help-index.o: ../cups/array.h ../cups/language.h ../cups/array.h help-index.h help-index.o: ../cups/debug-private.h ../cups/language-private.h help-index.o: ../cups/transcode.h ../cups/string-private.h ../config.h help-index.o: ../cups/dir.h html.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h -html.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h -html.o: ../cups/array.h ../cups/array.h help-index.h ../cups/debug-private.h -html.o: ../cups/language-private.h ../cups/transcode.h -html.o: ../cups/string-private.h ../config.h +html.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h +html.o: ../cups/language.h ../cups/array.h help-index.h +html.o: ../cups/debug-private.h ../cups/language-private.h +html.o: ../cups/transcode.h ../cups/string-private.h ../config.h ipp-var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h -ipp-var.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h -ipp-var.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h +ipp-var.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h +ipp-var.o: ../cups/language.h ../cups/array.h help-index.h ipp-var.o: ../cups/debug-private.h ../cups/language-private.h ipp-var.o: ../cups/transcode.h ../cups/string-private.h ../config.h search.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h -search.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h -search.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h +search.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h +search.o: ../cups/language.h ../cups/array.h help-index.h search.o: ../cups/debug-private.h ../cups/language-private.h search.o: ../cups/transcode.h ../cups/string-private.h ../config.h template.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h -template.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h -template.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h +template.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h +template.o: ../cups/language.h ../cups/array.h help-index.h template.o: ../cups/debug-private.h ../cups/language-private.h template.o: ../cups/transcode.h ../cups/string-private.h ../config.h var.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h -var.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h +var.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h var.o: ../cups/array.h help-index.h ../cups/debug-private.h var.o: ../cups/language-private.h ../cups/transcode.h var.o: ../cups/string-private.h ../config.h ../cups/http.h var.o: ../cups/md5-private.h admin.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h -admin.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h -admin.o: ../cups/array.h ../cups/array.h help-index.h ../cups/debug-private.h -admin.o: ../cups/language-private.h ../cups/transcode.h -admin.o: ../cups/string-private.h ../config.h ../cups/adminutil.h -admin.o: ../cups/cups.h ../cups/ppd.h +admin.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h +admin.o: ../cups/language.h ../cups/array.h help-index.h +admin.o: ../cups/debug-private.h ../cups/language-private.h +admin.o: ../cups/transcode.h ../cups/string-private.h ../config.h +admin.o: ../cups/adminutil.h ../cups/cups.h ../cups/ppd.h classes.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h -classes.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h -classes.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h +classes.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h +classes.o: ../cups/language.h ../cups/array.h help-index.h classes.o: ../cups/debug-private.h ../cups/language-private.h classes.o: ../cups/transcode.h ../cups/string-private.h ../config.h help.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h -help.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h -help.o: ../cups/array.h ../cups/array.h help-index.h ../cups/debug-private.h -help.o: ../cups/language-private.h ../cups/transcode.h -help.o: ../cups/string-private.h ../config.h +help.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h +help.o: ../cups/language.h ../cups/array.h help-index.h +help.o: ../cups/debug-private.h ../cups/language-private.h +help.o: ../cups/transcode.h ../cups/string-private.h ../config.h jobs.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h -jobs.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/language.h -jobs.o: ../cups/array.h ../cups/array.h help-index.h ../cups/debug-private.h -jobs.o: ../cups/language-private.h ../cups/transcode.h -jobs.o: ../cups/string-private.h ../config.h +jobs.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h +jobs.o: ../cups/language.h ../cups/array.h help-index.h +jobs.o: ../cups/debug-private.h ../cups/language-private.h +jobs.o: ../cups/transcode.h ../cups/string-private.h ../config.h makedocset.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h -makedocset.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h +makedocset.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h makedocset.o: ../cups/array.h help-index.h printers.o: cgi-private.h cgi.h ../cups/cups.h ../cups/file.h -printers.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h -printers.o: ../cups/language.h ../cups/array.h ../cups/array.h help-index.h +printers.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h +printers.o: ../cups/language.h ../cups/array.h help-index.h printers.o: ../cups/debug-private.h ../cups/language-private.h printers.o: ../cups/transcode.h ../cups/string-private.h ../config.h testcgi.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h -testcgi.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h +testcgi.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h testcgi.o: ../cups/array.h help-index.h testhi.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h -testhi.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h +testhi.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h testhi.o: ../cups/array.h help-index.h testtemplate.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h -testtemplate.o: ../cups/ipp.h ../cups/http.h ../cups/language.h -testtemplate.o: ../cups/array.h ../cups/array.h help-index.h +testtemplate.o: ../cups/ipp.h ../cups/http.h ../cups/array.h +testtemplate.o: ../cups/language.h ../cups/array.h help-index.h websearch.o: cgi.h ../cups/cups.h ../cups/file.h ../cups/versioning.h -websearch.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h +websearch.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h websearch.o: ../cups/array.h help-index.h diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index b890c8b99..a5250dc10 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -3439,6 +3439,20 @@ do_set_options(http_t *http, /* I - HTTP connection */ i > 0; i --, group ++) { + for (j = group->num_options, option = group->options; + j > 0; + j --, option ++) + { + if (!strcmp(option->keyword, "PageRegion")) + continue; + + if (option->num_choices > 1) + break; + } + + if (j == 0) + continue; + cgiSetVariable("GROUP_ID", group->name); if (!strcmp(group->name, "InstallableOptions")) @@ -3452,7 +3466,7 @@ do_set_options(http_t *http, /* I - HTTP connection */ j > 0; j --, option ++) { - if (!strcmp(option->keyword, "PageRegion")) + if (!strcmp(option->keyword, "PageRegion") || option->num_choices < 2) continue; cgiSetVariable("KEYWORD", option->keyword); @@ -3485,7 +3499,6 @@ do_set_options(http_t *http, /* I - HTTP connection */ { const char *units = NULL; /* Units value, if any */ - cgiSetVariable("ISCUSTOM", "1"); for (cparam = ppdFirstCustomParam(coption), m = 0; |