From owner-svn-src-user@FreeBSD.ORG  Thu Apr 17 00:31:03 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0BEBEF11;
 Thu, 17 Apr 2014 00:31:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ECE831A07;
 Thu, 17 Apr 2014 00:31:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3H0V2Jw023204;
 Thu, 17 Apr 2014 00:31:02 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3H0V29T023202;
 Thu, 17 Apr 2014 00:31:02 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201404170031.s3H0V29T023202@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Thu, 17 Apr 2014 00:31:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r264576 - user/des/fbp/lib/FBP/Controller
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Thu, 17 Apr 2014 00:31:03 -0000

Author: des
Date: Thu Apr 17 00:31:02 2014
New Revision: 264576
URL: http://svnweb.freebsd.org/changeset/base/264576

Log:
  Allow admins to see inactive polls.
  Add safeguards to prevent voting on inactive polls.

Modified:
  user/des/fbp/lib/FBP/Controller/Poll.pm

Modified: user/des/fbp/lib/FBP/Controller/Poll.pm
==============================================================================
--- user/des/fbp/lib/FBP/Controller/Poll.pm	Thu Apr 17 00:18:51 2014	(r264575)
+++ user/des/fbp/lib/FBP/Controller/Poll.pm	Thu Apr 17 00:31:02 2014	(r264576)
@@ -31,7 +31,7 @@ sub poll :Chained('/') :Path :CaptureArg
     $pid = $1;
     my $poll = $c->model('FBP::Poll')->find($pid);
     $c->detach('/default')
-	unless $poll && $poll->active;
+	unless $poll && ($poll->active || $c->user->admin);
     $c->stash(poll => $poll);
     my $psession = ($c->session->{$pid} //= {});
     if (!$$psession{answers}) {
@@ -93,6 +93,8 @@ sub vote :Chained('poll') :Path :Args(0)
 	unless $question;
 
     # Did the user submit any answers?
+    delete($c->req->params->{answer})
+	unless $poll->active;
     if ($c->req->params->{qid} ~~ $qid && $c->req->params->{answer}) {
 	my $answer = $c->req->params->{answer};
 	$answer = [ $answer ]
@@ -113,6 +115,7 @@ sub vote :Chained('poll') :Path :Args(0)
     } elsif ($c->req->params->{done}) {
 	# Validate all the answers
 	foreach $question ($questions->all) {
+	    next unless $poll->active; # hack
 	    try {
 		my $answer = $answers->{$question->id};
 		$question->validate_answer(@{$answer // []});
@@ -173,7 +176,8 @@ sub review :Chained('poll') :Path :Args(
 
     # Validate the answers
     try {
-	$poll->validate_answer(%$answers);
+	$poll->validate_answer(%$answers)
+	    unless $poll->active; # hack
     } catch {
 	$c->stash(error => $_);
 	$c->detach();