From 8070e13f8c6ca18ad8f6fecdcdd7a6506a117065 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Fri, 1 Feb 2008 05:52:40 +0000
Subject: [PATCH] Hide edit buttons on the show-url-info CGI page if
 enable-edit-action is disabled. Patch by Lee with additional white space
 adjustments.

---
 cgisimple.c | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/cgisimple.c b/cgisimple.c
index 8934ee61..256202d2 100644
--- a/cgisimple.c
+++ b/cgisimple.c
@@ -1,4 +1,4 @@
-const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.60 2007/10/27 13:12:13 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,9 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.60 2007/10/27 13:12:13 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.
@@ -1556,20 +1559,24 @@ jb_err cgi_show_url_info(struct client_state *csp,
                string_append(&matches, buf);
                string_append(&matches, "View</a>");
 #ifdef FEATURE_CGI_EDIT_ACTIONS
-#ifdef HAVE_ACCESS
-               if (access(csp->config->actions_file[i], W_OK) == 0)
+               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), " <a class=\"cmd\" href=\"/edit-actions-list?f=%d\">", i);
-                  string_append(&matches, buf);
-                  string_append(&matches, "Edit</a>");
+                     snprintf(buf, sizeof(buf),
+                        " <a class=\"cmd\" href=\"/edit-actions-list?f=%d\">", i);
+                     string_append(&matches, buf);
+                     string_append(&matches, "Edit</a>");
 #ifdef HAVE_ACCESS
-               }
-               else
-               {
-                  string_append(&matches, " <strong>No write access.</strong>");
-               }
+                  }
+                  else
+                  {
+                     string_append(&matches, " <strong>No write access.</strong>");
+                  }
 #endif /* def HAVE_ACCESS */
+               }
 #endif /* FEATURE_CGI_EDIT_ACTIONS */
 
                string_append(&matches, "</th></tr>\n");
-- 
2.39.2