]>
Commit | Line | Data |
---|---|---|
f3c99f0b ER |
1 | diff -ur eventum-1.4/include/class.link_filter.php t/include/class.link_filter.php |
2 | --- eventum-1.4/include/class.link_filter.php 2005-01-26 02:28:03.000000000 +0200 | |
3 | +++ t/include/class.link_filter.php 2005-01-26 16:27:04.000000000 +0200 | |
4 | @@ -288,6 +288,10 @@ | |
5 | { | |
6 | static $filters; | |
7 | if (is_null($filters)) { | |
8 | + $prj_id = Auth::getCurrentProject(); | |
9 | + if ($prj_id == null) { | |
10 | + return array(); | |
11 | + } | |
12 | $sql = "SELECT | |
13 | lfi_pattern, | |
14 | lfi_replacement | |
15 | @@ -297,7 +301,7 @@ | |
16 | WHERE | |
17 | lfi_id = plf_lfi_id AND | |
18 | lfi_usr_role < " . User::getRoleByUser(Auth::getUserID()) . " AND | |
19 | - plf_prj_id = " . Auth::getCurrentProject() . " | |
20 | + plf_prj_id = $prj_id | |
21 | ORDER BY | |
22 | lfi_id"; | |
23 | $res = $GLOBALS["db_api"]->dbh->getAll($sql); | |
24 | diff -ur eventum-1.4/include/class.mail.php t/include/class.mail.php | |
25 | --- eventum-1.4/include/class.mail.php 2005-01-26 02:28:03.000000000 +0200 | |
26 | +++ t/include/class.mail.php 2005-01-26 17:36:41.000000000 +0200 | |
27 | @@ -256,7 +256,7 @@ | |
28 | { | |
29 | $info = Mail_API::getAddressInfo($address); | |
30 | if (!empty($info['sender_name'])) { | |
31 | - return $info['sender_name']; | |
32 | + return Mime_Helper::fixEncoding($info['sender_name']); | |
33 | } else { | |
34 | return $info['email']; | |
35 | } | |
36 | Only in t/include: class.mail_queue.php~ | |
37 | diff -ur eventum-1.4/include/class.mime_helper.php t/include/class.mime_helper.php | |
38 | --- eventum-1.4/include/class.mime_helper.php 2005-01-26 02:28:04.000000000 +0200 | |
39 | +++ t/include/class.mime_helper.php 2005-01-26 02:49:33.000000000 +0200 | |
40 | @@ -278,7 +278,7 @@ | |
41 | * @return string The text, encoded only if it contains non-ASCII | |
42 | * characters. | |
43 | */ | |
44 | - function encode($text, $charset = 'iso-8859-1') | |
45 | + function encode($text, $charset = APP_CHARSET) | |
46 | { | |
47 | /* Return if nothing needs to be encoded. */ | |
48 | if (!MIME_Helper::is8bit($text)) { | |
49 | diff -ur eventum-1.4/include/class.notification.php t/include/class.notification.php | |
50 | --- eventum-1.4/include/class.notification.php 2005-01-26 02:28:03.000000000 +0200 | |
51 | +++ t/include/class.notification.php 2005-01-26 17:36:31.000000000 +0200 | |
52 | @@ -908,7 +908,7 @@ | |
53 | $tpl->assign(array( | |
54 | 'email' => array( | |
55 | 'date' => $date, | |
56 | - 'from' => $sender, | |
57 | + 'from' => Mime_Helper::fixEncoding($sender), | |
58 | 'subject' => $subject | |
59 | ) | |
60 | )); | |
61 | @@ -919,6 +919,7 @@ | |
62 | $mail->setTextBody($text_message); | |
63 | $setup = $mail->getSMTPSettings(); | |
64 | $from = Notification::getFixedFromHeader($issue_id, $setup["from"], 'issue'); | |
65 | + $sender = Mime_Helper::fixEncoding($sender); | |
66 | $mail->send($from, $sender, 'New Issue Created'); | |
67 | } | |
68 | } |