cacert/cacert-boardvoting
9
0
Fork 0
Code Issues Pull requests Releases 4 Activity

Remove ability to modify motions.

Browse source 
git-svn-id: http://svn.cacert.cl/Software/Voting/vote@69 d4452222-2f33-11de-9270-010000000000
This commit is contained in:
Mark Lipscombe 2009-08-02 11:27:28 +00:00
parent 35127fcc25
commit a6fea98782
2 changed files with 34 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
motion.php
View file

@ -23,91 +23,30 @@
<body> <body>
<?php <?php
if ($_REQUEST['action'] == "store") { if ($_REQUEST['action'] == "store") {
if (is_numeric($_REQUEST['motion'])) { $stmt = $db->getStatement("create decision");
$stmt = $db->getStatement("update decision"); $stmt->bindParam(":proponent",$user['id']);
$stmt->bindParam(":id",$_POST['motion']); $stmt->bindParam(":title",$_POST['title']);
$stmt->bindParam(":proponent",$user['id']); $stmt->bindParam(":content",$_POST['content']);
$stmt->bindParam(":title",$_POST['title']); $stmt->bindParam(":votetype",$_POST['votetype']);
$stmt->bindParam(":content",$_POST['content']); $stmt->bindParam(":due",$_POST['due']);
$stmt->bindParam(":due",$_POST['due']); if ($stmt->execute()) {
$stmt->bindParam(":votetype",$_POST['votetype']); ?>
if ($stmt->execute()) { <b>The motion has been proposed!</b><br/>
?> <a href="motions.php">Back to motions</a><br/>
<b>The motion has been proposed!</b><br/> <br/>
<a href="motions.php">Back to motions</a><br/> <br/>
<br/> <?php
<br/> $decision = $db->getStatement("get new decision")->execute()?$db->getStatement("get new decision")->fetch():array();
<?php $name = $user['name'];
$decision = $db->getStatement("get decision")->execute(array($_POST['motion']))?$db->getStatement("get decision")->fetch():array(); $tag = $decision['tag'];
$name = $user['name']; $title = $decision['title'];
$tag = $decision['tag']; $content =$decision['content'];
$title = $decision['title']; $due = $decision['due']." UTC";
$content =$decision['content']; $votetype = !$decision['votetype'] ? 'motion' : 'veto';
$due = $decision['due']." UTC"; $baseurl = "https://".$_SERVER['HTTP_HOST'].":".$_SERVER['SERVER_PORT'].preg_replace('/motion\.php/','',$_SERVER['REQUEST_URI']);
$votetype = !$decision['votetype'] ? 'motion' : 'veto'; $voteurl = $baseurl."vote.php?motion=".$decision['id'];
$baseurl = "https://".$_SERVER['HTTP_HOST'].":".$_SERVER['SERVER_PORT'].preg_replace('/motion\.php/','',$_SERVER['REQUEST_URI']); $unvoted = $baseurl."motions.php?unvoted=1";
$voteurl = $baseurl."vote.php?motion=".$decision['id']; $body = <<<BODY
$unvoted = $baseurl."motions.php?unvoted=1";
$body = <<<BODY
Dear Board,
$name has modified motion $tag to the following:
$title
$content
Vote type: $votetype
To vote please choose:
Aye: $voteurl&vote=1
Naye: $voteurl&vote=-1
Abstain: $voteurl&vote=0
Please be aware, that if you have voted already your vote is still registered and valid.
If this modification has an impact on how you wish to vote, you are responsible for voting
again.
To see all your outstanding votes : $unvoted
Kind regards,
the voting system
BODY;
$db->notify("Re: $tag - $title - modified",$body,$tag);
} else {
?>
<b>The motion has NOT been proposed!</b><br/>
<a href="motions.php">Back to motions</a><br/>
<i><?php echo join("<br/>\n",$stmt->errorInfo()); ?></i><br/>
<br/>
<br/>
<?php
}
} else {
$stmt = $db->getStatement("create decision");
$stmt->bindParam(":proponent",$user['id']);
$stmt->bindParam(":title",$_POST['title']);
$stmt->bindParam(":content",$_POST['content']);
$stmt->bindParam(":votetype",$_POST['votetype']);
$stmt->bindParam(":due",$_POST['due']);
if ($stmt->execute()) {
?>
<b>The motion has been proposed!</b><br/>
<a href="motions.php">Back to motions</a><br/>
<br/>
<br/>
<?php
$decision = $db->getStatement("get new decision")->execute()?$db->getStatement("get new decision")->fetch():array();
$name = $user['name'];
$tag = $decision['tag'];
$title = $decision['title'];
$content =$decision['content'];
$due = $decision['due']." UTC";
$votetype = !$decision['votetype'] ? 'motion' : 'veto';
$baseurl = "https://".$_SERVER['HTTP_HOST'].":".$_SERVER['SERVER_PORT'].preg_replace('/motion\.php/','',$_SERVER['REQUEST_URI']);
$voteurl = $baseurl."vote.php?motion=".$decision['id'];
$unvoted = $baseurl."motions.php?unvoted=1";
$body = <<<BODY
Dear Board, Dear Board,
$name has made the following motion: $name has made the following motion:
@ -130,19 +69,18 @@ To see all your outstanding votes : $unvoted
Kind regards, Kind regards,
the voting system the voting system
BODY; BODY;
$db->notify("$tag - $title",$body,$tag,TRUE); $db->notify("$tag - $title",$body,$tag,TRUE);
} else { } else {
?> ?>
<b>The motion has NOT been proposed!</b><br/> <b>The motion has NOT been proposed!</b><br/>
<a href="motions.php">Back to motions</a><br/> <a href="motions.php">Back to motions</a><br/>
<i><?php echo join("<br/>\n",$stmt->errorInfo()); ?></i><br/> <i><?php echo join("<br/>\n",$stmt->errorInfo()); ?></i><br/>
<br/> <br/>
<br/> <br/>
<?php <?php
}
} }
} }
if (is_numeric($_REQUEST['motion'])) { if (is_numeric($_REQUEST['motion'])) {
$stmt = $db->getStatement("get decision"); $stmt = $db->getStatement("get decision");
if ($stmt->execute(array($_REQUEST['motion']))) { if ($stmt->execute(array($_REQUEST['motion']))) {

1
motions.php
View file

@ -115,7 +115,6 @@ BODY;
<li><a href="vote.php?motion=<?php echo($row['id']); ?>&amp;vote=0">Abstain</a></li> <li><a href="vote.php?motion=<?php echo($row['id']); ?>&amp;vote=0">Abstain</a></li>
<li><a href="vote.php?motion=<?php echo($row['id']); ?>&amp;vote=-1">Naye</a></li> <li><a href="vote.php?motion=<?php echo($row['id']); ?>&amp;vote=-1">Naye</a></li>
<li><a href="proxy.php?motion=<?php echo($row['id']); ?>">Proxy Vote</a></li> <li><a href="proxy.php?motion=<?php echo($row['id']); ?>">Proxy Vote</a></li>
<li><a href="motion.php?motion=<?php echo($row['id']); ?>">Modify</a></li>
<li><a href="motions.php?motion=<?php echo($row['tag']); ?>&amp;withdrawl=1">Withdraw</a></li> <li><a href="motions.php?motion=<?php echo($row['tag']); ?>&amp;withdrawl=1">Withdraw</a></li>
</ul> </ul>
<?php <?php