summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcommunity.cacert.org <community.cacert.org@d4452222-2f33-11de-9270-010000000000>2009-05-30 02:08:30 +0000
committercommunity.cacert.org <community.cacert.org@d4452222-2f33-11de-9270-010000000000>2009-05-30 02:08:30 +0000
commitf7e4cbc5105c8c33d61a1bbf8047ebc13d092913 (patch)
treec25b17745472db174c3754b57c6ab1cd68ec3ae6
parentcbb2a993d4644871aff1db8218f69beb701684a7 (diff)
downloadcacert-boardvoting-f7e4cbc5105c8c33d61a1bbf8047ebc13d092913.tar.gz
cacert-boardvoting-f7e4cbc5105c8c33d61a1bbf8047ebc13d092913.tar.xz
cacert-boardvoting-f7e4cbc5105c8c33d61a1bbf8047ebc13d092913.zip
add 28 day due option. authenticate proponent properly. prepare for static list of vote types
git-svn-id: http://svn.cacert.cl/Software/Voting/vote@51 d4452222-2f33-11de-9270-010000000000
-rw-r--r--database.sql2
-rw-r--r--motion.php9
2 files changed, 5 insertions, 6 deletions
diff --git a/database.sql b/database.sql
index bf5b801..33386c1 100644
--- a/database.sql
+++ b/database.sql
@@ -1,4 +1,4 @@
-CREATE TABLE decisions (id INTEGER PRIMARY KEY, proposed DATETIME, proponent INTEGER, title VARCHAR(255), content TEXT, quorum INTEGER, majority INTEGER, status INTEGER, due DATETIME, modified DATETIME, tag varchar(255));
+CREATE TABLE decisions (id INTEGER PRIMARY KEY, proposed DATETIME, proponent INTEGER, title VARCHAR(255), content TEXT, quorum INTEGER, majority INTEGER, status INTEGER, due DATETIME, modified DATETIME, tag varchar(255), votetype INT4 DEFAULT 0 NOT NULL);
CREATE TABLE emails (voter INT4, address VARCHAR(255));
CREATE TABLE voters (id INTEGER PRIMARY KEY, name VARCHAR(255), enabled INTEGER default 0);
CREATE TABLE votes (decision INT4, voter INT4, vote INT4, voted DATETIME, notes text default '');
diff --git a/motion.php b/motion.php
index 4eba5b5..3559cd3 100644
--- a/motion.php
+++ b/motion.php
@@ -26,7 +26,7 @@
if (is_numeric($_REQUEST['motion'])) {
$stmt = $db->getStatement("update decision");
$stmt->bindParam(":id",$_POST['motion']);
- $stmt->bindParam(":proponent",$_POST['proponent']);
+ $stmt->bindParam(":proponent",$user['id']);
$stmt->bindParam(":title",$_POST['title']);
$stmt->bindParam(":content",$_POST['content']);
$stmt->bindParam(":quorum",$_POST['quorum']);
@@ -88,7 +88,7 @@ BODY;
}
} else {
$stmt = $db->getStatement("create decision");
- $stmt->bindParam(":proponent",$_POST['proponent']);
+ $stmt->bindParam(":proponent",$user['id']);
$stmt->bindParam(":title",$_POST['title']);
$stmt->bindParam(":content",$_POST['content']);
$stmt->bindParam(":quorum",$_POST['quorum']);
@@ -158,7 +158,6 @@ BODY;
foreach (array("title","content","quorum","majority") as $column) {
$motion[$column] = "";
}
- $motion["proponent"] = $user['id'];
$motion["proposer"] = $user['name'];
}
} else {
@@ -166,7 +165,6 @@ BODY;
foreach (array("title","content","quorum","majority") as $column) {
$motion[$column] = "";
}
- $motion["proponent"] = $user['id'];
$motion["proposer"] = $user['name'];
}
?>
@@ -179,7 +177,7 @@ BODY;
?>
<table>
<tr><td>ID:</td><td><?php echo htmlentities($motion['tag']); ?></td></tr>
- <tr><td>Proponent:</td><td><?php echo htmlentities($motion['proposer']); ?><input type="hidden" name="proponent" value="<?php echo htmlentities($user['id']); ?>"></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>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>
@@ -200,6 +198,7 @@ BODY;
<option value="+3 days">In 3 Days</option>
<option value="+7 days">In 1 Week</option>
<option value="+14 days">In 2 Weeks</option>
+ <option value="+28 days">In 4 Weeks</option>
</select></td></tr>
<tr><td>&nbsp;</td><td><input type="submit" value="Propose" /></td></tr>
</table>