summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcommunity.cacert.org <community.cacert.org@d4452222-2f33-11de-9270-010000000000>2009-07-03 01:32:00 +0000
committercommunity.cacert.org <community.cacert.org@d4452222-2f33-11de-9270-010000000000>2009-07-03 01:32:00 +0000
commit5e71e18a53d346cc6b7c02f8c43cd788af2c97cc (patch)
tree5c7d83261106aee9e0e6c2eb46eace1aef7bdc8b
parent14e2fc8c34f6a49591d7c9d10002e3c23c24be5d (diff)
downloadcacert-boardvoting-5e71e18a53d346cc6b7c02f8c43cd788af2c97cc.tar.gz
cacert-boardvoting-5e71e18a53d346cc6b7c02f8c43cd788af2c97cc.tar.xz
cacert-boardvoting-5e71e18a53d346cc6b7c02f8c43cd788af2c97cc.zip
rounding to end of UTC date for due datetime as reuqested by Greg
git-svn-id: http://svn.cacert.cl/Software/Voting/vote@64 d4452222-2f33-11de-9270-010000000000
-rw-r--r--database.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/database.php b/database.php
index 932e6a4..0de7504 100644
--- a/database.php
+++ b/database.php
@@ -20,8 +20,8 @@
$this->statement['do vote'] = $this->dbh->prepare("INSERT INTO votes (decision, voter, vote, voted, notes) VALUES (:decision, :voter, :vote, datetime('now','utc'), :notes);");
$this->statement['stats'] = $this->dbh->prepare("SELECT COUNT(*) AS voters FROM voters WHERE enabled=1;");
$this->statement['list votes'] = $this->dbh->prepare("SELECT voters.name AS name, votes.vote AS vote FROM voters,votes WHERE voters.id=votes.voter AND votes.decision=:id;");
- $this->statement['create decision'] = $this->dbh->prepare("INSERT INTO decisions (proposed, proponent, title, content, votetype, status, due, modified,tag) VALUES (datetime('now','utc'), :proponent, :title, :content, :votetype, 0, datetime('now','utc', :due), datetime('now','utc'),'m' || strftime('%Y%m%d','now') || '.' || (select count(*)+1 as num from decisions where proposed between date('now') and date('now','1 day')));");
- $this->statement['update decision'] = $this->dbh->prepare("UPDATE decisions SET proposed=datetime('now','utc'), proponent=:proponent, title=:title, content=:content, votetype=:votetype, status=0, due=datetime('now','utc',:due), modified=datetime('now','utc') WHERE id=:id;");
+ $this->statement['create decision'] = $this->dbh->prepare("INSERT INTO decisions (proposed, proponent, title, content, votetype, status, due, modified,tag) VALUES (datetime('now','utc'), :proponent, :title, :content, :votetype, 0, datetime(date('now','utc'),'utc', :due,'+1 day','-1 second'), datetime('now','utc'),'m' || strftime('%Y%m%d','now') || '.' || (select count(*)+1 as num from decisions where proposed between date('now') and date('now','1 day')));");
+ $this->statement['update decision'] = $this->dbh->prepare("UPDATE decisions SET proposed=datetime('now','utc'), proponent=:proponent, title=:title, content=:content, votetype=:votetype, status=0, due=datetime(date('now','utc'),'utc', :due,'+1 day','-1 second'), modified=datetime('now','utc') WHERE id=:id;");
$this->statement['close decision'] = $this->dbh->prepare("UPDATE decisions SET status=:status, modified=datetime('now','utc') WHERE id=:decision");
ini_set('mbstring.internal_encoding', 'UTF-8');
}