Merge lp:~porten-deactivatedaccount/eventum/devel into lp:eventum

[Harri Porten]

When upgrading from version 1.7 to 2.2 and 2.3. we noticed that the "Last Action Date" column in the "List of Issues" table showed "Staff response" when a customer sent in a mail that was automatically assigned to existing ticket. Previously it had shown "User response".

Please review this change very carefully. We are not 100% either whether our understanding of what makes up a "user" is correct. And we still have some other patches in place that might make things different from the normal behavior.

[lp:~porten-deactivatedaccount/eventum/devel]

4274. By Harri Porten <porten@greco> on 2011-02-10

Test decodeQuotedPrintable() with multiple charsets.

4275. By Harri Porten <porten@greco> on 2011-02-10

Merge from trunk

=== modified file 'lib/eventum/class.support.php'
--- lib/eventum/class.support.php	2011-01-19 10:31:30 +0000
+++ lib/eventum/class.support.php	2011-02-10 13:44:30 +0000
@@ -784,7 +784,7 @@
                         if ((!empty($t['customer_id'])) && ($t['customer_id'] != 'NULL') && ((empty($usr_id)) || (User::getRoleByUser($usr_id, $prj_id) == User::getRoleID('Customer')))) {
                             Issue::markAsUpdated($t['issue_id'], 'customer action');
                         } else {
-                            if ((!empty($usr_id)) && (User::getRoleByUser($usr_id, $prj_id) > User::getRoleID('Customer'))) {
+                            if ((!empty($usr_id)) && ($usr_id != APP_SYSTEM_USER_ID) && (User::getRoleByUser($usr_id, $prj_id) > User::getRoleID('Customer'))) {
                                 Issue::markAsUpdated($t['issue_id'], 'staff response');
                             } else {
                                 Issue::markAsUpdated($t['issue_id'], 'user response');

=== modified file 'tests/Mime_HelperTest.php'
--- tests/Mime_HelperTest.php	2011-02-01 13:22:01 +0000
+++ tests/Mime_HelperTest.php	2011-02-10 13:44:30 +0000
@@ -79,6 +79,9 @@
             // test that result is returned to APP_CHARSET
             array('=?ISO-8859-1?B?SuTkZ2VybWVpc3Rlcg==?=', 'Jäägermeister'),
 
+            // different charsets inside one string
+            array('=?ISO-8859-1?q?M=FCller=2C?= ACME =?US-ASCII?q?Corp=2E?=', 'Müller, ACME Corp.'),
+
             // bug
             array('Subject: =?iso-8859-15?Q?n=FC=FCd_ei_t=F6=F6ta_adminni_publish_nupp_?=', 'Subject: nüüd ei tööta adminni publish nupp '),
             array('Subject: nüüd ei tööta adminni publish nupp ', 'Subject: nüüd ei tööta adminni publish nupp '),