From b399b20dee2752a038a64a8be2c89df142aae280 Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Fri, 30 Jul 2010 06:09:20 -0700
Subject: mail, i18n, etc.

---
 mod/settings.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'mod/settings.php')

diff --git a/mod/settings.php b/mod/settings.php
index bd779ad4e..98f86c92f 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -116,11 +116,12 @@ function settings_post(&$a) {
 if(! function_exists('settings_content')) {
 function settings_content(&$a) {
 
-	if((! x($_SESSION['authenticated'])) && (! (x($_SESSION,'uid')))) {
-		$_SESSION['sysmsg'] .= "Permission denied." . EOL;
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL );
 		return;
 	}
 
+	require_once('view/acl_selectors.php');
 
 	$username = $a->user['username'];
 	$email    = $a->user['email'];
@@ -159,8 +160,9 @@ function settings_content(&$a) {
 		'$email' => $email,
 		'$nickname_block' => $nickname_block,
 		'$timezone' => $timezone,
-		'$zoneselect' => select_timezone($timezone)
-		));
+		'$zoneselect' => select_timezone($timezone),
+		'$acl_select' => populate_acl()
+	));
 
 	return $o;
 
-- 
cgit v1.2.3