summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBalló György <ballogyor@gmail.com>2014-08-02 14:18:45 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2014-08-02 15:25:46 +0200
commit92e827330c023f9f22f4483d5b04b0708120c18a (patch)
treeb6c17c6fe21e80b39c03f2dc28b3ff03e92c4cb6
parent6d5c9365408ca0969e5911bd118ccc56266a6ac1 (diff)
downloadaurweb-92e827330c023f9f22f4483d5b04b0708120c18a.tar.xz
Count users in "Trusted User & Developer" group as TU
This reflects the changes in 3610f3c. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
-rw-r--r--web/lib/acctfuncs.inc.php4
-rw-r--r--web/lib/stats.inc.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index d24423f..254f0e2 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -605,7 +605,7 @@ function open_user_proposals($user) {
function add_tu_proposal($agenda, $user, $votelength, $quorum, $submitteruid) {
$dbh = DB::connect();
- $q = "SELECT COUNT(*) FROM Users WHERE AccountTypeID = 2";
+ $q = "SELECT COUNT(*) FROM Users WHERE (AccountTypeID = 2 OR AccountTypeID = 4)";
$result = $dbh->query($q);
$row = $result->fetch(PDO::FETCH_NUM);
$active_tus = $row[0];
@@ -1021,7 +1021,7 @@ function last_votes_list() {
$q = "SELECT UserID, MAX(VoteID) AS LastVote FROM TU_Votes, ";
$q .= "TU_VoteInfo, Users WHERE TU_VoteInfo.ID = TU_Votes.VoteID AND ";
$q .= "TU_VoteInfo.End < UNIX_TIMESTAMP() AND ";
- $q .= "Users.ID = TU_Votes.UserID AND Users.AccountTypeID = 2 ";
+ $q .= "Users.ID = TU_Votes.UserID AND (Users.AccountTypeID = 2 OR Users.AccountTypeID = 4) ";
$q .= "GROUP BY UserID ORDER BY LastVote DESC, UserName ASC";
$result = $dbh->query($q);
diff --git a/web/lib/stats.inc.php b/web/lib/stats.inc.php
index da3542a..d63767c 100644
--- a/web/lib/stats.inc.php
+++ b/web/lib/stats.inc.php
@@ -62,7 +62,7 @@ function general_stats_table() {
$q = "SELECT count(*) FROM Users";
$user_count = db_cache_value($q, 'user_count');
- $q = "SELECT count(*) FROM Users,AccountTypes WHERE Users.AccountTypeID = AccountTypes.ID AND AccountTypes.AccountType = 'Trusted User'";
+ $q = "SELECT count(*) FROM Users,AccountTypes WHERE Users.AccountTypeID = AccountTypes.ID AND (AccountTypes.AccountType = 'Trusted User' OR AccountTypes.AccountType = 'Trusted User & Developer')";
$tu_count = db_cache_value($q, 'tu_count');
$targstamp = intval(strtotime("-7 days"));