Merge branch 'bug-932'

.gitattributes

@@ -0,0 +1,7 @@
+* text=auto
+
+*.php text
+*.html text
+*.phtml text
+*.js text
+*.css text

manager/application/controllers/ErrorController.php

@@ -32,4 +32,3 @@ class ErrorController extends Zend_Controller_Action
 
     }
 }
-

manager/application/models/User.php

@@ -108,13 +108,25 @@ class Default_Model_User {
      * user's points
      */
     public function refreshPoints() {
-        $query = 'select sum(`points`) as `total` from `notary` '.
+        $query = "SELECT SUM(`points`) AS `total` FROM `notary` " .
-        	'where `to` = :user';
+            "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;
 
         $this->points = $row['total'];
+
+        if($this->points < 100) return;
+
+        $this->points = 100;
+
+        $query = "SELECT COUNT(`points`) AS `total` FROM `notary` " .
+            "WHERE `from` = :user AND `method` = 'Face to Face Meeting' AND `from` != `to`";
+        $query_params['user'] = $this->id;
+        $row = $this->db->query($query, $query_params)->fetch();
+        if ($row['total'] === null) $row['total'] = 0;
+
+        $this->points += ($row['total'] > 25) ? 50 : 2 * $row['total'];
     }
 
     /**
@@ -149,12 +161,16 @@ class Default_Model_User {
             '`expire` < now()) >= 100';
         $query_params['user'] = $this->id;
         $this->db->query($query, $query_params);
+
+        $this->refreshPoints();
     }
 
     /**
      * @return boolean
      */
     public function getAssurerStatus() {
+        $this->refreshPoints();
+
         $query = 'SELECT 1 FROM `users` WHERE `users`.`id` = :user AND '.
             '`assurer_blocked` = 0 AND '.
 
@@ -225,8 +241,7 @@ class Default_Model_User {
      *         The amount of points that have been issued (might be less than
      *         $points)
      */
-    public function assure(Default_Model_User $assuree, $points, $location,
+    public function assure(Default_Model_User $assuree, $points, $location, $date) {
-            $date) {
         // Sanitize inputs
         $points = intval($points);
         $location = stripslashes($location);
@@ -297,18 +312,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;
     }
 

manager/application/views/helpers/UserInfo.php

@@ -82,7 +82,7 @@ class Zend_View_Helper_UserInfo extends Zend_View_Helper_Placeholder_Container_S
 
         $output .= $indent . "<div id=\"userinfo\">\n";
         $output .= $indent . "\tUser: " . $this->items['authed_username'] . "<br>\n";
-		$output .= $indent . "\tName: " . $this->items['authed_fname'] . ' ' . $this->items['authed_lname'] . "<br>\n";
+        $output .= $indent . "\tName: " . htmlentities(strip_tags($this->items['authed_fname'] . ' ' . $this->items['authed_lname']), ENT_QUOTES, 'ISO-8859-1') . "<br>\n";
         $output .= $indent . "\tRole: " . $this->items['authed_role'] . "<br>\n";
         if ($this->items['authed_by_crt'] === true)
             $output .= $indent . "\tLoginmethod: CRT<br>\n";

manager/application/views/scripts/mail/full.phtml

@@ -26,7 +26,7 @@ else {
         print "    <tr>\n";
         print "        <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
         print "        <td>" . $header->toaddress . "</td>";
-		print "            <td>" . $header->subject . "</td>";
+        print "        <td>" . htmlspecialchars(iconv_mime_decode($header->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8'), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
         print "        <td>" . $header->date . "</td>";
         print "        <td>" . $header->Size . "</td>";
         print "        <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";

manager/application/views/scripts/mail/index.phtml

@@ -26,7 +26,7 @@ else {
         print "    <tr>\n";
         print "        <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
         print "        <td>" . $header->toaddress . "</td>";
-		print "            <td>" . $header->subject . "</td>";
+        print "        <td>" . htmlspecialchars(iconv_mime_decode($header->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8'), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
         print "        <td>" . $header->date . "</td>";
         print "        <td>" . $header->Size . "</td>";
         print "        <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";

manager/library/config/Config.php

@@ -101,4 +101,3 @@ class Config {
         return $this->config;
     }
 }
-?>

manager/library/date/exception.HumanReadableTimeException.php

@@ -34,4 +34,3 @@ class HumanReadableTimeException extends BaseException {
     }
     */
 }
-?>

manager/library/date/testHumanReadableTime.php

@@ -13,4 +13,3 @@ print 'Day: ' . HumanReadableTime::Seconds2HR($hrf, 'd') . "\n";
 print 'Hour: ' . HumanReadableTime::Seconds2HR($hrf, 'h') . "\n";
 print 'Minute: ' . HumanReadableTime::Seconds2HR($hrf, 'm') . "\n";
 print 'Second: ' . HumanReadableTime::Seconds2HR($hrf, 's') . "\n";
-

manager/library/exception/exception.Base.php

@@ -95,4 +95,3 @@ class BaseException extends Exception {
     }
 
 }
-?>