From 178d6e787a16cbdd2c4a0e51f7f4fd9a9cb9e452 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Tue, 12 Feb 2008 10:16:41 +0000
Subject: [PATCH] fix: don't show Admin mode toggle when not in
 adminModeSubnets

---
 docs/changelog/7.x.x.txt        |  1 +
 lib/WebGUI/Macro/AdminToggle.pm | 38 +++++++++++++++------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 33fab4a83..ce90a5437 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -11,6 +11,7 @@
    a url to search the gallery for the keyword. 
  - add: Photos now track views
  - fix: Multiple Gallery template fixes.
+ - fix: don't show Admin mode toggle when not in adminModeSubnets
 
 7.5.1
  - fix: Extra head tags of unplaced assets included twice
diff --git a/lib/WebGUI/Macro/AdminToggle.pm b/lib/WebGUI/Macro/AdminToggle.pm
index 6d8be99e0..c27c17106 100644
--- a/lib/WebGUI/Macro/AdminToggle.pm
+++ b/lib/WebGUI/Macro/AdminToggle.pm
@@ -45,27 +45,23 @@ A template from the Macro/AdminToggle namespace to use for formatting the link.
 
 #-------------------------------------------------------------------
 sub process {
-	my $session = shift;
-         if ($session->user->isInGroup(12)) {
-        	my %var;
-                 my ($turnOn,$turnOff,$templateName) = @_;
-	my $i18n = WebGUI::International->new($session,'Macro_AdminToggle');
-              $turnOn ||= $i18n->get(516);
-              $turnOff ||= $i18n->get(517);
-                 if ($session->var->isAdminOn) {
-                      $var{'toggle.url'} = $session->url->page('op=switchOffAdmin');
-                      $var{'toggle.text'} = $turnOff;
-                 } else {
-                      $var{'toggle.url'} = $session->url->page('op=switchOnAdmin');
-                      $var{'toggle.text'} = $turnOn;
-                 }
-		if ($templateName) {
-         		return  WebGUI::Asset::Template->newByUrl($session,$templateName)->process(\%var);
-		} else {
-         		return  WebGUI::Asset::Template->new($session,"PBtmpl0000000000000036")->process(\%var);
-		}
-	}
-       return "";
+    my $session = shift;
+    return ""
+        unless $session->user->canUseAdminMode;
+    my ($turnOn, $turnOff, $templateName) = @_;
+    my $i18n = WebGUI::International->new($session,'Macro_AdminToggle');
+    my %var;
+    if ($session->var->isAdminOn) {
+        $var{'toggle.url'} = $session->url->page('op=switchOffAdmin');
+        $var{'toggle.text'} = $turnOff || $i18n->get(517);
+    }
+    else {
+        $var{'toggle.url'} = $session->url->page('op=switchOnAdmin');
+        $var{'toggle.text'} = $turnOn || $i18n->get(516);
+    }
+    my $template = $templateName    ? WebGUI::Asset::Template->newByUrl($session, $templateName)
+                                    : WebGUI::Asset::Template->new($session, "PBtmpl0000000000000036");
+    return $template->process(\%var);
 }
 
 1;