From 5ca5bab3ff890ad5ab50daf4cf0c22b4bb34b07f Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 1 Feb 2008 06:04:31 +0000
Subject: [PATCH] If edit buttons on the show-url-info CGI page are hidden,
explain why.
---
cgisimple.c | 15 +++++++++++++--
templates/show-url-info | 14 ++++++++++++++
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/cgisimple.c b/cgisimple.c
index 256202d2..19b35a45 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.61 2008/01/26 11:13:25 fabiankeil Exp $";
+const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.62 2008/02/01 05:52:40 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $
@@ -36,6 +36,10 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.61 2008/01/26 11:13:25 fabian
*
* Revisions :
* $Log: cgisimple.c,v $
+ * Revision 1.62 2008/02/01 05:52:40 fabiankeil
+ * Hide edit buttons on the show-url-info CGI page if enable-edit-action
+ * is disabled. Patch by Lee with additional white space adjustments.
+ *
* Revision 1.61 2008/01/26 11:13:25 fabiankeil
* If enable-edit-actions is disabled, hide the edit buttons and explain why.
*
@@ -1690,7 +1694,14 @@ jb_err cgi_show_url_info(struct client_state *csp,
return JB_ERR_MEMORY;
}
- if (map(exports, "matches", 1, matches , 0))
+#ifdef FEATURE_CGI_EDIT_ACTIONS
+ if ((csp->config->feature_flags & RUNTIME_FEATURE_CGI_EDIT_ACTIONS))
+ {
+ err = map_block_killer(exports, "cgi-editor-is-disabled");
+ }
+#endif /* FEATURE_CGI_EDIT_ACTIONS */
+
+ if (err || map(exports, "matches", 1, matches , 0))
{
free_current_action(action);
free_map(exports);
diff --git a/templates/show-url-info b/templates/show-url-info
index 61cd8602..ac269b70 100644
--- a/templates/show-url-info
+++ b/templates/show-url-info
@@ -27,6 +27,12 @@
#
# Revisions :
# $Log: show-url-info,v $
+# Revision 1.22 2007/12/08 14:29:06 fabiankeil
+# Use CSS to let the URL and pattern input fields scale with
+# the browser width and try to prevent vertical scroll bars
+# if the width is less than 80 characters. Closes #1843596,
+# thanks to Gerry Murphy and Lee.
+#
# Revision 1.21 2007/11/15 19:11:11 fabiankeil
# Reword HTTPS URL information.
#
@@ -212,6 +218,14 @@
<!-- if-valid-url-end@ -->
<h2>Matches for <a href="@url@">@url@</a>:</h2>
@matches@
+<!-- @if-cgi-editor-is-disabled-start -->
+ <p>
+ The CGI editor is currently disabled, thus no edit buttons are shown.<br>
+ Please have a look at the
+ <a href="@user-manual@config.html#ENABLE-EDIT-ACTIONS">enable-edit-actions documentation</a>
+ to learn how to enable it and what the risks are.
+ </p>
+<!-- if-cgi-editor-is-disabled-end@ -->
</td>
</tr>
<!-- @if-valid-url-start -->
--
2.49.0