Skip to content
Snippets Groups Projects
Commit 0d99eee5 authored by Peter Rotich's avatar Peter Rotich
Browse files

Merge pull request #1870 from greezybacon/issue/1674 


email: (Correctly) parse priority to priority_urgency

Reviewed-By: default avatarPeter Rotich <peter@osticket.com>
parents b316f9c5 4b1ce0b3
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
include/class.mailfetch.php
+ 14
− 4
View file @ 0d99eee5
......@@ -543,11 +543,21 @@ class MailFetcher {
}
function getPriority($mid) {
if ($this->tnef && isset($this->tnef->Importance))
// PidTagImportance is 0, 1, or 2
if ($this->tnef && isset($this->tnef->Importance)) {
// PidTagImportance is 0, 1, or 2, 2 is high
// http://msdn.microsoft.com/en-us/library/ee237166(v=exchg.80).aspx
return $this->tnef->Importance + 1;
return Mail_Parse::parsePriority($this->getHeader($mid));
$urgency = 4 - $this->tnef->Importance;
}
elseif ($priority = Mail_Parse::parsePriority($this->getHeader($mid))) {
$urgency = $priority + 1;
}
if ($urgency) {
$sql = 'SELECT `priority_id` FROM '.PRIORITY_TABLE
.' WHERE `priority_urgency`='.db_input($urgency)
.' LIMIT 1';
$id = db_result(db_query($sql));
return $id;
}
}
function getBody($mid) {
......
include/class.mailparse.php
+ 48
− 32
View file @ 0d99eee5
......@@ -461,43 +461,59 @@ class Mail_Parse {
return $files;
}
function getPriority(){
if ($this->tnef && isset($this->tnef->Importance))
// PidTagImportance is 0, 1, or 2
function getPriority() {
if ($this->tnef && isset($this->tnef->Importance)) {
// PidTagImportance is 0, 1, or 2, 2 is high
// http://msdn.microsoft.com/en-us/library/ee237166(v=exchg.80).aspx
return $this->tnef->Importance + 1;
return Mail_Parse::parsePriority($this->getHeader());
$urgency = 4 - $this->tnef->Importance;
}
elseif ($priority = Mail_Parse::parsePriority($this->getHeader())) {
$urgency = $priority + 1;
}
if ($urgency) {
$sql = 'SELECT `priority_id` FROM '.PRIORITY_TABLE
.' WHERE `priority_urgency`='.db_input($urgency)
.' LIMIT 1';
$id = db_result(db_query($sql));
return $id;
}
}
/**
* Return a normalized priority urgency from the email headers received.
*
* Returns:
* (int) priority urgency, {1,2,3}, where 1 is high. Returns 0 if no
* priority could be inferred from the headers.
*
* References:
* https://github.com/osTicket/osTicket-1.8/issues/1674
* http://stackoverflow.com/questions/15568583/php-mail-priority-types
*/
static function parsePriority($header=null){
if (! $header)
return 0;
// Test for normal "X-Priority: INT" style header & stringy version.
// Allows for Importance possibility.
$matching_char = '';
if (preg_match ( '/priority: (\d|\w)/i', $header, $matching_char )
|| preg_match ( '/importance: (\d|\w)/i', $header, $matching_char )) {
switch ($matching_char[1]) {
case 'h' :
case 'H' :// high
case 'u':
case 'U': //Urgent
case 6 :
case 5 :
return 1;
case 'n' : // normal
case 'N' :
case 4 :
case 3 :
return 2;
case 'l' : // low
case 'L' :
case 2 :
case 1 :
return 3;
}
if (!$header)
return 0;
// Test for normal "X-Priority: INT" style header & stringy version.
// Allows for Importance possibility.
$matching_char = '';
if (preg_match('/(?:priority|importance): (\w)/i', $header, $matching_char)) {
switch (strtoupper($matching_char[1])) {
case 'H' :// high
case 'U': //Urgent
case '2' :
case '1' :
return 1;
case 'N' :
case '4' :
case '3' :
return 2;
case 'L' :
case '6' :
case '5' :
return 3;
}
}
return 0;
}
......
setup/test/tests/test.header_functions.php
+ 48
− 46
View file @ 0d99eee5
......@@ -5,65 +5,67 @@ define('PEAR_DIR', INCLUDE_DIR.'/pear/');
require_once INCLUDE_DIR."class.mailparse.php";
abstract class Priorities {
const HIGH_PRIORITY = 1;
const NORMAL_PRIORITY = 2;
const LOW_PRIORITY = 3;
const NO_PRIORITY = 0;
const HIGH_PRIORITY = 1;
const NORMAL_PRIORITY = 2;
const LOW_PRIORITY = 3;
const NO_PRIORITY = 0;
}
class TestHeaderFunctions extends Test {
var $name = "Email Header Function Algorithm Regression Tests.";
function testMailParsePriority() {
$func_class_method = array('Mail_Parse','parsePriority');
$strlen_base = strlen($this->h());
$func_class_method = array('Mail_Parse','parsePriority');
$strlen_base = strlen($this->h());
foreach ( array (
// input => output
'X-Priority: isNAN' => Priorities::NO_PRIORITY,
'X-Priority: 1' => Priorities::HIGH_PRIORITY,
'X-Priority: 2' => Priorities::HIGH_PRIORITY,
'X-Priority: 3' => Priorities::NORMAL_PRIORITY,
'X-Priority: 4' => Priorities::NORMAL_PRIORITY,
'X-Priority: 5' => Priorities::LOW_PRIORITY,
'X-Priority: 6' => Priorities::LOW_PRIORITY,
'No priority set' => Priorities::NO_PRIORITY,
'Priority: normal' => Priorities::NORMAL_PRIORITY,
'xyz-priority: high' => Priorities::HIGH_PRIORITY,
'Priority: high' => Priorities::HIGH_PRIORITY,
'priority: low' => Priorities::LOW_PRIORITY,
'x-priority: 1000' => Priorities::HIGH_PRIORITY, // only matches first 1, not the full 1000
'priority: 3' => Priorities::NORMAL_PRIORITY,
'IPM-Importance: low' => Priorities::LOW_PRIORITY,
'My-Importance: URGENT' => Priorities::HIGH_PRIORITY,
'Urgency: High' => Priorities::NO_PRIORITY, //urgency doesn't match.. maybe it should?
'Importance: Low' => Priorities::LOW_PRIORITY,
'X-MSMail-Priority: High' => Priorities::HIGH_PRIORITY,
'' => Priorities::NO_PRIORITY
) as $priority => $response ) {
$this->assert(is_int($response), "Setup fail, function should only return Integer values");
//get header
$header = $this->h($priority);
if(strlen($priority)){
$this->assert((strlen($header) > $strlen_base), "Setup fail, function h not returning correct string length");
}
if (! (call_user_func_array ($func_class_method , array($header) ) == $response)){
//TODO: make line number dynamic
$this->fail ( "class.mailparse.php", 351, "Algorithm mistake: $priority should return $response!" );
}else{
$this->pass();
}
}
foreach ( array (
'X-Priority: isNAN' => Priorities::NO_PRIORITY, // input => output
'X-Priority: 1' => Priorities::LOW_PRIORITY,
'X-Priority: 2' => Priorities::LOW_PRIORITY,
'X-Priority: 3' => Priorities::NORMAL_PRIORITY,
'X-Priority: 4' => Priorities::NORMAL_PRIORITY,
'X-Priority: 5' => Priorities::HIGH_PRIORITY,
'X-Priority: 6' => Priorities::HIGH_PRIORITY,
'No priority set' => Priorities::NO_PRIORITY,
'Priority: normal' => Priorities::NORMAL_PRIORITY,
'xyz-priority: high' => Priorities::HIGH_PRIORITY,
'Priority: high' => Priorities::HIGH_PRIORITY,
'priority: low' => Priorities::LOW_PRIORITY,
'x-priority: 1000' => Priorities::LOW_PRIORITY, // only matches first 1, not the full 1000
'priority: 3' => Priorities::NORMAL_PRIORITY,
'IPM-Importance: low' => Priorities::LOW_PRIORITY,
'My-Importance: URGENT' => Priorities::HIGH_PRIORITY,
'Urgency: High' => Priorities::NO_PRIORITY, //urgency doesn't match.. maybe it should?
'X-Importance: 5' => Priorities::HIGH_PRIORITY,
'' => Priorities::NO_PRIORITY
) as $priority => $response ) {
$this->assert(is_int($response), "Setup fail, function should only return Integer values");
//get header
$header = $this->h($priority);
if(strlen($priority)){
$this->assert((strlen($header) > $strlen_base), "Setup fail, function h not returning correct string length");
}
if (! (call_user_func_array ($func_class_method , array($header) ) == $response)){
//TODO: make line number dynamic
$this->fail ( "class.mailparse.php", 351, "Algorithm mistake: $priority should return $response!" );
}else{
$this->pass();
}
}
}
/**
* Generate some header text to test with. Allows insertion of a known header variable
*
*
* @param string $setPriority
* @return string
*/
function h($setPriority = "") {
return <<<HEADER
return <<<HEADER
Delivered-To: clonemeagain@gmail.com
Received: by 10.69.18.42 with SMTP id gj10csp88238pbd;
Fri, 20 Dec 2013 10:08:25 -0800 (PST)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment