cacert/cacert-testmgr
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'bug-1391'

Browse source
This commit is contained in:
Benny Baumann 2015-07-28 22:37:58 +02:00
commit dae1d5c7f8
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
manager/application/models/User.php
View file

@ -108,8 +108,8 @@ class Default_Model_User {
* user's points
*/
public function refreshPoints() {
$query = 'select sum(`points`) as `total` from `notary` '.
'where `to` = :user';
$query = "select sum(`points`) as `total` from `notary` " .
"where `to` = :user and method != 'Administrative Increase' and from != to";
$query_params['user'] = $this->id;
$row = $this->db->query($query, $query_params)->fetch();
if ($row['total'] === null) $row['total'] = 0;
@ -297,18 +297,6 @@ class Default_Model_User {
$this->db->insert('notary', $assurance);
$assuree->points += $rounddown;
$assuree->fixAssurerFlag();
if ($this->getPoints() < 150) {
$addpoints = 0;
if ($this->getPoints() < 149 && $this->getPoints() >= 100) {
$addpoints = 2;
} elseif ($this->getPoints() === 149) {
$addpoints = 1;
}
$this->adminIncrease($addpoints, $location, $date);
}
return $rounddown;
}