summaryrefslogtreecommitdiff
path: root/motion.php
diff options
context:
space:
mode:
Diffstat (limited to 'motion.php')
-rw-r--r--motion.php40
1 files changed, 15 insertions, 25 deletions
diff --git a/motion.php b/motion.php
index 3559cd3..6c8b12e 100644
--- a/motion.php
+++ b/motion.php
@@ -29,9 +29,8 @@
$stmt->bindParam(":proponent",$user['id']);
$stmt->bindParam(":title",$_POST['title']);
$stmt->bindParam(":content",$_POST['content']);
- $stmt->bindParam(":quorum",$_POST['quorum']);
- $stmt->bindParam(":majority",$_POST['majority']);
$stmt->bindParam(":due",$_POST['due']);
+ $stmt->bindParam(":votetype",$_POST['votetype']);
if ($stmt->execute()) {
?>
<b>The motion has been proposed!</b><br/>
@@ -45,8 +44,7 @@
$title = $decision['title'];
$content =$decision['content'];
$due = $decision['due']." UTC";
- $quorum = $decision['quorum'];
- $majority = $decision['majority'];
+ $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";
@@ -58,8 +56,7 @@ $name has modified motion $tag to the following:
$title
$content
-To pass a minimum of $quorum votes and a $majority% acceptance will be required.
-Voting will close $due.
+Vote type: $votetype
To vote please choose:
@@ -91,8 +88,7 @@ BODY;
$stmt->bindParam(":proponent",$user['id']);
$stmt->bindParam(":title",$_POST['title']);
$stmt->bindParam(":content",$_POST['content']);
- $stmt->bindParam(":quorum",$_POST['quorum']);
- $stmt->bindParam(":majority",$_POST['majority']);
+ $stmt->bindParam(":votetype",$_POST['votetype']);
$stmt->bindParam(":due",$_POST['due']);
if ($stmt->execute()) {
$db->getStatement("post create")->execute();
@@ -108,8 +104,7 @@ BODY;
$title = $decision['title'];
$content =$decision['content'];
$due = $decision['due']." UTC";
- $quorum = $decision['quorum'];
- $majority = $decision['majority'];
+ $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";
@@ -121,7 +116,8 @@ $name has made the following motion:
$title
$content
-To pass a minimum of $quorum votes and a $majority% acceptance will be required.
+Vote type: $votetype
+
Voting will close $due.
To vote please choose:
@@ -155,17 +151,19 @@ BODY;
}
if (!is_numeric($motion['id'])) {
$motion = array();
- foreach (array("title","content","quorum","majority") as $column) {
+ foreach (array("title","content") as $column) {
$motion[$column] = "";
}
$motion["proposer"] = $user['name'];
+ $motion["votetype"] = 0; // defaults to motion
}
} else {
$motion = array();
- foreach (array("title","content","quorum","majority") as $column) {
+ foreach (array("title","content") as $column) {
$motion[$column] = "";
}
$motion["proposer"] = $user['name'];
+ $motion["votetype"] = 0; // defaults to motion
}
?>
<form <?php if (is_numeric($_REQUEST['motion'])) { echo(" action=\"?\""); } ?> method="POST">
@@ -178,21 +176,13 @@ BODY;
<table>
<tr><td>ID:</td><td><?php echo htmlentities($motion['tag']); ?></td></tr>
<tr><td>Proponent:</td><td><?php echo htmlentities($motion['proposer']); ?></td></tr>
- <tr><td>Proposed Date/Time:</td><td><?php echo htmlentities($motion['proposed'] ? $motion['proposed']." UTC" : '(auto filled to current date/time)'); ?></td></tr>
+ <tr><td>Proposed date/time:</td><td><?php echo htmlentities($motion['proposed'] ? $motion['proposed']." UTC" : '(auto filled to current date/time)'); ?></td></tr>
<tr><td>Title:</td><td><input name="title" value="<?php echo htmlentities($motion['title'])?>"></td></tr>
<tr><td>Text:</td><td><textarea name="content"><?php echo htmlspecialchars($motion['content'])?></textarea></td></tr>
- <tr><td>Quorum:</td><td><select name="quorum">
- <option value="<?php echo(ceil($stats["voters"])); ?>" <?php if($motion['quorum'] == $stats["voters"]) { echo(" selected=\"selected\""); } ?>>100% Votes (<?php echo($stats["voters"]); ?>)</option>
- <option value="<?php echo(ceil($stats["voters"] / 2)); ?>" <?php if($motion['quorum'] == ceil($stats["voters"] / 2)) { echo(" selected=\"selected\""); } ?>>50% Votes (<?php echo(ceil($stats["voters"] / 2)); ?>)</option>
- <option value="2" <?php if($motion['quorum'] == 2) { echo(" selected=\"selected\""); } ?>>2 Votes</option>
- <option value="1" <?php if($motion['quorum'] == 1) { echo(" selected=\"selected\""); } ?>>1 Vote</option>
+ <tr><td>Vote type:</td><td><select name="votetype">
+ <option value="0" <?php if(!$motion['votetype']) { echo(" selected=\"selected\""); } ?>>Motion</option>
+ <option value="1" <?php if($motion['votetype']) { echo(" selected=\"selected\""); } ?>>Veto</option>
</select></td></tr>
- <tr><td>Majority:</td><td><select name="majority">
- <option value="50" <?php if($motion['majority'] == 50) { echo(" selected=\"selected\""); } ?>>50%</option>
- <option value="67" <?php if($motion['majority'] == 67) { echo(" selected=\"selected\""); } ?>>67%</option>
- <option value="75" <?php if($motion['majority'] == 75) { echo(" selected=\"selected\""); } ?>>75%</option>
- <option value="100" <?php if($motion['majority'] == 100) { echo(" selected=\"selected\""); } ?>>100%</option>
- </td></tr>
<tr><td rowspan="2">Due:</td><td><?php echo($motion['due'] ? $motion['due'].' UTC' : '(autofilled from option below)')?></td></tr>
<tr><td><select name="due">
<option value="+3 days">In 3 Days</option>