author | Lars Hjemli <hjemli@gmail.com> | 2008-02-16 12:07:13 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-02-16 12:10:50 (UTC) |
commit | b228d4ff82a65fdcd4a7364759fe36a0bdda5978 (patch) (unidiff) | |
tree | 33b8cc2ff48113f8d7ad3ba88c7ea19a7cac570a /ui-shared.c | |
parent | d14d77fe95c3b6224b40df9b101dded0deea913c (diff) | |
download | cgit-b228d4ff82a65fdcd4a7364759fe36a0bdda5978.zip cgit-b228d4ff82a65fdcd4a7364759fe36a0bdda5978.tar.gz cgit-b228d4ff82a65fdcd4a7364759fe36a0bdda5978.tar.bz2 |
Add all config variables into struct cgit_context
This removes another big set of global variables, and introduces the
cgit_prepare_context() function which populates a context-variable with
compile-time default values.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-shared.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/ui-shared.c b/ui-shared.c index 6a41fb0..b96237d 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -41,18 +41,18 @@ void cgit_print_error(char *msg) | |||
41 | } | 41 | } |
42 | 42 | ||
43 | char *cgit_rooturl() | 43 | char *cgit_rooturl() |
44 | { | 44 | { |
45 | if (cgit_virtual_root) | 45 | if (ctx.cfg.virtual_root) |
46 | return fmt("%s/", cgit_virtual_root); | 46 | return fmt("%s/", ctx.cfg.virtual_root); |
47 | else | 47 | else |
48 | return cgit_script_name; | 48 | return ctx.cfg.script_name; |
49 | } | 49 | } |
50 | 50 | ||
51 | char *cgit_repourl(const char *reponame) | 51 | char *cgit_repourl(const char *reponame) |
52 | { | 52 | { |
53 | if (cgit_virtual_root) { | 53 | if (ctx.cfg.virtual_root) { |
54 | return fmt("%s/%s/", cgit_virtual_root, reponame); | 54 | return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); |
55 | } else { | 55 | } else { |
56 | return fmt("?r=%s", reponame); | 56 | return fmt("?r=%s", reponame); |
57 | } | 57 | } |
58 | } | 58 | } |
@@ -62,10 +62,10 @@ char *cgit_fileurl(const char *reponame, const char *pagename, | |||
62 | { | 62 | { |
63 | char *tmp; | 63 | char *tmp; |
64 | char *delim; | 64 | char *delim; |
65 | 65 | ||
66 | if (cgit_virtual_root) { | 66 | if (ctx.cfg.virtual_root) { |
67 | tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame, | 67 | tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame, |
68 | pagename, (filename ? filename:"")); | 68 | pagename, (filename ? filename:"")); |
69 | delim = "?"; | 69 | delim = "?"; |
70 | } else { | 70 | } else { |
71 | tmp = fmt("?url=%s/%s/%s", reponame, pagename, | 71 | tmp = fmt("?url=%s/%s/%s", reponame, pagename, |
@@ -109,16 +109,16 @@ const char *cgit_repobasename(const char *reponame) | |||
109 | } | 109 | } |
110 | 110 | ||
111 | char *cgit_currurl() | 111 | char *cgit_currurl() |
112 | { | 112 | { |
113 | if (!cgit_virtual_root) | 113 | if (!ctx.cfg.virtual_root) |
114 | return cgit_script_name; | 114 | return ctx.cfg.script_name; |
115 | else if (ctx.qry.page) | 115 | else if (ctx.qry.page) |
116 | return fmt("%s/%s/%s/", cgit_virtual_root, ctx.qry.repo, ctx.qry.page); | 116 | return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page); |
117 | else if (ctx.qry.repo) | 117 | else if (ctx.qry.repo) |
118 | return fmt("%s/%s/", cgit_virtual_root, ctx.qry.repo); | 118 | return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo); |
119 | else | 119 | else |
120 | return fmt("%s/", cgit_virtual_root); | 120 | return fmt("%s/", ctx.cfg.virtual_root); |
121 | } | 121 | } |
122 | 122 | ||
123 | static char *repolink(char *title, char *class, char *page, char *head, | 123 | static char *repolink(char *title, char *class, char *page, char *head, |
124 | char *path) | 124 | char *path) |
@@ -136,11 +136,11 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
136 | html_attr(class); | 136 | html_attr(class); |
137 | html("'"); | 137 | html("'"); |
138 | } | 138 | } |
139 | html(" href='"); | 139 | html(" href='"); |
140 | if (cgit_virtual_root) { | 140 | if (ctx.cfg.virtual_root) { |
141 | html_attr(cgit_virtual_root); | 141 | html_attr(ctx.cfg.virtual_root); |
142 | if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/') | 142 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') |
143 | html("/"); | 143 | html("/"); |
144 | html_attr(cgit_repo->url); | 144 | html_attr(cgit_repo->url); |
145 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') | 145 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') |
146 | html("/"); | 146 | html("/"); |
@@ -150,9 +150,9 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
150 | if (path) | 150 | if (path) |
151 | html_attr(path); | 151 | html_attr(path); |
152 | } | 152 | } |
153 | } else { | 153 | } else { |
154 | html(cgit_script_name); | 154 | html(ctx.cfg.script_name); |
155 | html("?url="); | 155 | html("?url="); |
156 | html_attr(cgit_repo->url); | 156 | html_attr(cgit_repo->url); |
157 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') | 157 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') |
158 | html("/"); | 158 | html("/"); |
@@ -228,13 +228,13 @@ void cgit_log_link(char *name, char *title, char *class, char *head, | |||
228 | 228 | ||
229 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 229 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
230 | char *rev) | 230 | char *rev) |
231 | { | 231 | { |
232 | if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { | 232 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
233 | name[cgit_max_msg_len] = '\0'; | 233 | name[ctx.cfg.max_msg_len] = '\0'; |
234 | name[cgit_max_msg_len - 1] = '.'; | 234 | name[ctx.cfg.max_msg_len - 1] = '.'; |
235 | name[cgit_max_msg_len - 2] = '.'; | 235 | name[ctx.cfg.max_msg_len - 2] = '.'; |
236 | name[cgit_max_msg_len - 3] = '.'; | 236 | name[ctx.cfg.max_msg_len - 3] = '.'; |
237 | } | 237 | } |
238 | reporevlink("commit", name, title, class, head, rev, NULL); | 238 | reporevlink("commit", name, title, class, head, rev, NULL); |
239 | } | 239 | } |
240 | 240 | ||
@@ -373,12 +373,12 @@ void cgit_print_docstart(char *title, struct cacheitem *item) | |||
373 | html("<title>"); | 373 | html("<title>"); |
374 | html_txt(title); | 374 | html_txt(title); |
375 | html("</title>\n"); | 375 | html("</title>\n"); |
376 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 376 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
377 | if (cgit_robots && *cgit_robots) | 377 | if (ctx.cfg.robots && *ctx.cfg.robots) |
378 | htmlf("<meta name='robots' content='%s'/>\n", cgit_robots); | 378 | htmlf("<meta name='robots' content='%s'/>\n", ctx.cfg.robots); |
379 | html("<link rel='stylesheet' type='text/css' href='"); | 379 | html("<link rel='stylesheet' type='text/css' href='"); |
380 | html_attr(cgit_css); | 380 | html_attr(ctx.cfg.css); |
381 | html("'/>\n"); | 381 | html("'/>\n"); |
382 | html("</head>\n"); | 382 | html("</head>\n"); |
383 | html("<body>\n"); | 383 | html("<body>\n"); |
384 | } | 384 | } |
@@ -438,9 +438,9 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, | |||
438 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 438 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
439 | { | 439 | { |
440 | char *url; | 440 | char *url; |
441 | 441 | ||
442 | if (!cgit_virtual_root) { | 442 | if (!ctx.cfg.virtual_root) { |
443 | url = fmt("%s/%s", ctx.qry.repo, page); | 443 | url = fmt("%s/%s", ctx.qry.repo, page); |
444 | if (ctx.qry.path) | 444 | if (ctx.qry.path) |
445 | url = fmt("%s/%s", url, ctx.qry.path); | 445 | url = fmt("%s/%s", url, ctx.qry.path); |
446 | html_hidden("url", url); | 446 | html_hidden("url", url); |
@@ -473,9 +473,9 @@ void cgit_print_pageheader(char *title, int show_search) | |||
473 | html("<table class='sidebar' cellspacing='0' summary=''>\n"); | 473 | html("<table class='sidebar' cellspacing='0' summary=''>\n"); |
474 | html("<tr><td class='sidebar'>\n<a href='"); | 474 | html("<tr><td class='sidebar'>\n<a href='"); |
475 | html_attr(cgit_rooturl()); | 475 | html_attr(cgit_rooturl()); |
476 | htmlf("'><img src='%s' alt='cgit'/></a>\n", | 476 | htmlf("'><img src='%s' alt='cgit'/></a>\n", |
477 | cgit_logo); | 477 | ctx.cfg.logo); |
478 | html("</td></tr>\n<tr><td class='sidebar'>\n"); | 478 | html("</td></tr>\n<tr><td class='sidebar'>\n"); |
479 | if (ctx.qry.repo) { | 479 | if (ctx.qry.repo) { |
480 | html("<h1 class='first'>"); | 480 | html("<h1 class='first'>"); |
481 | html_txt(strrpart(cgit_repo->name, 20)); | 481 | html_txt(strrpart(cgit_repo->name, 20)); |
@@ -500,14 +500,14 @@ void cgit_print_pageheader(char *title, int show_search) | |||
500 | ctx.qry.sha1); | 500 | ctx.qry.sha1); |
501 | 501 | ||
502 | for_each_ref(print_archive_ref, &header); | 502 | for_each_ref(print_archive_ref, &header); |
503 | 503 | ||
504 | if (cgit_repo->clone_url || cgit_clone_prefix) { | 504 | if (cgit_repo->clone_url || ctx.cfg.clone_prefix) { |
505 | html("<h1>clone</h1>\n"); | 505 | html("<h1>clone</h1>\n"); |
506 | if (cgit_repo->clone_url) | 506 | if (cgit_repo->clone_url) |
507 | url = cgit_repo->clone_url; | 507 | url = cgit_repo->clone_url; |
508 | else | 508 | else |
509 | url = fmt("%s%s", cgit_clone_prefix, | 509 | url = fmt("%s%s", ctx.cfg.clone_prefix, |
510 | cgit_repo->url); | 510 | cgit_repo->url); |
511 | html("<a class='menu' href='"); | 511 | html("<a class='menu' href='"); |
512 | html_attr(url); | 512 | html_attr(url); |
513 | html("' title='"); | 513 | html("' title='"); |
@@ -530,9 +530,9 @@ void cgit_print_pageheader(char *title, int show_search) | |||
530 | html("</form>\n"); | 530 | html("</form>\n"); |
531 | 531 | ||
532 | html("<h1>search</h1>\n"); | 532 | html("<h1>search</h1>\n"); |
533 | html("<form method='get' action='"); | 533 | html("<form method='get' action='"); |
534 | if (cgit_virtual_root) | 534 | if (ctx.cfg.virtual_root) |
535 | html_attr(cgit_fileurl(ctx.qry.repo, "log", | 535 | html_attr(cgit_fileurl(ctx.qry.repo, "log", |
536 | ctx.qry.path, NULL)); | 536 | ctx.qry.path, NULL)); |
537 | html("'>\n"); | 537 | html("'>\n"); |
538 | add_hidden_formfields(1, 0, "log"); | 538 | add_hidden_formfields(1, 0, "log"); |
@@ -545,9 +545,9 @@ void cgit_print_pageheader(char *title, int show_search) | |||
545 | html_attr(ctx.qry.search); | 545 | html_attr(ctx.qry.search); |
546 | html("'/>\n"); | 546 | html("'/>\n"); |
547 | html("</form>\n"); | 547 | html("</form>\n"); |
548 | } else { | 548 | } else { |
549 | if (!cgit_index_info || html_include(cgit_index_info)) | 549 | if (!ctx.cfg.index_info || html_include(ctx.cfg.index_info)) |
550 | html(default_info); | 550 | html(default_info); |
551 | } | 551 | } |
552 | 552 | ||
553 | html("</td></tr></table></td>\n"); | 553 | html("</td></tr></table></td>\n"); |