X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=cgisimple.c;h=256202d28bf27e61d27098217a9ea94b358ca62b;hp=eb28bdad314d200199579e7932b1d1c499b9e57b;hb=8070e13f8c6ca18ad8f6fecdcdd7a6506a117065;hpb=4b0742685865880853ddc0eeea6fe30a16d9a144
diff --git a/cgisimple.c b/cgisimple.c
index eb28bdad..256202d2 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.58 2007/07/21 12:19:50 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.61 2008/01/26 11:13:25 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,17 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.58 2007/07/21 12:19:50 fabian
*
* Revisions :
* $Log: cgisimple.c,v $
+ * Revision 1.61 2008/01/26 11:13:25 fabiankeil
+ * If enable-edit-actions is disabled, hide the edit buttons and explain why.
+ *
+ * Revision 1.60 2007/10/27 13:12:13 fabiankeil
+ * Finish 1.49 and check write access before
+ * showing edit buttons on show-url-info page.
+ *
+ * Revision 1.59 2007/10/19 16:42:36 fabiankeil
+ * Plug memory leak I introduced five months ago.
+ * Yay Valgrind and Privoxy-Regression-Test.
+ *
* Revision 1.58 2007/07/21 12:19:50 fabiankeil
* If show-url-info is called with an URL that Privoxy
* would reject as invalid, don't show unresolved forwarding
@@ -1236,7 +1247,9 @@ jb_err cgi_show_status(struct client_state *csp,
if (!err) err = string_append(&s, buf);
#ifdef FEATURE_CGI_EDIT_ACTIONS
- if (NULL == strstr(csp->actions_list[i]->filename, "standard.action") && NULL != csp->config->actions_file_short[i])
+ if ((csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS)
+ && (NULL == strstr(csp->actions_list[i]->filename, "standard.action"))
+ && (NULL != csp->config->actions_file_short[i]))
{
#ifdef HAVE_ACCESS
if (access(csp->config->actions_file[i], W_OK) == 0)
@@ -1307,6 +1320,13 @@ jb_err cgi_show_status(struct client_state *csp,
if (!err) err = map_block_killer(exports, "trust-support");
#endif /* ndef FEATURE_TRUST */
+#ifdef FEATURE_CGI_EDIT_ACTIONS
+ if (!err && (csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS))
+ {
+ err = map_block_killer(exports, "cgi-editor-is-disabled");
+ }
+#endif /* ndef CGI_EDIT_ACTIONS */
+
if (err)
{
free_map(exports);
@@ -1539,10 +1559,26 @@ jb_err cgi_show_url_info(struct client_state *csp,
string_append(&matches, buf);
string_append(&matches, "View");
#ifdef FEATURE_CGI_EDIT_ACTIONS
- snprintf(buf, sizeof(buf), " ", i);
- string_append(&matches, buf);
- string_append(&matches, "Edit");
-#endif
+ if (csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS)
+ {
+#ifdef HAVE_ACCESS
+ if (access(csp->config->actions_file[i], W_OK) == 0)
+ {
+#endif /* def HAVE_ACCESS */
+ snprintf(buf, sizeof(buf),
+ " ", i);
+ string_append(&matches, buf);
+ string_append(&matches, "Edit");
+#ifdef HAVE_ACCESS
+ }
+ else
+ {
+ string_append(&matches, " No write access.");
+ }
+#endif /* def HAVE_ACCESS */
+ }
+#endif /* FEATURE_CGI_EDIT_ACTIONS */
+
string_append(&matches, "\n");
hits = 0;