From 42ad860da02665aa21193d3bc418ef03e96727fb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 6 Jun 2010 06:29:36 +0000
Subject: [PATCH] webdemo UI

---
 httemplate/edit/process/access_group.html | 9 ++++-----
 httemplate/edit/process/access_user.html  | 9 +++++----
 httemplate/edit/process/agent.cgi         | 5 +++++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/httemplate/edit/process/access_group.html b/httemplate/edit/process/access_group.html
index ab25cb3a2..2d125c387 100644
--- a/httemplate/edit/process/access_group.html
+++ b/httemplate/edit/process/access_group.html
@@ -1,6 +1,3 @@
-% if ( $conf->exists('disable_acl_changes') ) {
-  ACL changes disabled in public demo.
-% } else {
 <% include( 'elements/process.html',
                'table'       => 'access_group',
                'viewall_dir' => 'browse',
@@ -17,12 +14,14 @@
                },
            )
 %>
-% }
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-my $conf = new FS::Conf;
+if ( FS::Conf->new->exists('disable_acl_changes') ) {
+  errorpage('ACL changes disabled in public demo.');
+  die "shouldn't be reached";
+}
 
 </%init>
diff --git a/httemplate/edit/process/access_user.html b/httemplate/edit/process/access_user.html
index d8a752adc..e6258a9b1 100644
--- a/httemplate/edit/process/access_user.html
+++ b/httemplate/edit/process/access_user.html
@@ -1,6 +1,3 @@
-% if ( FS::Conf->new->exists('disable_acl_changes') ) {
-  ACL changes disabled in public demo.
-% } else {
 %  if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
 %    $cgi->param('error', "The passwords do not match");
 %    print $cgi->redirect(popurl(2) . "access_user.html?" . $cgi->query_string);
@@ -16,10 +13,14 @@
              )
 %>
 %   }
-% }
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
+if ( FS::Conf->new->exists('disable_acl_changes') ) {
+  errorpage('ACL changes disabled in public demo.');
+  die "shouldn't be reached";
+}
+
 </%init>
diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi
index 3cdf40c9b..e776d281c 100755
--- a/httemplate/edit/process/agent.cgi
+++ b/httemplate/edit/process/agent.cgi
@@ -13,4 +13,9 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
+if ( FS::Conf->new->exists('disable_acl_changes') ) {
+  errorpage('ACL changes disabled in public demo.');
+  die "shouldn't be reached";
+}
+
 </%init>
-- 
2.11.0