From owner-svn-src-user@FreeBSD.ORG  Mon May 21 23:41:40 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 42C361065670;
	Mon, 21 May 2012 23:41:40 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CD4088FC08;
	Mon, 21 May 2012 23:41:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4LNfduN078382;
	Mon, 21 May 2012 23:41:39 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4LNfdZT078379;
	Mon, 21 May 2012 23:41:39 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201205212341.q4LNfdZT078379@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Mon, 21 May 2012 23:41:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235753 - user/des/fbce/lib/FBCE/Controller
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 May 2012 23:41:40 -0000

Author: des
Date: Mon May 21 23:41:39 2012
New Revision: 235753
URL: http://svn.freebsd.org/changeset/base/235753

Log:
  Verify that the user is an active committer.

Modified:
  user/des/fbce/lib/FBCE/Controller/Run.pm
  user/des/fbce/lib/FBCE/Controller/Vote.pm

Modified: user/des/fbce/lib/FBCE/Controller/Run.pm
==============================================================================
--- user/des/fbce/lib/FBCE/Controller/Run.pm	Mon May 21 23:38:38 2012	(r235752)
+++ user/des/fbce/lib/FBCE/Controller/Run.pm	Mon May 21 23:41:39 2012	(r235753)
@@ -33,7 +33,7 @@ sub register :Local :Args(0) {
 
 #    $c->authenticate();
     my $user = $c->user->get_object();
-    if ($c->stash->{'nominating'} != 0) {
+    if ($c->stash->{'nominating'} != 0 || !$user->active) {
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
     }
@@ -64,7 +64,7 @@ sub edit :Local :Args(0) {
 
 #    $c->authenticate();
     my $user = $c->user->get_object();
-    if ($c->stash->{'nominating'} != 0) {
+    if ($c->stash->{'nominating'} != 0 || !$user->active) {
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
     }
@@ -94,7 +94,7 @@ sub withdraw :Local :Args(0) {
 
 #    $c->authenticate();
     my $user = $c->user->get_object();
-    if ($c->stash->{'nominating'} != 0) {
+    if ($c->stash->{'nominating'} != 0 || !$user->active) {
 	$c->res->redirect($c->uri_for('/run'));
 	$c->detach();
     }

Modified: user/des/fbce/lib/FBCE/Controller/Vote.pm
==============================================================================
--- user/des/fbce/lib/FBCE/Controller/Vote.pm	Mon May 21 23:38:38 2012	(r235752)
+++ user/des/fbce/lib/FBCE/Controller/Vote.pm	Mon May 21 23:41:39 2012	(r235753)
@@ -25,8 +25,8 @@ sub index :Path :Args(0) {
 
     my $user = $c->user->get_object();
     $c->stash(user => $user);
-    if ($c->stash->{'phase'} != 0) {
-	return;
+    if ($c->stash->{'voting'} != 0 || !$user->active) {
+	$c->detach();
     }
     my $p = $c->req->params;
     if ($p->{cancel}) {
@@ -79,7 +79,7 @@ sub index :Path :Args(0) {
 
 #     $c->authenticate();
 #     my $user = $c->user->get_object();
-#     if ($c->stash->{'phase'} != 0) {
+#     if ($c->stash->{'voting'} != 0 || !$user->active) {
 # 	$c->res->redirect($c->uri_for('/vote'));
 # 	$c->detach();
 #     }