grommunio / grommunio-sync

lib/exceptions/httpreturncodeexception.php

Spacing +1 added lines, -1 removed lines

@@ -14,6 +14,6 @@
     public function __construct($message = "", $code = 0, $previous = NULL, $logLevel = false) {
         if ($code)
             $this->httpReturnCode = $code;
-        parent::__construct($message, (int) $code, $previous, $logLevel);
+        parent::__construct($message, (int)$code, $previous, $logLevel);
     }
 }

lib/exceptions/zpushexception.php

Spacing +4 added lines, -4 removed lines

@@ -15,18 +15,18 @@
     protected $showLegal = true;
 
     public function __construct($message = "", $code = 0, $previous = NULL, $logLevel = false) {
-        if (! $message)
+        if (!$message)
             $message = $this->httpReturnMessage;
 
         if (!$logLevel)
             $logLevel = $this->defaultLogLevel;
 
-        parent::__construct($message, (int) $code);
-        ZLog::Write($logLevel, get_class($this) .': '. $message . ' - code: '.$code. ' - file: '. $this->getFile().':'.$this->getLine(), false);
+        parent::__construct($message, (int)$code);
+        ZLog::Write($logLevel, get_class($this).': '.$message.' - code: '.$code.' - file: '.$this->getFile().':'.$this->getLine(), false);
     }
 
     public function getHTTPCodeString() {
-        return $this->httpReturnCode . " ". $this->httpReturnMessage;
+        return $this->httpReturnCode." ".$this->httpReturnMessage;
     }
 
     public function getHTTPHeaders() {

lib/exceptions/serviceunavailableexception.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	public function __construct($message = "", $code = 0, $previous = NULL, $logLevel = false) {
 		parent::__construct($message, $code, $previous, $logLevel);
 		if (RETRY_AFTER_DELAY !== false) {
-			$this->httpHeaders[] = 'Retry-After: ' . RETRY_AFTER_DELAY;
+			$this->httpHeaders[] = 'Retry-After: '.RETRY_AFTER_DELAY;
 		}
 	}
 }

grommunio-sync-top.php

Spacing +69 added lines, -69 removed lines

@@ -16,11 +16,11 @@ 
 /************************************************
  * MAIN
  */
-    declare(ticks = 1);
-    define('BASE_PATH_CLI',  dirname(__FILE__) ."/");
-    set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+    declare(ticks=1);
+    define('BASE_PATH_CLI', dirname(__FILE__)."/");
+    set_include_path(get_include_path().PATH_SEPARATOR.BASE_PATH_CLI);
 
-    if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', BASE_PATH_CLI . 'config.php');
+    if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', BASE_PATH_CLI.'config.php');
     include_once(ZPUSH_CONFIG);
 
     try {
@@ -49,7 +49,7 @@ 
             echo "grommunio-sync interprocess communication (IPC) is not available or TopCollector is disabled.\n";
     }
     catch (ZPushException $zpe) {
-        fwrite(STDERR, get_class($zpe) . ": ". $zpe->getMessage() . "\n");
+        fwrite(STDERR, get_class($zpe).": ".$zpe->getMessage()."\n");
         exit(1);
     }
 
@@ -177,7 +177,7 @@ 
             // wait for user input
             $this->readLineProcess();
         }
-        while($this->terminate != true);
+        while ($this->terminate != true);
     }
 
     /**
@@ -233,20 +233,20 @@ 
                         if ($line['push'] === true) $this->pushConn += 1;
 
                         // ignore push connections
-                        if ($line['push'] === true && ! $this->showPush)
+                        if ($line['push'] === true && !$this->showPush)
                             continue;
 
                         if ($this->filter !== false) {
                             $f = $this->filter;
                             if (!($line["pid"] == $f || $line["ip"] == $f || strtolower($line['command']) == strtolower($f) || preg_match("/.*?$f.*?/i", $line['user']) ||
-                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo']) ))
+                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo'])))
                                 continue;
                         }
 
                         $lastUpdate = $this->currenttime - $line["update"];
                         if ($this->currenttime - $line["update"] < 2)
                             $this->linesActive[$line["update"].$line["pid"]] = $line;
-                        else if (($line['push'] === true  && $lastUpdate > ($this->pingInterval+2)) || ($line['push'] !== true  && $lastUpdate > 4))
+                        else if (($line['push'] === true && $lastUpdate > ($this->pingInterval + 2)) || ($line['push'] !== true && $lastUpdate > 4))
                             $this->linesUnknown[$line["update"].$line["pid"]] = $line;
                         else
                             $this->linesOpen[$line["update"].$line["pid"]] = $line;
@@ -259,7 +259,7 @@ 
                         if ($this->filter !== false) {
                             $f = $this->filter;
                             if (!($line['pid'] == $f || $line['ip'] == $f || strtolower($line['command']) == strtolower($f) || preg_match("/.*?$f.*?/i", $line['user']) ||
-                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo']) ))
+                                preg_match("/.*?$f.*?/i", $line['devagent']) || preg_match("/.*?$f.*?/i", $line['devid']) || preg_match("/.*?$f.*?/i", $line['addinfo'])))
                                 continue;
                         }
 
@@ -286,23 +286,23 @@ 
     private function scrOverview() {
         $linesAvail = $this->scrSize['height'] - 8;
         $lc = 1;
-        $this->scrPrintAt($lc,0, "\033[1mgrommunio-sync-top live statistics\033[0m\t\t\t\t\t". @strftime("%d/%m/%Y %T")."\n"); $lc++;
+        $this->scrPrintAt($lc, 0, "\033[1mgrommunio-sync-top live statistics\033[0m\t\t\t\t\t".@strftime("%d/%m/%Y %T")."\n"); $lc++;
 
-        $this->scrPrintAt($lc,0, sprintf("Open connections: %d\t\t\t\tUsers:\t %d\tgrommunio-sync:   %s ",count($this->activeConn),count($this->activeUsers), $this->getVersion())); $lc++;
-        $this->scrPrintAt($lc,0, sprintf("Push connections: %d\t\t\t\tDevices: %d\tPHP-MAPI: %s", $this->pushConn, count($this->activeDevices),phpversion("mapi"))); $lc++;
-        $this->scrPrintAt($lc,0, sprintf("                                                Hosts:\t %d", count($this->activeHosts))); $lc++;
+        $this->scrPrintAt($lc, 0, sprintf("Open connections: %d\t\t\t\tUsers:\t %d\tgrommunio-sync:   %s ", count($this->activeConn), count($this->activeUsers), $this->getVersion())); $lc++;
+        $this->scrPrintAt($lc, 0, sprintf("Push connections: %d\t\t\t\tDevices: %d\tPHP-MAPI: %s", $this->pushConn, count($this->activeDevices), phpversion("mapi"))); $lc++;
+        $this->scrPrintAt($lc, 0, sprintf("                                                Hosts:\t %d", count($this->activeHosts))); $lc++;
         $lc++;
 
-        $this->scrPrintAt($lc,0, "\033[4m". $this->getLine(array('pid'=>'PID', 'ip'=>'IP', 'user'=>'USER', 'command'=>'COMMAND', 'time'=>'TIME', 'devagent'=>'AGENT', 'devid'=>'DEVID', 'addinfo'=>'Additional Information')). str_repeat(" ",20)."\033[0m"); $lc++;
+        $this->scrPrintAt($lc, 0, "\033[4m".$this->getLine(array('pid'=>'PID', 'ip'=>'IP', 'user'=>'USER', 'command'=>'COMMAND', 'time'=>'TIME', 'devagent'=>'AGENT', 'devid'=>'DEVID', 'addinfo'=>'Additional Information')).str_repeat(" ", 20)."\033[0m"); $lc++;
 
         // print help text if requested
         $hl = 0;
         if ($this->helpexpire > $this->currenttime) {
             $help = $this->scrHelp();
             $linesAvail -= count($help);
-            $hl = $this->scrSize['height'] - count($help) -1;
+            $hl = $this->scrSize['height'] - count($help) - 1;
             foreach ($help as $h) {
-                $this->scrPrintAt($hl,0, $h);
+                $this->scrPrintAt($hl, 0, $h);
                 $hl++;
             }
         }
@@ -316,7 +316,7 @@ 
         if (count($this->linesActive) + count($this->linesOpen) + count($this->linesUnknown) > $linesAvail) {
             $toPrintUnknown = count($this->linesUnknown);
             $toPrintActive = count($this->linesActive);
-            $toPrintOpen = $linesAvail-$toPrintUnknown-$toPrintActive;
+            $toPrintOpen = $linesAvail - $toPrintUnknown - $toPrintActive;
             $toPrintTerm = 0;
         }
 
@@ -339,7 +339,7 @@ 
             if ($linesprinted >= $toPrintActive)
                 break;
 
-            $this->scrPrintAt($lc,0, "\033[01m" . $this->getLine($l)  ."\033[0m");
+            $this->scrPrintAt($lc, 0, "\033[01m".$this->getLine($l)."\033[0m");
             $lc++;
             $linesprinted++;
         }
@@ -349,7 +349,7 @@ 
             if ($linesprinted >= $toPrintOpen)
                 break;
 
-            $this->scrPrintAt($lc,0, $this->getLine($l));
+            $this->scrPrintAt($lc, 0, $this->getLine($l));
             $lc++;
             $linesprinted++;
         }
@@ -362,28 +362,28 @@ 
             $color = "0;31m";
             if ($l['push'] == false && $time - $l["start"] > 30)
                 $color = "1;31m";
-            $this->scrPrintAt($lc,0, "\033[0". $color . $this->getLine($l)  ."\033[0m");
+            $this->scrPrintAt($lc, 0, "\033[0".$color.$this->getLine($l)."\033[0m");
             $lc++;
             $linesprinted++;
         }
 
         if ($toPrintTerm > 0)
-            $toPrintTerm = $linesAvail - $lc +6;
+            $toPrintTerm = $linesAvail - $lc + 6;
 
         $linesprinted = 0;
-        foreach ($this->linesTerm as $time=>$l){
+        foreach ($this->linesTerm as $time=>$l) {
             if ($linesprinted >= $toPrintTerm)
                 break;
 
-            $this->scrPrintAt($lc,0, "\033[01;30m" . $this->getLine($l)  ."\033[0m");
+            $this->scrPrintAt($lc, 0, "\033[01;30m".$this->getLine($l)."\033[0m");
             $lc++;
             $linesprinted++;
         }
 
         // add the lines used when displaying the help text
         $lc += $hl;
-        $this->scrPrintAt($lc,0, "\033[K"); $lc++;
-        $this->scrPrintAt($lc,0, "Colorscheme: \033[01mActive  \033[0mOpen  \033[01;31mUnknown  \033[01;30mTerminated\033[0m");
+        $this->scrPrintAt($lc, 0, "\033[K"); $lc++;
+        $this->scrPrintAt($lc, 0, "Colorscheme: \033[01mActive  \033[0mOpen  \033[01;31mUnknown  \033[01;30mTerminated\033[0m");
 
         // remove old status
         if ($this->statusexpire < $this->currenttime)
@@ -391,13 +391,13 @@ 
 
         // show request information and help command
         if ($this->starttime + 6 > $this->currenttime) {
-            $this->status = sprintf("Requesting information (takes up to %dsecs)", $this->pingInterval). str_repeat(".", ($this->currenttime-$this->starttime)) . "  type \033[01;31mh\033[00;31m or \033[01;31mhelp\033[00;31m for usage instructions";
-            $this->statusexpire = $this->currenttime+1;
+            $this->status = sprintf("Requesting information (takes up to %dsecs)", $this->pingInterval).str_repeat(".", ($this->currenttime - $this->starttime))."  type \033[01;31mh\033[00;31m or \033[01;31mhelp\033[00;31m for usage instructions";
+            $this->statusexpire = $this->currenttime + 1;
         }
 
 
         $str = "";
-        if (! $this->showPush)
+        if (!$this->showPush)
             $str .= "\033[00;32mPush: \033[01;32mNo\033[0m   ";
 
         if ($this->showOption == self::SHOW_ACTIVE_ONLY)
@@ -407,7 +407,7 @@ 
             $str .= "\033[01;32mUnknown only\033[0m   ";
 
         if ($this->showTermSec != self::SHOW_TERM_DEFAULT_TIME)
-            $str .= "\033[01;32mTerminated: ". $this->showTermSec. "s\033[0m   ";
+            $str .= "\033[01;32mTerminated: ".$this->showTermSec."s\033[0m   ";
 
         if ($this->filter !== false || ($this->status !== false && $this->statusexpire > $this->currenttime)) {
             // print filter in green
@@ -417,9 +417,9 @@ 
             if ($this->status !== false)
                 $str .= "\033[00;31m$this->status\033[0m";
         }
-        $this->scrPrintAt(5,0, $str);
+        $this->scrPrintAt(5, 0, $str);
 
-        $this->scrPrintAt(4,0,"Action: \033[01m".$this->action . "\033[0m");
+        $this->scrPrintAt(4, 0, "Action: \033[01m".$this->action."\033[0m");
     }
 
     /**
@@ -433,14 +433,14 @@ 
 
         if ($ans[0] < 128) {
             if (isset($ans[1]) && bin2hex(trim($ans[1])) == "7f") {
-                $this->action = substr($this->action,0,-1);
+                $this->action = substr($this->action, 0, -1);
             }
 
-            if (isset($ans[1]) && $ans[1] != "" ){
-                $this->action .= trim(preg_replace("/[^A-Za-z0-9:]/","",$ans[1]));
+            if (isset($ans[1]) && $ans[1] != "") {
+                $this->action .= trim(preg_replace("/[^A-Za-z0-9:]/", "", $ans[1]));
             }
 
-            if (bin2hex($ans[0]) == "30" && bin2hex($ans[1]) == "0a")  {
+            if (bin2hex($ans[0]) == "30" && bin2hex($ans[1]) == "0a") {
                 $cmds = explode(':', $this->action);
                 if ($cmds[0] == "quit" || $cmds[0] == "q" || (isset($cmds[1]) && $cmds[0] == "" && $cmds[1] == "q")) {
                     $this->topCollector->CollectData(true);
@@ -448,7 +448,7 @@ 
 
                     $this->terminate = true;
                 }
-                else if ($cmds[0] == "clear" ) {
+                else if ($cmds[0] == "clear") {
                     $this->topCollector->ClearLatest(true);
                     $this->topCollector->CollectData(true);
                     $this->topCollector->ReInitIPC();
@@ -457,7 +457,7 @@ 
                     if (!isset($cmds[1]) || $cmds[1] == "") {
                         $this->filter = false;
                         $this->status = "No filter";
-                        $this->statusexpire = $this->currenttime+5;
+                        $this->statusexpire = $this->currenttime + 5;
                     }
                     else {
                         $this->filter = $cmds[1];
@@ -467,7 +467,7 @@ 
                 else if ($cmds[0] == "option" || $cmds[0] == "o") {
                     if (!isset($cmds[1]) || $cmds[1] == "") {
                         $this->status = "Option value needs to be specified. See 'help' or 'h' for instructions";
-                        $this->statusexpire = $this->currenttime+5;
+                        $this->statusexpire = $this->currenttime + 5;
                     }
                     else if ($cmds[1] == "p" || $cmds[1] == "push" || $cmds[1] == "ping")
                         $this->showPush = !$this->showPush;
@@ -484,7 +484,7 @@ 
                         $this->showTermSec = $cmds[1];
                     else {
                         $this->status = sprintf("Option '%s' unknown", $cmds[1]);
-                        $this->statusexpire = $this->currenttime+5;
+                        $this->statusexpire = $this->currenttime + 5;
                     }
                 }
                 else if ($cmds[0] == "reset" || $cmds[0] == "r") {
@@ -492,66 +492,66 @@ 
                     $this->wide = false;
                     $this->helpexpire = 0;
                     $this->status = "reset";
-                    $this->statusexpire = $this->currenttime+2;
+                    $this->statusexpire = $this->currenttime + 2;
                 }
                 // enable/disable wide view
                 else if ($cmds[0] == "wide" || $cmds[0] == "w") {
-                    $this->wide = ! $this->wide;
-                    $this->status = ($this->wide)?"w i d e  view" : "normal view";
-                    $this->statusexpire = $this->currenttime+2;
+                    $this->wide = !$this->wide;
+                    $this->status = ($this->wide) ? "w i d e  view" : "normal view";
+                    $this->statusexpire = $this->currenttime + 2;
                 }
                 else if ($cmds[0] == "help" || $cmds[0] == "h") {
-                    $this->helpexpire = $this->currenttime+20;
+                    $this->helpexpire = $this->currenttime + 20;
                 }
                 // grep the log file
-                else if (($cmds[0] == "log" || $cmds[0] == "l") && isset($cmds[1]) ) {
+                else if (($cmds[0] == "log" || $cmds[0] == "l") && isset($cmds[1])) {
                     if (!file_exists(LOGFILE)) {
-                        $this->status = "Logfile can not be found: ". LOGFILE;
+                        $this->status = "Logfile can not be found: ".LOGFILE;
                     }
                     else {
-                        system('bash -c "fgrep -a '.escapeshellarg($cmds[1]).' '. LOGFILE .' | less +G" > `tty`');
+                        system('bash -c "fgrep -a '.escapeshellarg($cmds[1]).' '.LOGFILE.' | less +G" > `tty`');
                         $this->status = "Returning from log, updating data";
                     }
-                    $this->statusexpire = time()+5; // it might be much "later" now
+                    $this->statusexpire = time() + 5; // it might be much "later" now
                 }
                 // tail the log file
                 else if (($cmds[0] == "tail" || $cmds[0] == "t")) {
                     if (!file_exists(LOGFILE)) {
-                        $this->status = "Logfile can not be found: ". LOGFILE;
+                        $this->status = "Logfile can not be found: ".LOGFILE;
                     }
                     else {
                         $this->doingTail = true;
                         $this->scrClear();
-                        $this->scrPrintAt(1,0,$this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
+                        $this->scrPrintAt(1, 0, $this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
                         $secondary = "";
-                        if (isset($cmds[1])) $secondary =  " -n 200 | grep ".escapeshellarg($cmds[1]);
-                        system('bash -c "tail -f '. LOGFILE . $secondary . '" > `tty`');
+                        if (isset($cmds[1])) $secondary = " -n 200 | grep ".escapeshellarg($cmds[1]);
+                        system('bash -c "tail -f '.LOGFILE.$secondary.'" > `tty`');
                         $this->doingTail = false;
                         $this->status = "Returning from tail, updating data";
                     }
-                    $this->statusexpire = time()+5; // it might be much "later" now
+                    $this->statusexpire = time() + 5; // it might be much "later" now
                 }
                 // tail the error log file
                 else if (($cmds[0] == "error" || $cmds[0] == "e")) {
                     if (!file_exists(LOGERRORFILE)) {
-                        $this->status = "Error logfile can not be found: ". LOGERRORFILE;
+                        $this->status = "Error logfile can not be found: ".LOGERRORFILE;
                     }
                     else {
                         $this->doingTail = true;
                         $this->scrClear();
-                        $this->scrPrintAt(1,0,$this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
+                        $this->scrPrintAt(1, 0, $this->scrAsBold("Press CTRL+C to return to grommunio-sync-top\n\n"));
                         $secondary = "";
-                        if (isset($cmds[1])) $secondary =  " -n 200 | grep ".escapeshellarg($cmds[1]);
-                        system('bash -c "tail -f '. LOGERRORFILE . $secondary . '" > `tty`');
+                        if (isset($cmds[1])) $secondary = " -n 200 | grep ".escapeshellarg($cmds[1]);
+                        system('bash -c "tail -f '.LOGERRORFILE.$secondary.'" > `tty`');
                         $this->doingTail = false;
                         $this->status = "Returning from tail, updating data";
                     }
-                    $this->statusexpire = time()+5; // it might be much "later" now
+                    $this->statusexpire = time() + 5; // it might be much "later" now
                 }
 
                 else if ($cmds[0] != "") {
                     $this->status = sprintf("Command '%s' unknown", $cmds[0]);
-                    $this->statusexpire = $this->currenttime+8;
+                    $this->statusexpire = $this->currenttime + 8;
                 }
                 $this->action = "";
             }
@@ -582,7 +582,7 @@ 
      * @access public
      */
     public function UsageInstructions() {
-        $help = "Usage:\n\tgrommunio-sync-top.php\n\n" .
+        $help = "Usage:\n\tgrommunio-sync-top.php\n\n".
                 "  grommunio-sync-top is a live top-like overview of what grommunio-sync is doing. It does not have specific command line options.\n\n".
                 "  When grommunio-sync-top is running you can specify certain actions and options which can be executed (listed below).\n".
                 "  This help information can also be shown inside grommunio-sync-top by hitting 'help' or 'h'.\n\n";
@@ -634,7 +634,7 @@ 
      * @return string       same text as bold
      */
     private function scrAsBold($text) {
-        return "\033[01m" . $text  ."\033[0m";
+        return "\033[01m".$text."\033[0m";
     }
 
     /**
@@ -647,9 +647,9 @@ 
      */
     private function getLine($l) {
         if ($this->wide === true)
-            return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'],6), $this->ptStr($l['ip'],16), $this->ptStr($l['user'],24), $this->ptStr($l['command'],16), $this->ptStr($this->sec2min($l['time']),8), $this->ptStr($l['devagent'],28), $this->ptStr($l['devid'],33, true), $l['addinfo']);
+            return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'], 6), $this->ptStr($l['ip'], 16), $this->ptStr($l['user'], 24), $this->ptStr($l['command'], 16), $this->ptStr($this->sec2min($l['time']), 8), $this->ptStr($l['devagent'], 28), $this->ptStr($l['devid'], 33, true), $l['addinfo']);
         else
-            return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'],6), $this->ptStr($l['ip'],16), $this->ptStr($l['user'],8), $this->ptStr($l['command'],8), $this->ptStr($this->sec2min($l['time']),6), $this->ptStr($l['devagent'],20), $this->ptStr($l['devid'],12, true), $l['addinfo']);
+            return sprintf("%s%s%s%s%s%s%s%s", $this->ptStr($l['pid'], 6), $this->ptStr($l['ip'], 16), $this->ptStr($l['user'], 8), $this->ptStr($l['command'], 8), $this->ptStr($this->sec2min($l['time']), 6), $this->ptStr($l['devagent'], 20), $this->ptStr($l['devid'], 12, true), $l['addinfo']);
     }
 
     /**
@@ -667,11 +667,11 @@ 
         if (strlen($str) < $size)
             return str_pad($str, $size);
         else if ($cutmiddle == true) {
-            $cut = ($size-2)/2;
-            return $this->ptStr(substr($str,0,$cut) ."..". substr($str,(-1)*($cut-1)), $size);
+            $cut = ($size - 2) / 2;
+            return $this->ptStr(substr($str, 0, $cut)."..".substr($str, (-1) * ($cut - 1)), $size);
         }
         else {
-            return substr($str,0,$size-3).".. ";
+            return substr($str, 0, $size - 3).".. ";
         }
     }
 
@@ -711,7 +711,7 @@ 
     private function sec2min($s) {
         if (!is_int($s))
             return $s;
-        return sprintf("%02.2d:%02.2d", floor($s/60), $s%60);
+        return sprintf("%02.2d:%02.2d", floor($s / 60), $s % 60);
     }
 
     /**
@@ -746,7 +746,7 @@ 
      * @access private
      * @return
      */
-    private function scrPrintAt($row, $col, $text="") {
+    private function scrPrintAt($row, $col, $text = "") {
         echo "\033[".$row.";".$col."H".$text;
     }
 

config.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
     define('TIMEZONE', '');
 
     // Defines the base path on the server
-    define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']). '/');
+    define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
 
     // Try to set unlimited timeout
     define('SCRIPT_TIMEOUT', 0);
@@ -80,8 +80,8 @@ 
 
     // Filelog settings
     define('LOGFILEDIR', '/var/log/grommunio-sync/');
-    define('LOGFILE', LOGFILEDIR . 'grommunio-sync.log');
-    define('LOGERRORFILE', LOGFILEDIR . 'grommunio-sync-error.log');
+    define('LOGFILE', LOGFILEDIR.'grommunio-sync.log');
+    define('LOGERRORFILE', LOGFILEDIR.'grommunio-sync-error.log');
 
     // Syslog settings
     // false will log to local syslog, otherwise put the remote syslog IP here
@@ -216,7 +216,7 @@ 
     // point. You can add DeviceType strings to the categories.
     // In general longer timeouts are better, because more data can be streamed at once.
     define('SYNC_TIMEOUT_MEDIUM_DEVICETYPES', "SAMSUNGGTI");
-    define('SYNC_TIMEOUT_LONG_DEVICETYPES',   "iPod, iPad, iPhone, WP, WindowsOutlook, WindowsMail");
+    define('SYNC_TIMEOUT_LONG_DEVICETYPES', "iPod, iPad, iPhone, WP, WindowsOutlook, WindowsMail");
 
     // Time in seconds the device should wait whenever the service is unavailable,
     // e.g. when a backend service is unavailable.

mapi/class.taskrequest.php

Spacing +82 added lines, -82 removed lines

@@ -23,12 +23,12 @@ 
      * carried in the IPM.TaskRequest item (although this information seems
      * redundant due to that information already being available in PR_MESSAGE_CLASS).
      */
-    define('tdmtNothing', 0);            // Value in IPM.Task items
-    define('tdmtTaskReq', 1);            // Assigner -> Assignee
-    define('tdmtTaskAcc', 2);            // Assignee -> Assigner
-    define('tdmtTaskDec', 3);            // Assignee -> Assigner
-    define('tdmtTaskUpd', 4);            // Assignee -> Assigner
-    define('tdmtTaskSELF', 5);            // Assigner -> Assigner (?)
+    define('tdmtNothing', 0); // Value in IPM.Task items
+    define('tdmtTaskReq', 1); // Assigner -> Assignee
+    define('tdmtTaskAcc', 2); // Assignee -> Assigner
+    define('tdmtTaskDec', 3); // Assignee -> Assigner
+    define('tdmtTaskUpd', 4); // Assignee -> Assigner
+    define('tdmtTaskSELF', 5); // Assigner -> Assigner (?)
 
     /* The TaskHistory is used to show the last action on the task
      * on both the assigner and the assignee's side.
@@ -38,22 +38,22 @@ 
      * the format 'Accepted by <user> on 01-01-2010 11:00'.
      */
     define('thNone', 0);
-    define('thAccepted', 1);            // Set by assignee
-    define('thDeclined', 2);            // Set by assignee
-    define('thUpdated', 3);                // Set by assignee
+    define('thAccepted', 1); // Set by assignee
+    define('thDeclined', 2); // Set by assignee
+    define('thUpdated', 3); // Set by assignee
     define('thDueDateChanged', 4);
-    define('thAssigned', 5);            // Set by assigner
+    define('thAssigned', 5); // Set by assigner
 
     /* The TaskState value is used to differentiate the version of a task
      * in the assigner's folder and the version in the
      * assignee's folder. The buttons shown depend on this and
      * the 'taskaccepted' boolean (for the assignee)
      */
-    define('tdsNOM', 0);        // Got a response to a deleted task, and re-created the task for the assigner
-    define('tdsOWNNEW', 1);        // Not assigned
-    define('tdsOWN', 2);        // Assignee version
-    define('tdsACC', 3);        // Assigner version
-    define('tdsDEC', 4);        // Assigner version, but assignee declined
+    define('tdsNOM', 0); // Got a response to a deleted task, and re-created the task for the assigner
+    define('tdsOWNNEW', 1); // Not assigned
+    define('tdsOWN', 2); // Assignee version
+    define('tdsACC', 3); // Assigner version
+    define('tdsDEC', 4); // Assigner version, but assignee declined
 
     /* The TaskAcceptanceState is used for the assigner to indicate state */
     define('olTaskNotDelegated', 0);
@@ -63,13 +63,13 @@ 
 
     /* The task ownership indicates the role of the current user relative to the task. */
     define('olNewTask', 0);
-    define('olDelegatedTask', 1);    // Task has been assigned
-    define('olOwnTask', 2);            // Task owned
+    define('olDelegatedTask', 1); // Task has been assigned
+    define('olOwnTask', 2); // Task owned
 
     /* taskmultrecips indicates whether the task request sent or received has multiple assignees or not. */
     define('tmrNone', 0);
-    define('tmrSent', 1);        // Task has been sent to multiple assignee
-    define('tmrReceived', 2);    // Task Request received has multiple assignee
+    define('tmrSent', 1); // Task has been sent to multiple assignee
+    define('tmrReceived', 2); // Task Request received has multiple assignee
 
     //Task icon index.
     define('ICON_TASK_ASSIGNEE', 0x00000502);
@@ -165,12 +165,12 @@ 
          */
         function isTaskRequest($messageClass = false)
         {
-            if($messageClass === false) {
+            if ($messageClass === false) {
                 $props = mapi_getprops($this->message, Array(PR_MESSAGE_CLASS));
                 $messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
             }
 
-            if($messageClass !== false &&  $messageClass === "IPM.TaskRequest") {
+            if ($messageClass !== false && $messageClass === "IPM.TaskRequest") {
                 return true;
             }
 
@@ -184,12 +184,12 @@ 
          */
         function isTaskRequestResponse($messageClass = false)
         {
-            if($messageClass === false) {
+            if ($messageClass === false) {
                 $props = mapi_getprops($this->message, Array(PR_MESSAGE_CLASS));
                 $messageClass = isset($props[PR_MESSAGE_CLASS]) ? $props[PR_MESSAGE_CLASS] : false;
             }
 
-            if($messageClass !== false &&  strpos($messageClass, "IPM.TaskRequest.") === 0) {
+            if ($messageClass !== false && strpos($messageClass, "IPM.TaskRequest.") === 0) {
                 return true;
             }
 
@@ -222,7 +222,7 @@ 
         {
             $props = mapi_getprops($this->message, array(PR_MESSAGE_CLASS, $this->props['task_goid']));
 
-            if($props[PR_MESSAGE_CLASS] == "IPM.Task") {
+            if ($props[PR_MESSAGE_CLASS] == "IPM.Task") {
                 // Message itself is task, so return that
                 return $this->message;
             }
@@ -240,9 +240,9 @@ 
 
             $rows = mapi_table_queryallrows($contents, array(PR_ENTRYID), $restriction);
 
-            if(empty($rows)) {
+            if (empty($rows)) {
                 // None found, create one if possible
-                if(!$create) {
+                if (!$create) {
                     return false;
                 }
 
@@ -288,7 +288,7 @@ 
             $result = false;
             $associatedTask = $this->getAssociatedTask(false);
             if ($this->isTaskRequest($props[PR_MESSAGE_CLASS])) {
-                if($associatedTask) {
+                if ($associatedTask) {
                     return true;
                 } else {
                     $folder = $this->getDefaultTasksFolder();
@@ -300,7 +300,7 @@ 
                         VALUE => $goid)
                     );
 
-                    $table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS | SHOW_SOFT_DELETES);
+                    $table = mapi_folder_getcontentstable($folder, MAPI_DEFERRED_ERRORS|SHOW_SOFT_DELETES);
                     $softDeletedItems = mapi_table_queryallrows($table, array(PR_ENTRYID), $restriction);
                     if (!empty($softDeletedItems)) {
                         return true;
@@ -315,7 +315,7 @@ 
                  * if(message_counter >= task_counter) task is not updated, do normal processing
                  */
                 if (isset($taskItemProps[$this->props['updatecount']], $props[$this->props['updatecount']])) {
-                    if($props[$this->props['updatecount']] < $taskItemProps[$this->props['updatecount']]) {
+                    if ($props[$this->props['updatecount']] < $taskItemProps[$this->props['updatecount']]) {
                         $result = true;
                     }
                 }
@@ -345,7 +345,7 @@ 
 
             // If task is updated in task folder then we don't need to process
             // old response
-            if($this->isTaskRequestUpdated()) {
+            if ($this->isTaskRequestUpdated()) {
                 return true;
             }
 
@@ -379,7 +379,7 @@ 
                     break;
             }
 
-            $props =  array($this->props['taskhistory'] => $taskHistory,
+            $props = array($this->props['taskhistory'] => $taskHistory,
                 $this->props['taskstate'] => $taskState,
                 $this->props['task_acceptance_state'] => $taskAcceptanceState,
                 $this->props['ownership'] => $taskOwner);
@@ -391,7 +391,7 @@ 
                 // all attachments from associated task.
                 $taskAttachTable = mapi_message_getattachmenttable($task);
                 $taskAttachments = mapi_table_queryallrows($taskAttachTable, array(PR_ATTACH_NUM));
-                foreach($taskAttachments as $taskAttach) {
+                foreach ($taskAttachments as $taskAttach) {
                     mapi_message_deleteattach($task, $taskAttach[PR_ATTACH_NUM]);
                 }
 
@@ -426,7 +426,7 @@ 
                 mapi_setprops($task, $senderProps);
 
                 // Update taskstate and task history (last action done by the assignee)
-                mapi_setprops($task,$props);
+                mapi_setprops($task, $props);
 
                 mapi_savechanges($task);
             }
@@ -434,7 +434,7 @@ 
             mapi_setprops($this->message, $props);
             mapi_savechanges($this->message);
 
-            if($isReceivedItem) {
+            if ($isReceivedItem) {
                 $this->updateSentTaskRequest();
             }
             return true;
@@ -458,7 +458,7 @@ 
             $storeProps = mapi_getprops($store, array(PR_IPM_SENTMAIL_ENTRYID));
 
             $sentFolder = mapi_msgstore_openentry($store, $storeProps[PR_IPM_SENTMAIL_ENTRYID]);
-            if(!$sentFolder) {
+            if (!$sentFolder) {
                 return false;
             }
 
@@ -472,7 +472,7 @@ 
 
             $rows = mapi_table_queryallrows($contentsTable, array(PR_ENTRYID), $restriction);
 
-            if(!empty($rows)) {
+            if (!empty($rows)) {
                 foreach ($rows as $row) {
                     $sentTaskRequest = mapi_msgstore_openentry($store, $row[PR_ENTRYID]);
                     mapi_setprops($sentTaskRequest, $props);
@@ -496,12 +496,12 @@ 
             // Set properties on Task Request
             mapi_setprops($this->message, array(
                 $this->props['task_goid'] => $taskid, /* our new task_goid */
-                $this->props['taskstate'] => tdsACC,         /* state for our outgoing request */
-                $this->props['taskmode'] => tdmtNothing,     /* we're not sending a change */
-                $this->props['updatecount'] => 2,            /* version 2 (no idea) */
+                $this->props['taskstate'] => tdsACC, /* state for our outgoing request */
+                $this->props['taskmode'] => tdmtNothing, /* we're not sending a change */
+                $this->props['updatecount'] => 2, /* version 2 (no idea) */
                 $this->props['task_acceptance_state'] => olTaskDelegationUnknown, /* no reply yet */
                 $this->props['ownership'] => olDelegatedTask, /* Task has been assigned */
-                $this->props['taskhistory'] => thAssigned,    /* Task has been assigned */
+                $this->props['taskhistory'] => thAssigned, /* Task has been assigned */
                 PR_CONVERSATION_TOPIC => $messageprops[PR_SUBJECT],
                 PR_ICON_INDEX => ICON_TASK_ASSIGNER         /* Task request icon*/
             ));
@@ -518,12 +518,12 @@ 
 
             // Make it a task request, and put it in sent items after it is sent
             mapi_setprops($outgoing, array(
-                PR_MESSAGE_CLASS => "IPM.TaskRequest",         /* class is task request */
-                $this->props['taskstate'] => tdsOWN,         /* for the recipient he is the task owner */
-                $this->props['taskmode'] => tdmtTaskReq,    /* for the recipient it's a request */
-                $this->props['updatecount'] => 1,            /* version 2 is in the attachment */
+                PR_MESSAGE_CLASS => "IPM.TaskRequest", /* class is task request */
+                $this->props['taskstate'] => tdsOWN, /* for the recipient he is the task owner */
+                $this->props['taskmode'] => tdmtTaskReq, /* for the recipient it's a request */
+                $this->props['updatecount'] => 1, /* version 2 is in the attachment */
                 PR_SUBJECT_PREFIX => $prefix,
-                PR_SUBJECT => $prefix . $messageprops[PR_SUBJECT]
+                PR_SUBJECT => $prefix.$messageprops[PR_SUBJECT]
             ));
 
             $attach = mapi_message_createattach($outgoing);
@@ -532,7 +532,7 @@ 
                     PR_ATTACHMENT_HIDDEN => true,
                     PR_DISPLAY_NAME => $messageprops[PR_SUBJECT]));
 
-            $sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY | MAPI_CREATE);
+            $sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_MODIFY|MAPI_CREATE);
 
             mapi_copyto($this->message, array(), array(), $sub);
             mapi_savechanges($sub);
@@ -553,7 +553,7 @@ 
         function updateTaskRequest() {
             $messageprops = mapi_getprops($this->message, array($this->props['updatecount']));
 
-            if(isset($messageprops)) {
+            if (isset($messageprops)) {
                 $messageprops[$this->props['updatecount']]++;
             } else {
                 $messageprops[$this->props['updatecount']] = 1;
@@ -578,7 +578,7 @@ 
 
             // if task is updated in task folder then we don't need to process
             // old request.
-            if($this->isTaskRequestUpdated()) {
+            if ($this->isTaskRequestUpdated()) {
                 return true;
             }
 
@@ -629,10 +629,10 @@ 
          * @return entryid EntryID of the accepted task
          */
         function doAccept() {
-            $prefix = _("Task Accepted:") . " ";
+            $prefix = _("Task Accepted:")." ";
             $messageProps = mapi_getprops($this->message, array(PR_MESSAGE_CLASS, $this->props['taskstate']));
 
-            if(!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
+            if (!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
                 // Can only accept assignee task
                 return false;
             }
@@ -678,10 +678,10 @@ 
          * @return boolean TRUE on success, FALSE on failure
          */
         function doDecline() {
-            $prefix = _("Task Declined:") . " ";
+            $prefix = _("Task Declined:")." ";
             $messageProps = mapi_getprops($this->message, array($this->props['taskstate']));
 
-            if(!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
+            if (!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
                 return false; // Can only decline assignee task
             }
 
@@ -718,7 +718,7 @@ 
         function doUpdate() {
             $messageProps = mapi_getprops($this->message, array($this->props['taskstate'], PR_SUBJECT));
 
-            if(!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
+            if (!isset($messageProps[$this->props['taskstate']]) || $messageProps[$this->props['taskstate']] != tdsOWN) {
                 return false; // Can only update assignee task
             }
 
@@ -732,9 +732,9 @@ 
 
             $props = mapi_getprops($this->message, array($this->props['taskupdates'], $this->props['tasksoc'], $this->props['recurring'], $this->props['complete']));
             if (!$props[$this->props['complete']] && $props[$this->props['taskupdates']] && !(isset($props[$this->props['recurring']]) && $props[$this->props['recurring']])) {
-                $this->sendResponse(tdmtTaskUpd, _("Task Updated:") . " ");
-            } else if($props[$this->props['complete']]) {
-                $this->sendResponse(tdmtTaskUpd, _("Task Completed:") . " ");
+                $this->sendResponse(tdmtTaskUpd, _("Task Updated:")." ");
+            } else if ($props[$this->props['complete']]) {
+                $this->sendResponse(tdmtTaskUpd, _("Task Completed:")." ");
             }
             return true;
         }
@@ -750,21 +750,21 @@ 
             $ownerentryid = false;
 
             $rcvdprops = mapi_getprops($this->message, array(PR_RCVD_REPRESENTING_ENTRYID));
-            if(isset($rcvdprops[PR_RCVD_REPRESENTING_ENTRYID])) {
+            if (isset($rcvdprops[PR_RCVD_REPRESENTING_ENTRYID])) {
                 $ownerentryid = $rcvdprops;
             }
 
-            if(!$ownerentryid) {
+            if (!$ownerentryid) {
                 $store = $this->store;
             } else {
                 $ab = mapi_openaddressbook($this->session);
-                if(!$ab) return false;
+                if (!$ab) return false;
 
                 $mailuser = mapi_ab_openentry($ab, $ownerentryid);
-                if(!$mailuser) return false;
+                if (!$mailuser) return false;
 
                 $mailuserprops = mapi_getprops($mailuser, array(PR_EMAIL_ADDRESS));
-                if(!isset($mailuserprops[PR_EMAIL_ADDRESS])) return false;
+                if (!isset($mailuserprops[PR_EMAIL_ADDRESS])) return false;
 
                 $storeid = mapi_msgstore_createentryid($this->store, $mailuserprops[PR_EMAIL_ADDRESS]);
 
@@ -783,7 +783,7 @@ 
 
             $inbox = mapi_msgstore_getreceivefolder($store);
             $inboxprops = mapi_getprops($inbox, Array(PR_IPM_TASK_ENTRYID));
-            if(!isset($inboxprops[PR_IPM_TASK_ENTRYID]))
+            if (!isset($inboxprops[PR_IPM_TASK_ENTRYID]))
                 return false;
 
             return mapi_msgstore_openentry($store, $inboxprops[PR_IPM_TASK_ENTRYID]);
@@ -827,10 +827,10 @@ 
             $storeprops = mapi_getprops($store, array(PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID));
 
             $outbox = mapi_msgstore_openentry($store, $storeprops[PR_IPM_OUTBOX_ENTRYID]);
-            if(!$outbox) return false;
+            if (!$outbox) return false;
 
             $outgoing = mapi_folder_createmessage($outbox);
-            if(!$outgoing) return false;
+            if (!$outgoing) return false;
 
             // Set SENT_REPRESENTING in case we're sending as a delegate
             $ownerstore = $this->getTaskFolderStore();
@@ -856,7 +856,7 @@ 
 
             $attach = mapi_message_createattach($outgoing);
             mapi_setprops($attach, array(PR_ATTACH_METHOD => ATTACH_EMBEDDED_MSG, PR_DISPLAY_NAME => $messageprops[PR_CONVERSATION_TOPIC], PR_ATTACHMENT_HIDDEN => true));
-            $sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE | MAPI_MODIFY);
+            $sub = mapi_attach_openproperty($attach, PR_ATTACH_DATA_OBJ, IID_IMessage, 0, MAPI_CREATE|MAPI_MODIFY);
 
             $message = !$this->isTaskRequest() ? $this->message : $this->getAssociatedTask(false);
 
@@ -870,7 +870,7 @@ 
             }
 
             $props = array();
-            switch($type) {
+            switch ($type) {
                 case tdmtTaskAcc:
                     $props[PR_MESSAGE_CLASS] = "IPM.TaskRequest.Accept";
                     mapi_setprops($sub, array(PR_ICON_INDEX => ICON_TASK_ASSIGNER));
@@ -881,7 +881,7 @@ 
                     break;
                 case tdmtTaskUpd:
                     mapi_setprops($sub, array(PR_ICON_INDEX => ICON_TASK_ASSIGNER));
-                    if($messageprops[$this->props['complete']]) {
+                    if ($messageprops[$this->props['complete']]) {
                         $props[PR_MESSAGE_CLASS] = "IPM.TaskRequest.Complete";
                     } else {
                         $props[PR_MESSAGE_CLASS] = "IPM.TaskRequest.Update";
@@ -893,7 +893,7 @@ 
             mapi_savechanges($sub);
             mapi_savechanges($attach);
 
-            $props[PR_SUBJECT] = $prefix . $messageprops[PR_CONVERSATION_TOPIC];
+            $props[PR_SUBJECT] = $prefix.$messageprops[PR_CONVERSATION_TOPIC];
             $props[$this->props['taskmode']] = $type;
             $props[$this->props['task_assigned_time']] = time();
 
@@ -903,7 +903,7 @@ 
             // edit response before sending task response.
             if ($this->taskCommentsInfo) {
                 $comments = $this->getTaskCommentsInfo();
-                $stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, STGM_TRANSACTED, MAPI_CREATE | MAPI_MODIFY);
+                $stream = mapi_openproperty($outgoing, PR_BODY, IID_IStream, STGM_TRANSACTED, MAPI_CREATE|MAPI_MODIFY);
                 mapi_stream_setsize($stream, strlen($comments));
                 mapi_stream_write($stream, $comments);
                 mapi_stream_commit($stream);
@@ -919,8 +919,8 @@ 
             $table = mapi_getmsgstorestable($this->session);
             $rows = mapi_table_queryallrows($table, array(PR_DEFAULT_STORE, PR_ENTRYID));
 
-            foreach($rows as $row) {
-                if($row[PR_DEFAULT_STORE])
+            foreach ($rows as $row) {
+                if ($row[PR_DEFAULT_STORE])
                     return mapi_openmsgstore($this->session, $row[PR_ENTRYID]);
             }
 
@@ -935,7 +935,7 @@ 
         function createTGOID()
         {
             $goid = "";
-            for($i=0;$i<16;$i++) {
+            for ($i = 0; $i < 16; $i++) {
                 $goid .= chr(rand(0, 255));
             }
             return $goid;
@@ -959,7 +959,7 @@ 
                             );
             $rows = mapi_table_queryallrows($attachmentTable, array(PR_ATTACH_NUM), $restriction);
 
-            if(empty($rows)) {
+            if (empty($rows)) {
                 return $task;
             }
 
@@ -972,7 +972,7 @@ 
                 }
 
                 $taskGoid = mapi_getprops($task, array($this->props["task_goid"]));
-                if($goid[$this->props["task_goid"]] === $taskGoid[$this->props["task_goid"]]) {
+                if ($goid[$this->props["task_goid"]] === $taskGoid[$this->props["task_goid"]]) {
                     mapi_setprops($attach, array(PR_ATTACHMENT_HIDDEN => true));
                     mapi_savechanges($attach);
                     mapi_savechanges($message);
@@ -1042,11 +1042,11 @@ 
 
             // Delete all MAPI_TO recipients
             $recips = mapi_table_queryallrows($recipTable, array(PR_ROWID), array(RES_PROPERTY,
-                                                                                array(    RELOP => RELOP_EQ,
+                                                                                array(RELOP => RELOP_EQ,
                                                                                         ULPROPTAG => PR_RECIPIENT_TYPE,
                                                                                         VALUE => MAPI_TO
                                                                                 )));
-            foreach($recips as $recip) {
+            foreach ($recips as $recip) {
                 mapi_message_modifyrecipients($task, MODRECIP_REMOVE, array($recip));
             }
 
@@ -1112,7 +1112,7 @@ 
 
             $rows = mapi_table_queryallrows($contents, array(PR_ENTRYID, PR_PARENT_ENTRYID, PR_STORE_ENTRYID), $restriction);
 
-            if(!empty($rows)) {
+            if (!empty($rows)) {
                 // If there are multiple, just use the first
                 $entryid = $rows[0][PR_ENTRYID];
                 $wastebasket = mapi_msgstore_openentry($store, $storeProps[PR_IPM_WASTEBASKET_ENTRYID]);
@@ -1146,7 +1146,7 @@ 
 
                 $recipTable = mapi_message_getrecipienttable($this->message);
                 $recips = mapi_table_queryallrows($recipTable, $this->recipProps, array(RES_PROPERTY,
-                                                                                        array(    RELOP => RELOP_EQ,
+                                                                                        array(RELOP => RELOP_EQ,
                                                                                                 ULPROPTAG => PR_RECIPIENT_TYPE,
                                                                                                 VALUE => ($isComplete ? MAPI_BCC : MAPI_CC)
                                                                                         )
@@ -1157,8 +1157,8 @@ 
                     return false;
                 }
 
-                foreach($recips as $recip) {
-                    $recip[PR_RECIPIENT_TYPE] = MAPI_TO;    // Change recipient type to MAPI_TO
+                foreach ($recips as $recip) {
+                    $recip[PR_RECIPIENT_TYPE] = MAPI_TO; // Change recipient type to MAPI_TO
                     mapi_message_modifyrecipients($outgoing, MODRECIP_ADD, array($recip));
                 }
                 return true;
@@ -1187,7 +1187,7 @@ 
             $recipTable = mapi_message_getrecipienttable($message);
             $recipRows = mapi_table_queryallrows($recipTable, array(PR_ROWID));
 
-            foreach($recipRows as $recipient) {
+            foreach ($recipRows as $recipient) {
                 mapi_message_modifyrecipients($message, MODRECIP_REMOVE, array($recipient));
             }
         }
@@ -1202,7 +1202,7 @@ 
         {
             $messageprops = mapi_getprops($this->message, array($this->props['taskstate']));
 
-            if(!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
+            if (!isset($messageprops[$this->props['taskstate']]) || $messageprops[$this->props['taskstate']] != tdsOWN) {
                 return false; // Can only decline assignee task
             }
 

mapi/class.recurrence.php

Spacing +112 added lines, -112 removed lines

@@ -114,17 +114,17 @@ 
             $basetime = $baseday + $this->recur["startocc"] * 60;
 
             // Remove any pre-existing exception on this base date
-            if($this->isException($baseday)) {
+            if ($this->isException($baseday)) {
                 $this->deleteException($baseday); // note that deleting an exception is different from creating a deleted exception (deleting an occurrence).
             }
 
-            if(!$delete) {
-                if(isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
+            if (!$delete) {
+                if (isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
                     return false;
                 }
                 // Properties in the attachment are the properties of the base object, plus $exception_props plus the base date
                 foreach (array("subject", "location", "label", "reminder", "reminder_minutes", "alldayevent", "busystatus") as $propname) {
-                    if(isset($this->messageprops[$this->proptags[$propname]]))
+                    if (isset($this->messageprops[$this->proptags[$propname]]))
                         $props[$this->proptags[$propname]] = $this->messageprops[$this->proptags[$propname]];
                 }
 
@@ -145,11 +145,11 @@ 
                 }
 
                 // synchronize commonstart/commonend with startdate/duedate
-                if(isset($props[$this->proptags["startdate"]])) {
+                if (isset($props[$this->proptags["startdate"]])) {
                     $props[$this->proptags["commonstart"]] = $props[$this->proptags["startdate"]];
                 }
 
-                if(isset($props[$this->proptags["duedate"]])) {
+                if (isset($props[$this->proptags["duedate"]])) {
                     $props[$this->proptags["commonend"]] = $props[$this->proptags["duedate"]];
                 }
 
@@ -162,31 +162,31 @@ 
                 $changed_item["start"] = $this->fromGMT($this->tz, $props[$this->proptags["startdate"]]);
                 $changed_item["end"] = $this->fromGMT($this->tz, $props[$this->proptags["duedate"]]);
 
-                if(array_key_exists($this->proptags["subject"], $exception_props)) {
+                if (array_key_exists($this->proptags["subject"], $exception_props)) {
                     $changed_item["subject"] = $exception_props[$this->proptags["subject"]];
                 }
 
-                if(array_key_exists($this->proptags["location"], $exception_props)) {
+                if (array_key_exists($this->proptags["location"], $exception_props)) {
                     $changed_item["location"] = $exception_props[$this->proptags["location"]];
                 }
 
-                if(array_key_exists($this->proptags["label"], $exception_props)) {
+                if (array_key_exists($this->proptags["label"], $exception_props)) {
                     $changed_item["label"] = $exception_props[$this->proptags["label"]];
                 }
 
-                if(array_key_exists($this->proptags["reminder"], $exception_props)) {
+                if (array_key_exists($this->proptags["reminder"], $exception_props)) {
                     $changed_item["reminder_set"] = $exception_props[$this->proptags["reminder"]];
                 }
 
-                if(array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
+                if (array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
                     $changed_item["remind_before"] = $exception_props[$this->proptags["reminder_minutes"]];
                 }
 
-                if(array_key_exists($this->proptags["alldayevent"], $exception_props)) {
+                if (array_key_exists($this->proptags["alldayevent"], $exception_props)) {
                     $changed_item["alldayevent"] = $exception_props[$this->proptags["alldayevent"]];
                 }
 
-                if(array_key_exists($this->proptags["busystatus"], $exception_props)) {
+                if (array_key_exists($this->proptags["busystatus"], $exception_props)) {
                     $changed_item["busystatus"] = $exception_props[$this->proptags["busystatus"]];
                 }
 
@@ -198,7 +198,7 @@ 
             }
 
             // Turn on hideattachments, because the attachments in this item are the exceptions
-            mapi_setprops($this->message, array ( $this->proptags["hideattachments"] => true ));
+            mapi_setprops($this->message, array($this->proptags["hideattachments"] => true));
 
             // Save recurrence data to message
             $this->saveRecurrence();
@@ -212,74 +212,74 @@ 
          */
         function modifyException($exception_props, $base_date, $exception_recips = array(), $copy_attach_from = false)
         {
-            if(isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
+            if (isset($exception_props[$this->proptags["startdate"]]) && !$this->isValidExceptionDate($base_date, $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]))) {
                 return false;
             }
 
             $baseday = $this->dayStartOf($base_date);
             $extomodify = false;
 
-            for($i = 0, $len = count($this->recur["changed_occurences"]); $i < $len; $i++) {
-                if($this->isSameDay($this->recur["changed_occurences"][$i]["basedate"], $baseday))
+            for ($i = 0, $len = count($this->recur["changed_occurences"]); $i < $len; $i++) {
+                if ($this->isSameDay($this->recur["changed_occurences"][$i]["basedate"], $baseday))
                     $extomodify = &$this->recur["changed_occurences"][$i];
             }
 
-            if(!$extomodify)
+            if (!$extomodify)
                 return false;
 
             // remove basedate property as we want to preserve the old value
             // client will send basedate with time part as zero, so discard that value
             unset($exception_props[$this->proptags["basedate"]]);
 
-            if(array_key_exists($this->proptags["startdate"], $exception_props)) {
+            if (array_key_exists($this->proptags["startdate"], $exception_props)) {
                 $extomodify["start"] = $this->fromGMT($this->tz, $exception_props[$this->proptags["startdate"]]);
             }
 
-            if(array_key_exists($this->proptags["duedate"], $exception_props)) {
-                $extomodify["end"] =   $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
+            if (array_key_exists($this->proptags["duedate"], $exception_props)) {
+                $extomodify["end"] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
             }
 
-            if(array_key_exists($this->proptags["subject"], $exception_props)) {
+            if (array_key_exists($this->proptags["subject"], $exception_props)) {
                 $extomodify["subject"] = $exception_props[$this->proptags["subject"]];
             }
 
-            if(array_key_exists($this->proptags["location"], $exception_props)) {
+            if (array_key_exists($this->proptags["location"], $exception_props)) {
                 $extomodify["location"] = $exception_props[$this->proptags["location"]];
             }
 
-            if(array_key_exists($this->proptags["label"], $exception_props)) {
+            if (array_key_exists($this->proptags["label"], $exception_props)) {
                 $extomodify["label"] = $exception_props[$this->proptags["label"]];
             }
 
-            if(array_key_exists($this->proptags["reminder"], $exception_props)) {
+            if (array_key_exists($this->proptags["reminder"], $exception_props)) {
                 $extomodify["reminder_set"] = $exception_props[$this->proptags["reminder"]];
             }
 
-            if(array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
+            if (array_key_exists($this->proptags["reminder_minutes"], $exception_props)) {
                 $extomodify["remind_before"] = $exception_props[$this->proptags["reminder_minutes"]];
             }
 
-            if(array_key_exists($this->proptags["alldayevent"], $exception_props)) {
+            if (array_key_exists($this->proptags["alldayevent"], $exception_props)) {
                 $extomodify["alldayevent"] = $exception_props[$this->proptags["alldayevent"]];
             }
 
-            if(array_key_exists($this->proptags["busystatus"], $exception_props)) {
+            if (array_key_exists($this->proptags["busystatus"], $exception_props)) {
                 $extomodify["busystatus"] = $exception_props[$this->proptags["busystatus"]];
             }
 
             $exception_props[PR_MESSAGE_CLASS] = "IPM.OLE.CLASS.{00061055-0000-0000-C000-000000000046}";
 
             // synchronize commonstart/commonend with startdate/duedate
-            if(isset($exception_props[$this->proptags["startdate"]])) {
+            if (isset($exception_props[$this->proptags["startdate"]])) {
                 $exception_props[$this->proptags["commonstart"]] = $exception_props[$this->proptags["startdate"]];
             }
 
-            if(isset($exception_props[$this->proptags["duedate"]])) {
+            if (isset($exception_props[$this->proptags["duedate"]])) {
                 $exception_props[$this->proptags["commonend"]] = $exception_props[$this->proptags["duedate"]];
             }
 
             $attach = $this->getExceptionAttachment($baseday);
-            if(!$attach) {
+            if (!$attach) {
                 if ($copy_attach_from) {
                     $this->deleteExceptionAttachment($base_date);
                     $this->createException($exception_props, $base_date, false, $exception_recips, $copy_attach_from);
@@ -326,7 +326,7 @@ 
             // The way we do this is to look at the days that we're 'moving' the item in the exception. Each
             // of these days may only contain the item that we're modifying. Any other item violates the rules.
 
-            if($this->isException($basedate)) {
+            if ($this->isException($basedate)) {
                 // If we're modifying an exception, we want to look at the days that we're 'moving' compared to where
                 // the exception used to be.
                 $oldexception = $this->getChangeException($basedate);
@@ -339,7 +339,7 @@ 
             $startday = $this->dayStartOf($start);
 
             // Get all the occurrences on the days between the basedate (may be reversed)
-            if($prevday < $startday)
+            if ($prevday < $startday)
                 $items = $this->getItems($this->toGMT($this->tz, $prevday), $this->toGMT($this->tz, $startday + 24 * 60 * 60));
             else
                 $items = $this->getItems($this->toGMT($this->tz, $startday), $this->toGMT($this->tz, $prevday + 24 * 60 * 60));
@@ -366,12 +366,12 @@ 
             // get all occurence items before the seleceted items occurence starttime
             $occitems = $this->getItems($this->messageprops[$this->proptags["startdate"]], $this->toGMT($this->tz, $basedate));
 
-            if(!empty($occitems)) {
+            if (!empty($occitems)) {
                 // as occitems array is sorted in ascending order of startdate, to get the previous occurence we take the last items in occitems .
                 $previousitem_startdate = $occitems[count($occitems) - 1][$this->proptags["startdate"]];
 
                 // if our reminder is set before or equal to the beginning of the previous occurrence, then that's not allowed
-                if($startdate - ($reminderminutes*60) <= $previousitem_startdate)
+                if ($startdate - ($reminderminutes * 60) <= $previousitem_startdate)
                     return false;
             }
 
@@ -380,12 +380,12 @@ 
 
             // If there are another two occurrences, then the first is the current occurrence, and the one after that
             // is the next occurrence.
-            if(count($currentOcc) > 1) {
+            if (count($currentOcc) > 1) {
                 $next = $currentOcc[1];
                 // Get reminder time of the next occurrence.
                 $nextOccReminderTime = $next[$this->proptags["startdate"]] - ($next[$this->proptags["reminder_minutes"]] * 60);
                 // If the reminder time of the next item is before the start of this item, then that's not allowed
-                if($nextOccReminderTime <= $startdate)
+                if ($nextOccReminderTime <= $startdate)
                     return false;
             }
 
@@ -396,15 +396,15 @@ 
         function setRecurrence($tz, $recur)
         {
             // only reset timezone if specified
-            if($tz)
+            if ($tz)
                 $this->tz = $tz;
 
             $this->recur = $recur;
 
-            if(!isset($this->recur["changed_occurences"]))
+            if (!isset($this->recur["changed_occurences"]))
                 $this->recur["changed_occurences"] = Array();
 
-            if(!isset($this->recur["deleted_occurences"]))
+            if (!isset($this->recur["deleted_occurences"]))
                 $this->recur["deleted_occurences"] = Array();
 
             $this->deleteAttachments();
@@ -412,29 +412,29 @@ 
 
             // if client has not set the recurring_pattern then we should generate it and save it
             $messageProps = mapi_getprops($this->message, Array($this->proptags["recurring_pattern"]));
-            if(empty($messageProps[$this->proptags["recurring_pattern"]])) {
+            if (empty($messageProps[$this->proptags["recurring_pattern"]])) {
                 $this->saveRecurrencePattern();
             }
         }
 
         // Returns the start or end time of the occurrence on the given base date.
         // This assumes that the basedate you supply is in LOCAL time
-        function getOccurrenceStart($basedate)  {
+        function getOccurrenceStart($basedate) {
             $daystart = $this->dayStartOf($basedate);
             return $this->toGMT($this->tz, $daystart + $this->recur["startocc"] * 60);
         }
 
-        function getOccurrenceEnd($basedate)  {
+        function getOccurrenceEnd($basedate) {
             $daystart = $this->dayStartOf($basedate);
             return $this->toGMT($this->tz, $daystart + $this->recur["endocc"] * 60);
         }
 
 
         // Backwards compatible code
-        function getOccurenceStart($basedate)  {
+        function getOccurenceStart($basedate) {
             return $this->getOccurrenceStart($basedate);
         }
-        function getOccurenceEnd($basedate)  {
+        function getOccurenceEnd($basedate) {
             return $this->getOccurrenceEnd($basedate);
         }
 
@@ -464,13 +464,13 @@ 
              * On the first occurence of greater nextreminder break the loop
              * and return the value to calling function.
              */
-            for($i = 0, $len = count($items); $i < $len; $i++)
+            for ($i = 0, $len = count($items); $i < $len; $i++)
             {
                 $item = $items[$i];
-                $tempnextreminder = $item[$this->proptags["startdate"]] - ( $item[$this->proptags["reminder_minutes"]] * 60 );
+                $tempnextreminder = $item[$this->proptags["startdate"]] - ($item[$this->proptags["reminder_minutes"]] * 60);
 
                 // If tempnextreminder is greater than timestamp then save it in nextreminder and break from the loop.
-                if($tempnextreminder > $timestamp)
+                if ($tempnextreminder > $timestamp)
                 {
                     $nextreminder = $tempnextreminder;
                     break;
@@ -575,8 +575,8 @@ 
             }
 
             // get timings of the first occurence
-            $firstoccstartdate = isset($startocc) ? $start + (((int) $startocc) * 60) : $start;
-            $firstoccenddate = isset($endocc) ? $end + (((int) $endocc) * 60) : $end;
+            $firstoccstartdate = isset($startocc) ? $start + (((int)$startocc) * 60) : $start;
+            $firstoccenddate = isset($endocc) ? $end + (((int)$endocc) * 60) : $end;
 
             $start = gmdate(_('d-m-Y'), $firstoccstartdate);
             $end = gmdate(_('d-m-Y'), $firstoccenddate);
@@ -641,8 +641,8 @@ 
                 }
             }
 
-            if(!empty($pattern)) {
-                mapi_setprops($this->message, Array($this->proptags["recurring_pattern"] => $pattern ));
+            if (!empty($pattern)) {
+                mapi_setprops($this->message, Array($this->proptags["recurring_pattern"] => $pattern));
             }
         }
 
@@ -656,16 +656,16 @@ 
             // Remove all items in $todelete from deleted_occurences
             $new = Array();
 
-            foreach($this->recur["deleted_occurences"] as $entry) {
-                if($entry != $base_date)
+            foreach ($this->recur["deleted_occurences"] as $entry) {
+                if ($entry != $base_date)
                     $new[] = $entry;
             }
             $this->recur["deleted_occurences"] = $new;
 
             $new = Array();
 
-            foreach($this->recur["changed_occurences"] as $entry) {
-                if(!$this->isSameDay($entry["basedate"], $base_date))
+            foreach ($this->recur["changed_occurences"] as $entry) {
+                if (!$this->isSameDay($entry["basedate"], $base_date))
                     $new[] = $entry;
                 else
                     $this->deleteExceptionAttachment($this->toGMT($this->tz, $base_date + $this->recur["startocc"] * 60));
@@ -696,15 +696,15 @@ 
               $props[PR_EXCEPTION_ENDTIME] = $this->fromGMT($this->tz, $exception_props[$this->proptags["duedate"]]);
               mapi_setprops($attachment, $props);
 
-            $imessage = mapi_attach_openobj($attachment, MAPI_CREATE | MAPI_MODIFY);
+            $imessage = mapi_attach_openobj($attachment, MAPI_CREATE|MAPI_MODIFY);
 
             if ($copy_attach_from) {
                 $attachmentTable = mapi_message_getattachmenttable($copy_attach_from);
-                if($attachmentTable) {
+                if ($attachmentTable) {
                     $attachments = mapi_table_queryallrows($attachmentTable, array(PR_ATTACH_NUM, PR_ATTACH_SIZE, PR_ATTACH_LONG_FILENAME, PR_ATTACHMENT_HIDDEN, PR_DISPLAY_NAME, PR_ATTACH_METHOD));
 
-                    foreach($attachments as $attach_props){
-                        $attach_old = mapi_message_openattach($copy_attach_from, (int) $attach_props[PR_ATTACH_NUM]);
+                    foreach ($attachments as $attach_props) {
+                        $attach_old = mapi_message_openattach($copy_attach_from, (int)$attach_props[PR_ATTACH_NUM]);
                         $attach_newResourceMsg = mapi_message_createattach($imessage);
                         mapi_copyto($attach_old, array(), array(), $attach_newResourceMsg, 0);
                         mapi_savechanges($attach_newResourceMsg);
@@ -718,8 +718,8 @@ 
             // of an exception. This is only a quickfix as it is not yet possible
             // to change an existing exception.
             // remove mv properties when needed
-            foreach($props as $propTag=>$propVal){
-                if ((mapi_prop_type($propTag) & MV_FLAG) == MV_FLAG && is_null($propVal)){
+            foreach ($props as $propTag=>$propVal) {
+                if ((mapi_prop_type($propTag) & MV_FLAG) == MV_FLAG && is_null($propVal)) {
                     unset($props[$propTag]);
                 }
             }
@@ -743,14 +743,14 @@ 
             $attachments = mapi_message_getattachmenttable($this->message);
             $attachTable = mapi_table_queryallrows($attachments, Array(PR_ATTACH_NUM));
 
-            foreach($attachTable as $attachRow)
+            foreach ($attachTable as $attachRow)
             {
                 $tempattach = mapi_message_openattach($this->message, $attachRow[PR_ATTACH_NUM]);
                 $exception = mapi_attach_openobj($tempattach);
 
                   $data = mapi_message_getprops($exception, array($this->proptags["basedate"]));
 
-                  if($this->dayStartOf($this->fromGMT($this->tz, $data[$this->proptags["basedate"]])) == $this->dayStartOf($base_date)) {
+                  if ($this->dayStartOf($this->fromGMT($this->tz, $data[$this->proptags["basedate"]])) == $this->dayStartOf($base_date)) {
                       mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]);
                   }
             }
@@ -764,9 +764,9 @@ 
             $attachments = mapi_message_getattachmenttable($this->message);
             $attachTable = mapi_table_queryallrows($attachments, Array(PR_ATTACH_NUM, PR_ATTACHMENT_HIDDEN));
 
-            foreach($attachTable as $attachRow)
+            foreach ($attachTable as $attachRow)
             {
-                if(isset($attachRow[PR_ATTACHMENT_HIDDEN]) && $attachRow[PR_ATTACHMENT_HIDDEN]) {
+                if (isset($attachRow[PR_ATTACHMENT_HIDDEN]) && $attachRow[PR_ATTACHMENT_HIDDEN]) {
                     mapi_message_deleteattach($this->message, $attachRow[PR_ATTACH_NUM]);
                 }
             }
@@ -792,21 +792,21 @@ 
             $attachments = mapi_message_getattachmenttable($this->message);
             $attachRows = mapi_table_queryallrows($attachments, Array(PR_ATTACH_NUM), $attach_res);
 
-            if(is_array($attachRows)) {
-                foreach($attachRows as $attachRow)
+            if (is_array($attachRows)) {
+                foreach ($attachRows as $attachRow)
                 {
                     $tempattach = mapi_message_openattach($this->message, $attachRow[PR_ATTACH_NUM]);
                     $exception = mapi_attach_openobj($tempattach);
 
                     $data = mapi_message_getprops($exception, array($this->proptags["basedate"]));
 
-                    if(!isset($data[$this->proptags["basedate"]])) {
+                    if (!isset($data[$this->proptags["basedate"]])) {
                         // if no basedate found then it could be embedded message so ignore it
                         // we need proper restriction to exclude embedded messages as well
                         continue;
                     }
 
-                    if($this->isSameDay($this->fromGMT($this->tz, $data[$this->proptags["basedate"]]), $base_date)) {
+                    if ($this->isSameDay($this->fromGMT($this->tz, $data[$this->proptags["basedate"]]), $base_date)) {
                         return $tempattach;
                     }
                 }
@@ -831,9 +831,9 @@ 
         function processOccurrenceItem(&$items, $start, $end, $basedate, $startocc, $endocc, $tz, $reminderonly)
         {
             $exception = $this->isException($basedate);
-            if($exception){
+            if ($exception) {
                 return false;
-            }else{
+            } else {
                 $occstart = $basedate + $startocc * 60;
                 $occend = $basedate + $endocc * 60;
 
@@ -849,7 +849,7 @@ 
                  * starts at 00:00 and ends on 00:00. if it is so, then process
                  * the occurrence and send it in response.
                  */
-                if(($occstart  >= $end || $occend <=  $start) && !($occstart == $occend && $occstart == $start))
+                if (($occstart >= $end || $occend <= $start) && !($occstart == $occend && $occstart == $start))
                     return;
 
                 // Properties for this occurrence are the same as the main object,
@@ -863,7 +863,7 @@ 
             }
 
             // If reminderonly is set, only add reminders
-            if($reminderonly && (!isset($newitem[$this->proptags["reminder"]]) || $newitem[$this->proptags["reminder"]] == false))
+            if ($reminderonly && (!isset($newitem[$this->proptags["reminder"]]) || $newitem[$this->proptags["reminder"]] == false))
                 return;
 
             $items[] = $newitem;
@@ -878,7 +878,7 @@ 
         function processExceptionItems(&$items, $start, $end)
         {
             $limit = 0;
-            foreach($this->recur["changed_occurences"] as $exception) {
+            foreach ($this->recur["changed_occurences"] as $exception) {
 
                 // Convert to GMT
                 $occstart = $this->toGMT($this->tz, $exception["start"]);
@@ -886,11 +886,11 @@ 
 
                 // Check range criterium. Exact matches (eg when $occstart == $end), do NOT match since you cannot
                 // see any part of the appointment. Partial overlaps DO match.
-                if($occstart >= $end || $occend <= $start)
+                if ($occstart >= $end || $occend <= $start)
                     continue;
 
                 array_push($items, $this->getExceptionProperties($exception));
-                if((count($items) == $limit))
+                if ((count($items) == $limit))
                     break;
                 }
         }
@@ -902,10 +902,10 @@ 
          */
         function isException($basedate)
         {
-            if($this->isDeleteException($basedate))
+            if ($this->isDeleteException($basedate))
                 return true;
 
-            if($this->getChangeException($basedate) != false)
+            if ($this->getChangeException($basedate) != false)
                 return true;
 
             return false;
@@ -917,9 +917,9 @@ 
         function isDeleteException($basedate)
         {
             // Check if the occurrence is deleted on the specified date
-            foreach($this->recur["deleted_occurences"] as $deleted)
+            foreach ($this->recur["deleted_occurences"] as $deleted)
             {
-                if($this->isSameDay($deleted, $basedate))
+                if ($this->isSameDay($deleted, $basedate))
                     return true;
             }
 
@@ -932,9 +932,9 @@ 
         function getChangeException($basedate)
         {
             // Check if the occurrence is modified on the specified date
-            foreach($this->recur["changed_occurences"] as $changed)
+            foreach ($this->recur["changed_occurences"] as $changed)
             {
-                if($this->isSameDay($changed["basedate"], $basedate))
+                if ($this->isSameDay($changed["basedate"], $basedate))
                     return $changed;
             }
 
@@ -975,31 +975,31 @@ 
             $item[$this->proptags["commonstart"]] = $item[$this->proptags["startdate"]];
             $item[$this->proptags["commonend"]] = $item[$this->proptags["duedate"]];
 
-            if(isset($exception["subject"])) {
+            if (isset($exception["subject"])) {
                 $item[$this->proptags["subject"]] = $exception["subject"];
             }
 
-            if(isset($exception["label"])) {
+            if (isset($exception["label"])) {
                 $item[$this->proptags["label"]] = $exception["label"];
             }
 
-            if(isset($exception["alldayevent"])) {
+            if (isset($exception["alldayevent"])) {
                 $item[$this->proptags["alldayevent"]] = $exception["alldayevent"];
             }
 
-            if(isset($exception["location"])) {
+            if (isset($exception["location"])) {
                 $item[$this->proptags["location"]] = $exception["location"];
             }
 
-            if(isset($exception["remind_before"])) {
+            if (isset($exception["remind_before"])) {
                 $item[$this->proptags["reminder_minutes"]] = $exception["remind_before"];
             }
 
-            if(isset($exception["reminder_set"])) {
+            if (isset($exception["reminder_set"])) {
                 $item[$this->proptags["reminder"]] = $exception["reminder_set"];
             }
 
-            if(isset($exception["busystatus"])) {
+            if (isset($exception["busystatus"])) {
                 $item[$this->proptags["busystatus"]] = $exception["busystatus"];
             }
 
@@ -1057,19 +1057,19 @@ 
 
             // Add organizer to meeting only if it is not organized.
             $msgprops = mapi_getprops($exception, array(PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY, $this->proptags['responsestatus']));
-            if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized){
+            if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized) {
                 $this->addOrganizer($msgprops, $exception_recips['add']);
             }
 
             // Remove all deleted recipients
             if (isset($exception_recips['remove'])) {
                 foreach ($exception_recips['remove'] as &$recip) {
-                    if (!isset($recip[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
-                        $recip[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
+                    if (!isset($recip[PR_RECIPIENT_FLAGS]) || $recip[PR_RECIPIENT_FLAGS] != (recipReserved|recipExceptionalDeleted|recipSendable)) {
+                        $recip[PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalDeleted;
                     } else {
-                        $recip[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
+                        $recip[PR_RECIPIENT_FLAGS] = recipReserved|recipExceptionalDeleted|recipSendable;
                     }
-                    $recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone;        // No Response required
+                    $recip[PR_RECIPIENT_TRACKSTATUS] = olResponseNone; // No Response required
                 }
                 unset($recip);
                 mapi_message_modifyrecipients($exception, MODRECIP_MODIFY, $exception_recips['remove']);
@@ -1112,14 +1112,14 @@ 
 
             // Add organizer to meeting only if it is not organized.
             $msgprops = mapi_getprops($message, array(PR_SENT_REPRESENTING_ENTRYID, PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENT_REPRESENTING_NAME, PR_SENT_REPRESENTING_ADDRTYPE, PR_SENT_REPRESENTING_SEARCH_KEY, $this->proptags['responsestatus']));
-            if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized){
+            if (isset($msgprops[$this->proptags['responsestatus']]) && $msgprops[$this->proptags['responsestatus']] != olResponseOrganized) {
                 $this->addOrganizer($msgprops, $exception_recips);
             }
 
             if (!empty($exception_recips)) {
-                foreach($recipientRows as $key => $recipient) {
+                foreach ($recipientRows as $key => $recipient) {
                     $found = false;
-                    foreach($exception_recips as $excep_recip) {
+                    foreach ($exception_recips as $excep_recip) {
                         if (isset($recipient[PR_SEARCH_KEY], $excep_recip[PR_SEARCH_KEY]) && $recipient[PR_SEARCH_KEY] == $excep_recip[PR_SEARCH_KEY])
                             $found = true;
                     }
@@ -1128,8 +1128,8 @@ 
                        $foundInDeletedRecipients = false;
                        // Look if the $recipient is in the list of deleted recipients
                        if (!empty($deletedRecipients)) {
-                               foreach($deletedRecipients as $recip) {
-                                   if ($recip[PR_SEARCH_KEY] == $recipient[PR_SEARCH_KEY]){
+                               foreach ($deletedRecipients as $recip) {
+                                   if ($recip[PR_SEARCH_KEY] == $recipient[PR_SEARCH_KEY]) {
                                        $foundInDeletedRecipients = true;
                                        break;
                                    }
@@ -1138,12 +1138,12 @@ 
 
                        // If recipient is not in list of deleted recipient, add him
                        if (!$foundInDeletedRecipients) {
-                            if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recipient[PR_RECIPIENT_FLAGS] != (recipReserved | recipExceptionalDeleted | recipSendable)) {
-                                $recipient[PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalDeleted;
+                            if (!isset($recipient[PR_RECIPIENT_FLAGS]) || $recipient[PR_RECIPIENT_FLAGS] != (recipReserved|recipExceptionalDeleted|recipSendable)) {
+                                $recipient[PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalDeleted;
                             } else {
-                                $recipient[PR_RECIPIENT_FLAGS] = recipReserved | recipExceptionalDeleted | recipSendable;
+                                $recipient[PR_RECIPIENT_FLAGS] = recipReserved|recipExceptionalDeleted|recipSendable;
                             }
-                            $recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;    // No Response required
+                            $recipient[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone; // No Response required
                             $deletedRecipients[] = $recipient;
                         }
                     }
@@ -1180,7 +1180,7 @@ 
             $result = false;
             if (!empty($this->recur["changed_occurences"])) {
                 $result = array();
-                foreach($this->recur["changed_occurences"] as $exception) {
+                foreach ($this->recur["changed_occurences"] as $exception) {
                     $result[] = $exception["basedate"];
                 }
                 return $result;
@@ -1200,16 +1200,16 @@ 
         {
             $hasOrganizer = false;
             // Check if meeting already has an organizer.
-            foreach ($recipients as $key => $recipient){
-                if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable | recipOrganizer)) {
+            foreach ($recipients as $key => $recipient) {
+                if (isset($recipient[PR_RECIPIENT_FLAGS]) && $recipient[PR_RECIPIENT_FLAGS] == (recipSendable|recipOrganizer)) {
                     $hasOrganizer = true;
-                } else if ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])){
+                } else if ($isException && !isset($recipient[PR_RECIPIENT_FLAGS])) {
                     // Recipients for an occurrence
-                    $recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable | recipExceptionalResponse;
+                    $recipients[$key][PR_RECIPIENT_FLAGS] = recipSendable|recipExceptionalResponse;
                 }
             }
 
-            if (!$hasOrganizer){
+            if (!$hasOrganizer) {
                 // Create organizer.
                 $organizer = array();
                 $organizer[PR_ENTRYID] = $messageProps[PR_SENT_REPRESENTING_ENTRYID];
@@ -1217,9 +1217,9 @@ 
                 $organizer[PR_EMAIL_ADDRESS] = $messageProps[PR_SENT_REPRESENTING_EMAIL_ADDRESS];
                 $organizer[PR_RECIPIENT_TYPE] = MAPI_TO;
                 $organizer[PR_RECIPIENT_DISPLAY_NAME] = $messageProps[PR_SENT_REPRESENTING_NAME];
-                $organizer[PR_ADDRTYPE] = empty($messageProps[PR_SENT_REPRESENTING_ADDRTYPE])?'SMTP':$messageProps[PR_SENT_REPRESENTING_ADDRTYPE];
+                $organizer[PR_ADDRTYPE] = empty($messageProps[PR_SENT_REPRESENTING_ADDRTYPE]) ? 'SMTP' : $messageProps[PR_SENT_REPRESENTING_ADDRTYPE];
                 $organizer[PR_RECIPIENT_TRACKSTATUS] = olRecipientTrackStatusNone;
-                $organizer[PR_RECIPIENT_FLAGS] = recipSendable | recipOrganizer;
+                $organizer[PR_RECIPIENT_FLAGS] = recipSendable|recipOrganizer;
                 $organizer[PR_SEARCH_KEY] = $messageProps[PR_SENT_REPRESENTING_SEARCH_KEY];
 
                 // Add organizer to recipients list.

mapi/mapiguid.php

Spacing +20 added lines, -20 removed lines

@@ -5,30 +5,30 @@
  * SPDX-FileCopyrightText: Copyright 2020-2022 grommunio GmbH
  */
 
-define('IID_IStream',                           makeguid("{0000000c-0000-0000-c000-000000000046}"));
-define('IID_IMAPITable',                        makeguid("{00020301-0000-0000-c000-000000000046}"));
-define('IID_IMessage',                          makeguid("{00020307-0000-0000-c000-000000000046}"));
-define('IID_IExchangeExportChanges',            makeguid("{a3ea9cc0-d1b2-11cd-80fc-00aa004bba0b}"));
-define('IID_IExchangeImportContentsChanges',    makeguid("{f75abfa0-d0e0-11cd-80fc-00aa004bba0b}"));
-define('IID_IExchangeImportHierarchyChanges',   makeguid("{85a66cf0-d0e0-11cd-80fc-00aa004bba0b}"));
+define('IID_IStream', makeguid("{0000000c-0000-0000-c000-000000000046}"));
+define('IID_IMAPITable', makeguid("{00020301-0000-0000-c000-000000000046}"));
+define('IID_IMessage', makeguid("{00020307-0000-0000-c000-000000000046}"));
+define('IID_IExchangeExportChanges', makeguid("{a3ea9cc0-d1b2-11cd-80fc-00aa004bba0b}"));
+define('IID_IExchangeImportContentsChanges', makeguid("{f75abfa0-d0e0-11cd-80fc-00aa004bba0b}"));
+define('IID_IExchangeImportHierarchyChanges', makeguid("{85a66cf0-d0e0-11cd-80fc-00aa004bba0b}"));
 
-define('PSETID_Appointment',                    makeguid("{00062002-0000-0000-C000-000000000046}"));
-define('PSETID_Task',                           makeguid("{00062003-0000-0000-C000-000000000046}"));
-define('PSETID_Address',                        makeguid("{00062004-0000-0000-C000-000000000046}"));
-define('PSETID_Common',                         makeguid("{00062008-0000-0000-C000-000000000046}"));
-define('PSETID_Log',                            makeguid("{0006200A-0000-0000-C000-000000000046}"));
-define('PSETID_Note',                           makeguid("{0006200E-0000-0000-C000-000000000046}"));
-define('PSETID_Meeting',                        makeguid("{6ED8DA90-450B-101B-98DA-00AA003F1305}"));
-define('PSETID_Archive',                        makeguid("{72E98EBC-57D2-4AB5-B0AA-D50A7B531CB9}"));
+define('PSETID_Appointment', makeguid("{00062002-0000-0000-C000-000000000046}"));
+define('PSETID_Task', makeguid("{00062003-0000-0000-C000-000000000046}"));
+define('PSETID_Address', makeguid("{00062004-0000-0000-C000-000000000046}"));
+define('PSETID_Common', makeguid("{00062008-0000-0000-C000-000000000046}"));
+define('PSETID_Log', makeguid("{0006200A-0000-0000-C000-000000000046}"));
+define('PSETID_Note', makeguid("{0006200E-0000-0000-C000-000000000046}"));
+define('PSETID_Meeting', makeguid("{6ED8DA90-450B-101B-98DA-00AA003F1305}"));
+define('PSETID_Archive', makeguid("{72E98EBC-57D2-4AB5-B0AA-D50A7B531CB9}"));
 
-define('PS_MAPI',                               makeguid("{00020328-0000-0000-C000-000000000046}"));
-define('PS_PUBLIC_STRINGS',                     makeguid("{00020329-0000-0000-C000-000000000046}"));
-define('PS_INTERNET_HEADERS',                   makeguid("{00020386-0000-0000-c000-000000000046}"));
+define('PS_MAPI', makeguid("{00020328-0000-0000-C000-000000000046}"));
+define('PS_PUBLIC_STRINGS', makeguid("{00020329-0000-0000-C000-000000000046}"));
+define('PS_INTERNET_HEADERS', makeguid("{00020386-0000-0000-c000-000000000046}"));
 
-define('MUIDECSAB',                             makeguid("{50A921AC-D340-48ee-B319-FBA753304425}"));
+define('MUIDECSAB', makeguid("{50A921AC-D340-48ee-B319-FBA753304425}"));
 
 // grommunio Contact Provider GUIDs
-define('MUIDZCSAB',                             makeguid("{30047F72-92E3-DA4F-B86A-E52A7FE46571}"));
+define('MUIDZCSAB', makeguid("{30047F72-92E3-DA4F-B86A-E52A7FE46571}"));
 
 // sk added for grommunio-sync
-define ('PSETID_AirSync',                       makeguid("{71035549-0739-4DCB-9163-00F0580DBBDF}"));
+define('PSETID_AirSync', makeguid("{71035549-0739-4DCB-9163-00F0580DBBDF}"));

mapi/mapitags.php

Spacing +626 added lines, -626 removed lines

@@ -8,191 +8,191 @@ 
 if (!function_exists("mapi_prop_tag"))
     throw new FatalMisconfigurationException("PHP-MAPI extension is not available");
 
-define('PR_ACKNOWLEDGEMENT_MODE'                      ,mapi_prop_tag(PT_LONG,        0x0001));
-define('PR_ALTERNATE_RECIPIENT_ALLOWED'               ,mapi_prop_tag(PT_BOOLEAN,     0x0002));
-define('PR_AUTHORIZING_USERS'                         ,mapi_prop_tag(PT_BINARY,      0x0003));
-define('PR_AUTO_FORWARD_COMMENT'                      ,mapi_prop_tag(PT_TSTRING,     0x0004));
-define('PR_AUTO_FORWARDED'                            ,mapi_prop_tag(PT_BOOLEAN,     0x0005));
-define('PR_CONTENT_CONFIDENTIALITY_ALGORITHM_ID'      ,mapi_prop_tag(PT_BINARY,      0x0006));
-define('PR_CONTENT_CORRELATOR'                        ,mapi_prop_tag(PT_BINARY,      0x0007));
-define('PR_CONTENT_IDENTIFIER'                        ,mapi_prop_tag(PT_TSTRING,     0x0008));
-define('PR_CONTENT_LENGTH'                            ,mapi_prop_tag(PT_LONG,        0x0009));
-define('PR_CONTENT_RETURN_REQUESTED'                  ,mapi_prop_tag(PT_BOOLEAN,     0x000A));
-
-
-
-define('PR_CONVERSATION_KEY'                          ,mapi_prop_tag(PT_BINARY,      0x000B));
-
-define('PR_CONVERSION_EITS'                           ,mapi_prop_tag(PT_BINARY,      0x000C));
-define('PR_CONVERSION_WITH_LOSS_PROHIBITED'           ,mapi_prop_tag(PT_BOOLEAN,     0x000D));
-define('PR_CONVERTED_EITS'                            ,mapi_prop_tag(PT_BINARY,      0x000E));
-define('PR_DEFERRED_DELIVERY_TIME'                    ,mapi_prop_tag(PT_SYSTIME,     0x000F));
-define('PR_DEFERRED_SEND_TIME'                        ,mapi_prop_tag(PT_SYSTIME,     0x3FEF));
-define('PR_DELIVER_TIME'                              ,mapi_prop_tag(PT_SYSTIME,     0x0010));
-define('PR_DISCARD_REASON'                            ,mapi_prop_tag(PT_LONG,        0x0011));
-define('PR_DISCLOSURE_OF_RECIPIENTS'                  ,mapi_prop_tag(PT_BOOLEAN,     0x0012));
-define('PR_DL_EXPANSION_HISTORY'                      ,mapi_prop_tag(PT_BINARY,      0x0013));
-define('PR_DL_EXPANSION_PROHIBITED'                   ,mapi_prop_tag(PT_BOOLEAN,     0x0014));
-define('PR_EXPIRY_TIME'                               ,mapi_prop_tag(PT_SYSTIME,     0x0015));
-define('PR_IMPLICIT_CONVERSION_PROHIBITED'            ,mapi_prop_tag(PT_BOOLEAN,     0x0016));
-define('PR_IMPORTANCE'                                ,mapi_prop_tag(PT_LONG,        0x0017));
-define('PR_IPM_ID'                                    ,mapi_prop_tag(PT_BINARY,      0x0018));
-define('PR_LATEST_DELIVERY_TIME'                      ,mapi_prop_tag(PT_SYSTIME,     0x0019));
-define('PR_MESSAGE_CLASS'                             ,mapi_prop_tag(PT_TSTRING,     0x001A));
-define('PR_MESSAGE_DELIVERY_ID'                       ,mapi_prop_tag(PT_BINARY,      0x001B));
-
-
-
-
-
-define('PR_MESSAGE_SECURITY_LABEL'                    ,mapi_prop_tag(PT_BINARY,      0x001E));
-define('PR_OBSOLETED_IPMS'                            ,mapi_prop_tag(PT_BINARY,      0x001F));
-define('PR_ORIGINALLY_INTENDED_RECIPIENT_NAME'        ,mapi_prop_tag(PT_BINARY,      0x0020));
-define('PR_ORIGINAL_EITS'                             ,mapi_prop_tag(PT_BINARY,      0x0021));
-define('PR_ORIGINATOR_CERTIFICATE'                    ,mapi_prop_tag(PT_BINARY,      0x0022));
-define('PR_ORIGINATOR_DELIVERY_REPORT_REQUESTED'      ,mapi_prop_tag(PT_BOOLEAN,     0x0023));
-define('PR_ORIGINATOR_RETURN_ADDRESS'                 ,mapi_prop_tag(PT_BINARY,      0x0024));
-
-define('PR_PARENT_KEY'                                ,mapi_prop_tag(PT_BINARY,      0x0025));
-define('PR_PRIORITY'                                  ,mapi_prop_tag(PT_LONG,        0x0026));
-
-define('PR_ORIGIN_CHECK'                              ,mapi_prop_tag(PT_BINARY,      0x0027));
-define('PR_PROOF_OF_SUBMISSION_REQUESTED'             ,mapi_prop_tag(PT_BOOLEAN,     0x0028));
-define('PR_READ_RECEIPT_REQUESTED'                    ,mapi_prop_tag(PT_BOOLEAN,     0x0029));
-define('PR_RECEIPT_TIME'                              ,mapi_prop_tag(PT_SYSTIME,     0x002A));
-define('PR_RECIPIENT_REASSIGNMENT_PROHIBITED'         ,mapi_prop_tag(PT_BOOLEAN,     0x002B));
-define('PR_REDIRECTION_HISTORY'                       ,mapi_prop_tag(PT_BINARY,      0x002C));
-define('PR_RELATED_IPMS'                              ,mapi_prop_tag(PT_BINARY,      0x002D));
-define('PR_ORIGINAL_SENSITIVITY'                      ,mapi_prop_tag(PT_LONG,        0x002E));
-define('PR_LANGUAGES'                                 ,mapi_prop_tag(PT_TSTRING,     0x002F));
-define('PR_REPLY_TIME'                                ,mapi_prop_tag(PT_SYSTIME,     0x0030));
-define('PR_REPORT_TAG'                                ,mapi_prop_tag(PT_BINARY,      0x0031));
-define('PR_REPORT_TIME'                               ,mapi_prop_tag(PT_SYSTIME,     0x0032));
-define('PR_RETURNED_IPM'                              ,mapi_prop_tag(PT_BOOLEAN,     0x0033));
-define('PR_SECURITY'                                  ,mapi_prop_tag(PT_LONG,        0x0034));
-define('PR_INCOMPLETE_COPY'                           ,mapi_prop_tag(PT_BOOLEAN,     0x0035));
-define('PR_SENSITIVITY'                               ,mapi_prop_tag(PT_LONG,        0x0036));
-define('PR_SUBJECT'                                   ,mapi_prop_tag(PT_TSTRING,     0x0037));
-define('PR_SUBJECT_IPM'                               ,mapi_prop_tag(PT_BINARY,      0x0038));
-define('PR_CLIENT_SUBMIT_TIME'                        ,mapi_prop_tag(PT_SYSTIME,     0x0039));
-define('PR_REPORT_NAME'                               ,mapi_prop_tag(PT_TSTRING,     0x003A));
-define('PR_SENT_REPRESENTING_SEARCH_KEY'              ,mapi_prop_tag(PT_BINARY,      0x003B));
-define('PR_X400_CONTENT_TYPE'                         ,mapi_prop_tag(PT_BINARY,      0x003C));
-define('PR_SUBJECT_PREFIX'                            ,mapi_prop_tag(PT_TSTRING,     0x003D));
-define('PR_NON_RECEIPT_REASON'                        ,mapi_prop_tag(PT_LONG,        0x003E));
-define('PR_RECEIVED_BY_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x003F));
-define('PR_RECEIVED_BY_NAME'                          ,mapi_prop_tag(PT_TSTRING,     0x0040));
-define('PR_SENT_REPRESENTING_ENTRYID'                 ,mapi_prop_tag(PT_BINARY,      0x0041));
-define('PR_SENT_REPRESENTING_NAME'                    ,mapi_prop_tag(PT_TSTRING,     0x0042));
-define('PR_RCVD_REPRESENTING_ENTRYID'                 ,mapi_prop_tag(PT_BINARY,      0x0043));
-define('PR_RCVD_REPRESENTING_NAME'                    ,mapi_prop_tag(PT_TSTRING,     0x0044));
-define('PR_REPORT_ENTRYID'                            ,mapi_prop_tag(PT_BINARY,      0x0045));
-define('PR_READ_RECEIPT_ENTRYID'                      ,mapi_prop_tag(PT_BINARY,      0x0046));
-define('PR_MESSAGE_SUBMISSION_ID'                     ,mapi_prop_tag(PT_BINARY,      0x0047));
-define('PR_PROVIDER_SUBMIT_TIME'                      ,mapi_prop_tag(PT_SYSTIME,     0x0048));
-define('PR_ORIGINAL_SUBJECT'                          ,mapi_prop_tag(PT_TSTRING,     0x0049));
-define('PR_DISC_VAL'                                  ,mapi_prop_tag(PT_BOOLEAN,     0x004A));
-define('PR_ORIG_MESSAGE_CLASS'                        ,mapi_prop_tag(PT_TSTRING,     0x004B));
-define('PR_ORIGINAL_AUTHOR_ENTRYID'                   ,mapi_prop_tag(PT_BINARY,      0x004C));
-define('PR_ORIGINAL_AUTHOR_NAME'                      ,mapi_prop_tag(PT_TSTRING,     0x004D));
-define('PR_ORIGINAL_SUBMIT_TIME'                      ,mapi_prop_tag(PT_SYSTIME,     0x004E));
-define('PR_REPLY_RECIPIENT_ENTRIES'                   ,mapi_prop_tag(PT_BINARY,      0x004F));
-define('PR_REPLY_RECIPIENT_NAMES'                     ,mapi_prop_tag(PT_TSTRING,     0x0050));
-
-define('PR_RECEIVED_BY_SEARCH_KEY'                    ,mapi_prop_tag(PT_BINARY,      0x0051));
-define('PR_RCVD_REPRESENTING_SEARCH_KEY'              ,mapi_prop_tag(PT_BINARY,      0x0052));
-define('PR_READ_RECEIPT_SEARCH_KEY'                   ,mapi_prop_tag(PT_BINARY,      0x0053));
-define('PR_REPORT_SEARCH_KEY'                         ,mapi_prop_tag(PT_BINARY,      0x0054));
-define('PR_ORIGINAL_DELIVERY_TIME'                    ,mapi_prop_tag(PT_SYSTIME,     0x0055));
-define('PR_ORIGINAL_AUTHOR_SEARCH_KEY'                ,mapi_prop_tag(PT_BINARY,      0x0056));
-
-define('PR_MESSAGE_TO_ME'                             ,mapi_prop_tag(PT_BOOLEAN,     0x0057));
-define('PR_MESSAGE_CC_ME'                             ,mapi_prop_tag(PT_BOOLEAN,     0x0058));
-define('PR_MESSAGE_RECIP_ME'                          ,mapi_prop_tag(PT_BOOLEAN,     0x0059));
-
-define('PR_ORIGINAL_SENDER_NAME'                      ,mapi_prop_tag(PT_TSTRING,     0x005A));
-define('PR_ORIGINAL_SENDER_ENTRYID'                   ,mapi_prop_tag(PT_BINARY,      0x005B));
-define('PR_ORIGINAL_SENDER_SEARCH_KEY'                ,mapi_prop_tag(PT_BINARY,      0x005C));
-define('PR_ORIGINAL_SENT_REPRESENTING_NAME'           ,mapi_prop_tag(PT_TSTRING,     0x005D));
-define('PR_ORIGINAL_SENT_REPRESENTING_ENTRYID'        ,mapi_prop_tag(PT_BINARY,      0x005E));
-define('PR_ORIGINAL_SENT_REPRESENTING_SEARCH_KEY'     ,mapi_prop_tag(PT_BINARY,      0x005F));
-
-define('PR_START_DATE'                                ,mapi_prop_tag(PT_SYSTIME,     0x0060));
-define('PR_END_DATE'                                  ,mapi_prop_tag(PT_SYSTIME,     0x0061));
-define('PR_OWNER_APPT_ID'                             ,mapi_prop_tag(PT_LONG,        0x0062));
-define('PR_RESPONSE_REQUESTED'                        ,mapi_prop_tag(PT_BOOLEAN,     0x0063));
-
-define('PR_SENT_REPRESENTING_ADDRTYPE'                ,mapi_prop_tag(PT_TSTRING,     0x0064));
-define('PR_SENT_REPRESENTING_EMAIL_ADDRESS'           ,mapi_prop_tag(PT_TSTRING,     0x0065));
-
-define('PR_ORIGINAL_SENDER_ADDRTYPE'                  ,mapi_prop_tag(PT_TSTRING,     0x0066));
-define('PR_ORIGINAL_SENDER_EMAIL_ADDRESS'             ,mapi_prop_tag(PT_TSTRING,     0x0067));
-
-define('PR_ORIGINAL_SENT_REPRESENTING_ADDRTYPE'       ,mapi_prop_tag(PT_TSTRING,     0x0068));
-define('PR_ORIGINAL_SENT_REPRESENTING_EMAIL_ADDRESS'  ,mapi_prop_tag(PT_TSTRING,     0x0069));
-
-define('PR_CONVERSATION_TOPIC'                        ,mapi_prop_tag(PT_TSTRING,     0x0070));
-define('PR_CONVERSATION_INDEX'                        ,mapi_prop_tag(PT_BINARY,      0x0071));
-
-define('PR_ORIGINAL_DISPLAY_BCC'                      ,mapi_prop_tag(PT_TSTRING,     0x0072));
-define('PR_ORIGINAL_DISPLAY_CC'                       ,mapi_prop_tag(PT_TSTRING,     0x0073));
-define('PR_ORIGINAL_DISPLAY_TO'                       ,mapi_prop_tag(PT_TSTRING,     0x0074));
-
-define('PR_RECEIVED_BY_ADDRTYPE'                      ,mapi_prop_tag(PT_TSTRING,     0x0075));
-define('PR_RECEIVED_BY_EMAIL_ADDRESS'                 ,mapi_prop_tag(PT_TSTRING,     0x0076));
-
-define('PR_RCVD_REPRESENTING_ADDRTYPE'                ,mapi_prop_tag(PT_TSTRING,     0x0077));
-define('PR_RCVD_REPRESENTING_EMAIL_ADDRESS'           ,mapi_prop_tag(PT_TSTRING,     0x0078));
-
-define('PR_ORIGINAL_AUTHOR_ADDRTYPE'                  ,mapi_prop_tag(PT_TSTRING,     0x0079));
-define('PR_ORIGINAL_AUTHOR_EMAIL_ADDRESS'             ,mapi_prop_tag(PT_TSTRING,     0x007A));
-
-define('PR_ORIGINALLY_INTENDED_RECIP_ADDRTYPE'        ,mapi_prop_tag(PT_TSTRING,     0x007B));
-define('PR_ORIGINALLY_INTENDED_RECIP_EMAIL_ADDRESS'   ,mapi_prop_tag(PT_TSTRING,     0x007C));
-
-define('PR_TRANSPORT_MESSAGE_HEADERS'                 ,mapi_prop_tag(PT_TSTRING,     0x007D));
-
-define('PR_DELEGATION'                                ,mapi_prop_tag(PT_BINARY,      0x007E));
-
-define('PR_TNEF_CORRELATION_KEY'                      ,mapi_prop_tag(PT_BINARY,      0x007F));
-
-define('PR_MDN_DISPOSITION_TYPE'                      ,mapi_prop_tag(PT_STRING8,     0x0080));
-define('PR_MDN_DISPOSITION_SENDINGMODE'               ,mapi_prop_tag(PT_STRING8,     0x0081));
-
-define('PR_USER_ENTRYID'                              ,mapi_prop_tag(PT_BINARY,      0x6619));
-define('PR_USER_NAME'                                 ,mapi_prop_tag(PT_STRING8,     0x661A));
-define('PR_MAILBOX_OWNER_ENTRYID'                     ,mapi_prop_tag(PT_BINARY,      0x661B));
-define('PR_MAILBOX_OWNER_NAME'                        ,mapi_prop_tag(PT_STRING8,     0x661C));
-
-define('PR_HIERARCHY_SYNCHRONIZER'                    ,mapi_prop_tag(PT_OBJECT,      0x662C));
-define('PR_CONTENTS_SYNCHRONIZER'                     ,mapi_prop_tag(PT_OBJECT,      0x662D));
-define('PR_COLLECTOR'                                 ,mapi_prop_tag(PT_OBJECT,      0x662E));
-
-define('PR_SMTP_ADDRESS'                              ,mapi_prop_tag(PT_TSTRING,     0x39FE));
+define('PR_ACKNOWLEDGEMENT_MODE', mapi_prop_tag(PT_LONG, 0x0001));
+define('PR_ALTERNATE_RECIPIENT_ALLOWED', mapi_prop_tag(PT_BOOLEAN, 0x0002));
+define('PR_AUTHORIZING_USERS', mapi_prop_tag(PT_BINARY, 0x0003));
+define('PR_AUTO_FORWARD_COMMENT', mapi_prop_tag(PT_TSTRING, 0x0004));
+define('PR_AUTO_FORWARDED', mapi_prop_tag(PT_BOOLEAN, 0x0005));
+define('PR_CONTENT_CONFIDENTIALITY_ALGORITHM_ID', mapi_prop_tag(PT_BINARY, 0x0006));
+define('PR_CONTENT_CORRELATOR', mapi_prop_tag(PT_BINARY, 0x0007));
+define('PR_CONTENT_IDENTIFIER', mapi_prop_tag(PT_TSTRING, 0x0008));
+define('PR_CONTENT_LENGTH', mapi_prop_tag(PT_LONG, 0x0009));
+define('PR_CONTENT_RETURN_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x000A));
+
+
+
+define('PR_CONVERSATION_KEY', mapi_prop_tag(PT_BINARY, 0x000B));
+
+define('PR_CONVERSION_EITS', mapi_prop_tag(PT_BINARY, 0x000C));
+define('PR_CONVERSION_WITH_LOSS_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x000D));
+define('PR_CONVERTED_EITS', mapi_prop_tag(PT_BINARY, 0x000E));
+define('PR_DEFERRED_DELIVERY_TIME', mapi_prop_tag(PT_SYSTIME, 0x000F));
+define('PR_DEFERRED_SEND_TIME', mapi_prop_tag(PT_SYSTIME, 0x3FEF));
+define('PR_DELIVER_TIME', mapi_prop_tag(PT_SYSTIME, 0x0010));
+define('PR_DISCARD_REASON', mapi_prop_tag(PT_LONG, 0x0011));
+define('PR_DISCLOSURE_OF_RECIPIENTS', mapi_prop_tag(PT_BOOLEAN, 0x0012));
+define('PR_DL_EXPANSION_HISTORY', mapi_prop_tag(PT_BINARY, 0x0013));
+define('PR_DL_EXPANSION_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x0014));
+define('PR_EXPIRY_TIME', mapi_prop_tag(PT_SYSTIME, 0x0015));
+define('PR_IMPLICIT_CONVERSION_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x0016));
+define('PR_IMPORTANCE', mapi_prop_tag(PT_LONG, 0x0017));
+define('PR_IPM_ID', mapi_prop_tag(PT_BINARY, 0x0018));
+define('PR_LATEST_DELIVERY_TIME', mapi_prop_tag(PT_SYSTIME, 0x0019));
+define('PR_MESSAGE_CLASS', mapi_prop_tag(PT_TSTRING, 0x001A));
+define('PR_MESSAGE_DELIVERY_ID', mapi_prop_tag(PT_BINARY, 0x001B));
+
+
+
+
+
+define('PR_MESSAGE_SECURITY_LABEL', mapi_prop_tag(PT_BINARY, 0x001E));
+define('PR_OBSOLETED_IPMS', mapi_prop_tag(PT_BINARY, 0x001F));
+define('PR_ORIGINALLY_INTENDED_RECIPIENT_NAME', mapi_prop_tag(PT_BINARY, 0x0020));
+define('PR_ORIGINAL_EITS', mapi_prop_tag(PT_BINARY, 0x0021));
+define('PR_ORIGINATOR_CERTIFICATE', mapi_prop_tag(PT_BINARY, 0x0022));
+define('PR_ORIGINATOR_DELIVERY_REPORT_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0023));
+define('PR_ORIGINATOR_RETURN_ADDRESS', mapi_prop_tag(PT_BINARY, 0x0024));
+
+define('PR_PARENT_KEY', mapi_prop_tag(PT_BINARY, 0x0025));
+define('PR_PRIORITY', mapi_prop_tag(PT_LONG, 0x0026));
+
+define('PR_ORIGIN_CHECK', mapi_prop_tag(PT_BINARY, 0x0027));
+define('PR_PROOF_OF_SUBMISSION_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0028));
+define('PR_READ_RECEIPT_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0029));
+define('PR_RECEIPT_TIME', mapi_prop_tag(PT_SYSTIME, 0x002A));
+define('PR_RECIPIENT_REASSIGNMENT_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x002B));
+define('PR_REDIRECTION_HISTORY', mapi_prop_tag(PT_BINARY, 0x002C));
+define('PR_RELATED_IPMS', mapi_prop_tag(PT_BINARY, 0x002D));
+define('PR_ORIGINAL_SENSITIVITY', mapi_prop_tag(PT_LONG, 0x002E));
+define('PR_LANGUAGES', mapi_prop_tag(PT_TSTRING, 0x002F));
+define('PR_REPLY_TIME', mapi_prop_tag(PT_SYSTIME, 0x0030));
+define('PR_REPORT_TAG', mapi_prop_tag(PT_BINARY, 0x0031));
+define('PR_REPORT_TIME', mapi_prop_tag(PT_SYSTIME, 0x0032));
+define('PR_RETURNED_IPM', mapi_prop_tag(PT_BOOLEAN, 0x0033));
+define('PR_SECURITY', mapi_prop_tag(PT_LONG, 0x0034));
+define('PR_INCOMPLETE_COPY', mapi_prop_tag(PT_BOOLEAN, 0x0035));
+define('PR_SENSITIVITY', mapi_prop_tag(PT_LONG, 0x0036));
+define('PR_SUBJECT', mapi_prop_tag(PT_TSTRING, 0x0037));
+define('PR_SUBJECT_IPM', mapi_prop_tag(PT_BINARY, 0x0038));
+define('PR_CLIENT_SUBMIT_TIME', mapi_prop_tag(PT_SYSTIME, 0x0039));
+define('PR_REPORT_NAME', mapi_prop_tag(PT_TSTRING, 0x003A));
+define('PR_SENT_REPRESENTING_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x003B));
+define('PR_X400_CONTENT_TYPE', mapi_prop_tag(PT_BINARY, 0x003C));
+define('PR_SUBJECT_PREFIX', mapi_prop_tag(PT_TSTRING, 0x003D));
+define('PR_NON_RECEIPT_REASON', mapi_prop_tag(PT_LONG, 0x003E));
+define('PR_RECEIVED_BY_ENTRYID', mapi_prop_tag(PT_BINARY, 0x003F));
+define('PR_RECEIVED_BY_NAME', mapi_prop_tag(PT_TSTRING, 0x0040));
+define('PR_SENT_REPRESENTING_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0041));
+define('PR_SENT_REPRESENTING_NAME', mapi_prop_tag(PT_TSTRING, 0x0042));
+define('PR_RCVD_REPRESENTING_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0043));
+define('PR_RCVD_REPRESENTING_NAME', mapi_prop_tag(PT_TSTRING, 0x0044));
+define('PR_REPORT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0045));
+define('PR_READ_RECEIPT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0046));
+define('PR_MESSAGE_SUBMISSION_ID', mapi_prop_tag(PT_BINARY, 0x0047));
+define('PR_PROVIDER_SUBMIT_TIME', mapi_prop_tag(PT_SYSTIME, 0x0048));
+define('PR_ORIGINAL_SUBJECT', mapi_prop_tag(PT_TSTRING, 0x0049));
+define('PR_DISC_VAL', mapi_prop_tag(PT_BOOLEAN, 0x004A));
+define('PR_ORIG_MESSAGE_CLASS', mapi_prop_tag(PT_TSTRING, 0x004B));
+define('PR_ORIGINAL_AUTHOR_ENTRYID', mapi_prop_tag(PT_BINARY, 0x004C));
+define('PR_ORIGINAL_AUTHOR_NAME', mapi_prop_tag(PT_TSTRING, 0x004D));
+define('PR_ORIGINAL_SUBMIT_TIME', mapi_prop_tag(PT_SYSTIME, 0x004E));
+define('PR_REPLY_RECIPIENT_ENTRIES', mapi_prop_tag(PT_BINARY, 0x004F));
+define('PR_REPLY_RECIPIENT_NAMES', mapi_prop_tag(PT_TSTRING, 0x0050));
+
+define('PR_RECEIVED_BY_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0051));
+define('PR_RCVD_REPRESENTING_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0052));
+define('PR_READ_RECEIPT_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0053));
+define('PR_REPORT_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0054));
+define('PR_ORIGINAL_DELIVERY_TIME', mapi_prop_tag(PT_SYSTIME, 0x0055));
+define('PR_ORIGINAL_AUTHOR_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0056));
+
+define('PR_MESSAGE_TO_ME', mapi_prop_tag(PT_BOOLEAN, 0x0057));
+define('PR_MESSAGE_CC_ME', mapi_prop_tag(PT_BOOLEAN, 0x0058));
+define('PR_MESSAGE_RECIP_ME', mapi_prop_tag(PT_BOOLEAN, 0x0059));
+
+define('PR_ORIGINAL_SENDER_NAME', mapi_prop_tag(PT_TSTRING, 0x005A));
+define('PR_ORIGINAL_SENDER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x005B));
+define('PR_ORIGINAL_SENDER_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x005C));
+define('PR_ORIGINAL_SENT_REPRESENTING_NAME', mapi_prop_tag(PT_TSTRING, 0x005D));
+define('PR_ORIGINAL_SENT_REPRESENTING_ENTRYID', mapi_prop_tag(PT_BINARY, 0x005E));
+define('PR_ORIGINAL_SENT_REPRESENTING_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x005F));
+
+define('PR_START_DATE', mapi_prop_tag(PT_SYSTIME, 0x0060));
+define('PR_END_DATE', mapi_prop_tag(PT_SYSTIME, 0x0061));
+define('PR_OWNER_APPT_ID', mapi_prop_tag(PT_LONG, 0x0062));
+define('PR_RESPONSE_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0063));
+
+define('PR_SENT_REPRESENTING_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0064));
+define('PR_SENT_REPRESENTING_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0065));
+
+define('PR_ORIGINAL_SENDER_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0066));
+define('PR_ORIGINAL_SENDER_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0067));
+
+define('PR_ORIGINAL_SENT_REPRESENTING_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0068));
+define('PR_ORIGINAL_SENT_REPRESENTING_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0069));
+
+define('PR_CONVERSATION_TOPIC', mapi_prop_tag(PT_TSTRING, 0x0070));
+define('PR_CONVERSATION_INDEX', mapi_prop_tag(PT_BINARY, 0x0071));
+
+define('PR_ORIGINAL_DISPLAY_BCC', mapi_prop_tag(PT_TSTRING, 0x0072));
+define('PR_ORIGINAL_DISPLAY_CC', mapi_prop_tag(PT_TSTRING, 0x0073));
+define('PR_ORIGINAL_DISPLAY_TO', mapi_prop_tag(PT_TSTRING, 0x0074));
+
+define('PR_RECEIVED_BY_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0075));
+define('PR_RECEIVED_BY_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0076));
+
+define('PR_RCVD_REPRESENTING_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0077));
+define('PR_RCVD_REPRESENTING_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0078));
+
+define('PR_ORIGINAL_AUTHOR_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0079));
+define('PR_ORIGINAL_AUTHOR_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x007A));
+
+define('PR_ORIGINALLY_INTENDED_RECIP_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x007B));
+define('PR_ORIGINALLY_INTENDED_RECIP_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x007C));
+
+define('PR_TRANSPORT_MESSAGE_HEADERS', mapi_prop_tag(PT_TSTRING, 0x007D));
+
+define('PR_DELEGATION', mapi_prop_tag(PT_BINARY, 0x007E));
+
+define('PR_TNEF_CORRELATION_KEY', mapi_prop_tag(PT_BINARY, 0x007F));
+
+define('PR_MDN_DISPOSITION_TYPE', mapi_prop_tag(PT_STRING8, 0x0080));
+define('PR_MDN_DISPOSITION_SENDINGMODE', mapi_prop_tag(PT_STRING8, 0x0081));
+
+define('PR_USER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x6619));
+define('PR_USER_NAME', mapi_prop_tag(PT_STRING8, 0x661A));
+define('PR_MAILBOX_OWNER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x661B));
+define('PR_MAILBOX_OWNER_NAME', mapi_prop_tag(PT_STRING8, 0x661C));
+
+define('PR_HIERARCHY_SYNCHRONIZER', mapi_prop_tag(PT_OBJECT, 0x662C));
+define('PR_CONTENTS_SYNCHRONIZER', mapi_prop_tag(PT_OBJECT, 0x662D));
+define('PR_COLLECTOR', mapi_prop_tag(PT_OBJECT, 0x662E));
+
+define('PR_SMTP_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x39FE));
 
 /*
  *  Message content properties
  */
 
-define('PR_BODY'                                      ,mapi_prop_tag(PT_TSTRING,     0x1000));
-define('PR_HTML'                                      ,mapi_prop_tag(PT_BINARY,      0x1013));
-define('PR_REPORT_TEXT'                               ,mapi_prop_tag(PT_TSTRING,     0x1001));
-define('PR_ORIGINATOR_AND_DL_EXPANSION_HISTORY'       ,mapi_prop_tag(PT_BINARY,      0x1002));
-define('PR_REPORTING_DL_NAME'                         ,mapi_prop_tag(PT_BINARY,      0x1003));
-define('PR_REPORTING_MTA_CERTIFICATE'                 ,mapi_prop_tag(PT_BINARY,      0x1004));
+define('PR_BODY', mapi_prop_tag(PT_TSTRING, 0x1000));
+define('PR_HTML', mapi_prop_tag(PT_BINARY, 0x1013));
+define('PR_REPORT_TEXT', mapi_prop_tag(PT_TSTRING, 0x1001));
+define('PR_ORIGINATOR_AND_DL_EXPANSION_HISTORY', mapi_prop_tag(PT_BINARY, 0x1002));
+define('PR_REPORTING_DL_NAME', mapi_prop_tag(PT_BINARY, 0x1003));
+define('PR_REPORTING_MTA_CERTIFICATE', mapi_prop_tag(PT_BINARY, 0x1004));
 
 /*  Removed 'PR_REPORT_ORIGIN_AUTHENTICATION_CHECK with DCR 3865, use 'PR_ORIGIN_CHECK */
 
-define('PR_RTF_SYNC_BODY_CRC'                         ,mapi_prop_tag(PT_LONG,        0x1006));
-define('PR_RTF_SYNC_BODY_COUNT'                       ,mapi_prop_tag(PT_LONG,        0x1007));
-define('PR_RTF_SYNC_BODY_TAG'                         ,mapi_prop_tag(PT_TSTRING,     0x1008));
-define('PR_RTF_COMPRESSED'                            ,mapi_prop_tag(PT_BINARY,      0x1009));
-define('PR_RTF_SYNC_PREFIX_COUNT'                     ,mapi_prop_tag(PT_LONG,        0x1010));
-define('PR_RTF_SYNC_TRAILING_COUNT'                   ,mapi_prop_tag(PT_LONG,        0x1011));
-define('PR_ORIGINALLY_INTENDED_RECIP_ENTRYID'         ,mapi_prop_tag(PT_BINARY,      0x1012));
-define('PR_NATIVE_BODY_INFO'                          ,mapi_prop_tag(PT_LONG,        0x1016));
+define('PR_RTF_SYNC_BODY_CRC', mapi_prop_tag(PT_LONG, 0x1006));
+define('PR_RTF_SYNC_BODY_COUNT', mapi_prop_tag(PT_LONG, 0x1007));
+define('PR_RTF_SYNC_BODY_TAG', mapi_prop_tag(PT_TSTRING, 0x1008));
+define('PR_RTF_COMPRESSED', mapi_prop_tag(PT_BINARY, 0x1009));
+define('PR_RTF_SYNC_PREFIX_COUNT', mapi_prop_tag(PT_LONG, 0x1010));
+define('PR_RTF_SYNC_TRAILING_COUNT', mapi_prop_tag(PT_LONG, 0x1011));
+define('PR_ORIGINALLY_INTENDED_RECIP_ENTRYID', mapi_prop_tag(PT_BINARY, 0x1012));
+define('PR_NATIVE_BODY_INFO', mapi_prop_tag(PT_LONG, 0x1016));
 
-define('PR_CONFLICT_ITEMS'                            ,mapi_prop_tag(PT_MV_BINARY,   0x1098));
+define('PR_CONFLICT_ITEMS', mapi_prop_tag(PT_MV_BINARY, 0x1098));
 
 /*
  *  Reserved 0x1100-0x1200
@@ -203,39 +203,39 @@ 
  *  Message recipient properties
  */
 
-define('PR_CONTENT_INTEGRITY_CHECK'                   ,mapi_prop_tag(PT_BINARY,      0x0C00));
-define('PR_EXPLICIT_CONVERSION'                       ,mapi_prop_tag(PT_LONG,        0x0C01));
-define('PR_IPM_RETURN_REQUESTED'                      ,mapi_prop_tag(PT_BOOLEAN,     0x0C02));
-define('PR_MESSAGE_TOKEN'                             ,mapi_prop_tag(PT_BINARY,      0x0C03));
-define('PR_NDR_REASON_CODE'                           ,mapi_prop_tag(PT_LONG,        0x0C04));
-define('PR_NDR_DIAG_CODE'                             ,mapi_prop_tag(PT_LONG,        0x0C05));
-define('PR_NON_RECEIPT_NOTIFICATION_REQUESTED'        ,mapi_prop_tag(PT_BOOLEAN,     0x0C06));
-define('PR_DELIVERY_POINT'                            ,mapi_prop_tag(PT_LONG,        0x0C07));
-
-define('PR_ORIGINATOR_NON_DELIVERY_REPORT_REQUESTED'  ,mapi_prop_tag(PT_BOOLEAN,     0x0C08));
-define('PR_ORIGINATOR_REQUESTED_ALTERNATE_RECIPIENT'  ,mapi_prop_tag(PT_BINARY,      0x0C09));
-define('PR_PHYSICAL_DELIVERY_BUREAU_FAX_DELIVERY'     ,mapi_prop_tag(PT_BOOLEAN,     0x0C0A));
-define('PR_PHYSICAL_DELIVERY_MODE'                    ,mapi_prop_tag(PT_LONG,        0x0C0B));
-define('PR_PHYSICAL_DELIVERY_REPORT_REQUEST'          ,mapi_prop_tag(PT_LONG,        0x0C0C));
-define('PR_PHYSICAL_FORWARDING_ADDRESS'               ,mapi_prop_tag(PT_BINARY,      0x0C0D));
-define('PR_PHYSICAL_FORWARDING_ADDRESS_REQUESTED'     ,mapi_prop_tag(PT_BOOLEAN,     0x0C0E));
-define('PR_PHYSICAL_FORWARDING_PROHIBITED'            ,mapi_prop_tag(PT_BOOLEAN,     0x0C0F));
-define('PR_PHYSICAL_RENDITION_ATTRIBUTES'             ,mapi_prop_tag(PT_BINARY,      0x0C10));
-define('PR_PROOF_OF_DELIVERY'                         ,mapi_prop_tag(PT_BINARY,      0x0C11));
-define('PR_PROOF_OF_DELIVERY_REQUESTED'               ,mapi_prop_tag(PT_BOOLEAN,     0x0C12));
-define('PR_RECIPIENT_CERTIFICATE'                     ,mapi_prop_tag(PT_BINARY,      0x0C13));
-define('PR_RECIPIENT_NUMBER_FOR_ADVICE'               ,mapi_prop_tag(PT_TSTRING,     0x0C14));
-define('PR_RECIPIENT_TYPE'                            ,mapi_prop_tag(PT_LONG,        0x0C15));
-define('PR_REGISTERED_MAIL_TYPE'                      ,mapi_prop_tag(PT_LONG,        0x0C16));
-define('PR_REPLY_REQUESTED'                           ,mapi_prop_tag(PT_BOOLEAN,     0x0C17));
-define('PR_REQUESTED_DELIVERY_METHOD'                 ,mapi_prop_tag(PT_LONG,        0x0C18));
-define('PR_SENDER_ENTRYID'                            ,mapi_prop_tag(PT_BINARY,      0x0C19));
-define('PR_SENDER_NAME'                               ,mapi_prop_tag(PT_TSTRING,     0x0C1A));
-define('PR_SUPPLEMENTARY_INFO'                        ,mapi_prop_tag(PT_TSTRING,     0x0C1B));
-define('PR_TYPE_OF_MTS_USER'                          ,mapi_prop_tag(PT_LONG,        0x0C1C));
-define('PR_SENDER_SEARCH_KEY'                         ,mapi_prop_tag(PT_BINARY,      0x0C1D));
-define('PR_SENDER_ADDRTYPE'                           ,mapi_prop_tag(PT_TSTRING,     0x0C1E));
-define('PR_SENDER_EMAIL_ADDRESS'                      ,mapi_prop_tag(PT_TSTRING,     0x0C1F));
+define('PR_CONTENT_INTEGRITY_CHECK', mapi_prop_tag(PT_BINARY, 0x0C00));
+define('PR_EXPLICIT_CONVERSION', mapi_prop_tag(PT_LONG, 0x0C01));
+define('PR_IPM_RETURN_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C02));
+define('PR_MESSAGE_TOKEN', mapi_prop_tag(PT_BINARY, 0x0C03));
+define('PR_NDR_REASON_CODE', mapi_prop_tag(PT_LONG, 0x0C04));
+define('PR_NDR_DIAG_CODE', mapi_prop_tag(PT_LONG, 0x0C05));
+define('PR_NON_RECEIPT_NOTIFICATION_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C06));
+define('PR_DELIVERY_POINT', mapi_prop_tag(PT_LONG, 0x0C07));
+
+define('PR_ORIGINATOR_NON_DELIVERY_REPORT_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C08));
+define('PR_ORIGINATOR_REQUESTED_ALTERNATE_RECIPIENT', mapi_prop_tag(PT_BINARY, 0x0C09));
+define('PR_PHYSICAL_DELIVERY_BUREAU_FAX_DELIVERY', mapi_prop_tag(PT_BOOLEAN, 0x0C0A));
+define('PR_PHYSICAL_DELIVERY_MODE', mapi_prop_tag(PT_LONG, 0x0C0B));
+define('PR_PHYSICAL_DELIVERY_REPORT_REQUEST', mapi_prop_tag(PT_LONG, 0x0C0C));
+define('PR_PHYSICAL_FORWARDING_ADDRESS', mapi_prop_tag(PT_BINARY, 0x0C0D));
+define('PR_PHYSICAL_FORWARDING_ADDRESS_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C0E));
+define('PR_PHYSICAL_FORWARDING_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x0C0F));
+define('PR_PHYSICAL_RENDITION_ATTRIBUTES', mapi_prop_tag(PT_BINARY, 0x0C10));
+define('PR_PROOF_OF_DELIVERY', mapi_prop_tag(PT_BINARY, 0x0C11));
+define('PR_PROOF_OF_DELIVERY_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C12));
+define('PR_RECIPIENT_CERTIFICATE', mapi_prop_tag(PT_BINARY, 0x0C13));
+define('PR_RECIPIENT_NUMBER_FOR_ADVICE', mapi_prop_tag(PT_TSTRING, 0x0C14));
+define('PR_RECIPIENT_TYPE', mapi_prop_tag(PT_LONG, 0x0C15));
+define('PR_REGISTERED_MAIL_TYPE', mapi_prop_tag(PT_LONG, 0x0C16));
+define('PR_REPLY_REQUESTED', mapi_prop_tag(PT_BOOLEAN, 0x0C17));
+define('PR_REQUESTED_DELIVERY_METHOD', mapi_prop_tag(PT_LONG, 0x0C18));
+define('PR_SENDER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0C19));
+define('PR_SENDER_NAME', mapi_prop_tag(PT_TSTRING, 0x0C1A));
+define('PR_SUPPLEMENTARY_INFO', mapi_prop_tag(PT_TSTRING, 0x0C1B));
+define('PR_TYPE_OF_MTS_USER', mapi_prop_tag(PT_LONG, 0x0C1C));
+define('PR_SENDER_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x0C1D));
+define('PR_SENDER_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x0C1E));
+define('PR_SENDER_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x0C1F));
 
 /*
  *  Message non-transmittable properties
@@ -249,47 +249,47 @@ 
  * return from IMessage::CopyTo when an error is encountered copying them
  */
 
-define('PR_CURRENT_VERSION'                           ,mapi_prop_tag(PT_I8,          0x0E00));
-define('PR_DELETE_AFTER_SUBMIT'                       ,mapi_prop_tag(PT_BOOLEAN,     0x0E01));
-define('PR_DISPLAY_BCC'                               ,mapi_prop_tag(PT_TSTRING,     0x0E02));
-define('PR_DISPLAY_CC'                                ,mapi_prop_tag(PT_TSTRING,     0x0E03));
-define('PR_DISPLAY_TO'                                ,mapi_prop_tag(PT_TSTRING,     0x0E04));
-define('PR_PARENT_DISPLAY'                            ,mapi_prop_tag(PT_TSTRING,     0x0E05));
-define('PR_MESSAGE_DELIVERY_TIME'                     ,mapi_prop_tag(PT_SYSTIME,     0x0E06));
-define('PR_MESSAGE_FLAGS'                             ,mapi_prop_tag(PT_LONG,        0x0E07));
-define('PR_MESSAGE_SIZE'                              ,mapi_prop_tag(PT_LONG,        0x0E08));
-define('PR_MESSAGE_SIZE_EXTENDED'                     ,mapi_prop_tag(PT_LONGLONG,    0x0E08));
-define('PR_PARENT_ENTRYID'                            ,mapi_prop_tag(PT_BINARY,      0x0E09));
-define('PR_SENTMAIL_ENTRYID'                          ,mapi_prop_tag(PT_BINARY,      0x0E0A));
-define('PR_CORRELATE'                                 ,mapi_prop_tag(PT_BOOLEAN,     0x0E0C));
-define('PR_CORRELATE_MTSID'                           ,mapi_prop_tag(PT_BINARY,      0x0E0D));
-define('PR_DISCRETE_VALUES'                           ,mapi_prop_tag(PT_BOOLEAN,     0x0E0E));
-define('PR_RESPONSIBILITY'                            ,mapi_prop_tag(PT_BOOLEAN,     0x0E0F));
-define('PR_SPOOLER_STATUS'                            ,mapi_prop_tag(PT_LONG,        0x0E10));
-define('PR_TRANSPORT_STATUS'                          ,mapi_prop_tag(PT_LONG,        0x0E11));
-define('PR_MESSAGE_RECIPIENTS'                        ,mapi_prop_tag(PT_OBJECT,      0x0E12));
-define('PR_MESSAGE_ATTACHMENTS'                       ,mapi_prop_tag(PT_OBJECT,      0x0E13));
-define('PR_SUBMIT_FLAGS'                              ,mapi_prop_tag(PT_LONG,        0x0E14));
-define('PR_RECIPIENT_STATUS'                          ,mapi_prop_tag(PT_LONG,        0x0E15));
-define('PR_TRANSPORT_KEY'                             ,mapi_prop_tag(PT_LONG,        0x0E16));
-define('PR_MSG_STATUS'                                ,mapi_prop_tag(PT_LONG,        0x0E17));
-define('PR_MESSAGE_DOWNLOAD_TIME'                     ,mapi_prop_tag(PT_LONG,        0x0E18));
-define('PR_CREATION_VERSION'                          ,mapi_prop_tag(PT_I8,          0x0E19));
-define('PR_MODIFY_VERSION'                            ,mapi_prop_tag(PT_I8,          0x0E1A));
-define('PR_HASATTACH'                                 ,mapi_prop_tag(PT_BOOLEAN,     0x0E1B));
-define('PR_BODY_CRC'                                  ,mapi_prop_tag(PT_LONG,        0x0E1C));
-define('PR_NORMALIZED_SUBJECT'                        ,mapi_prop_tag(PT_TSTRING,     0x0E1D));
-define('PR_RTF_IN_SYNC'                               ,mapi_prop_tag(PT_BOOLEAN,     0x0E1F));
-define('PR_ATTACH_SIZE'                               ,mapi_prop_tag(PT_LONG,        0x0E20));
-define('PR_ATTACH_NUM'                                ,mapi_prop_tag(PT_LONG,        0x0E21));
-define('PR_PREPROCESS'                                ,mapi_prop_tag(PT_BOOLEAN,     0x0E22));
+define('PR_CURRENT_VERSION', mapi_prop_tag(PT_I8, 0x0E00));
+define('PR_DELETE_AFTER_SUBMIT', mapi_prop_tag(PT_BOOLEAN, 0x0E01));
+define('PR_DISPLAY_BCC', mapi_prop_tag(PT_TSTRING, 0x0E02));
+define('PR_DISPLAY_CC', mapi_prop_tag(PT_TSTRING, 0x0E03));
+define('PR_DISPLAY_TO', mapi_prop_tag(PT_TSTRING, 0x0E04));
+define('PR_PARENT_DISPLAY', mapi_prop_tag(PT_TSTRING, 0x0E05));
+define('PR_MESSAGE_DELIVERY_TIME', mapi_prop_tag(PT_SYSTIME, 0x0E06));
+define('PR_MESSAGE_FLAGS', mapi_prop_tag(PT_LONG, 0x0E07));
+define('PR_MESSAGE_SIZE', mapi_prop_tag(PT_LONG, 0x0E08));
+define('PR_MESSAGE_SIZE_EXTENDED', mapi_prop_tag(PT_LONGLONG, 0x0E08));
+define('PR_PARENT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0E09));
+define('PR_SENTMAIL_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0E0A));
+define('PR_CORRELATE', mapi_prop_tag(PT_BOOLEAN, 0x0E0C));
+define('PR_CORRELATE_MTSID', mapi_prop_tag(PT_BINARY, 0x0E0D));
+define('PR_DISCRETE_VALUES', mapi_prop_tag(PT_BOOLEAN, 0x0E0E));
+define('PR_RESPONSIBILITY', mapi_prop_tag(PT_BOOLEAN, 0x0E0F));
+define('PR_SPOOLER_STATUS', mapi_prop_tag(PT_LONG, 0x0E10));
+define('PR_TRANSPORT_STATUS', mapi_prop_tag(PT_LONG, 0x0E11));
+define('PR_MESSAGE_RECIPIENTS', mapi_prop_tag(PT_OBJECT, 0x0E12));
+define('PR_MESSAGE_ATTACHMENTS', mapi_prop_tag(PT_OBJECT, 0x0E13));
+define('PR_SUBMIT_FLAGS', mapi_prop_tag(PT_LONG, 0x0E14));
+define('PR_RECIPIENT_STATUS', mapi_prop_tag(PT_LONG, 0x0E15));
+define('PR_TRANSPORT_KEY', mapi_prop_tag(PT_LONG, 0x0E16));
+define('PR_MSG_STATUS', mapi_prop_tag(PT_LONG, 0x0E17));
+define('PR_MESSAGE_DOWNLOAD_TIME', mapi_prop_tag(PT_LONG, 0x0E18));
+define('PR_CREATION_VERSION', mapi_prop_tag(PT_I8, 0x0E19));
+define('PR_MODIFY_VERSION', mapi_prop_tag(PT_I8, 0x0E1A));
+define('PR_HASATTACH', mapi_prop_tag(PT_BOOLEAN, 0x0E1B));
+define('PR_BODY_CRC', mapi_prop_tag(PT_LONG, 0x0E1C));
+define('PR_NORMALIZED_SUBJECT', mapi_prop_tag(PT_TSTRING, 0x0E1D));
+define('PR_RTF_IN_SYNC', mapi_prop_tag(PT_BOOLEAN, 0x0E1F));
+define('PR_ATTACH_SIZE', mapi_prop_tag(PT_LONG, 0x0E20));
+define('PR_ATTACH_NUM', mapi_prop_tag(PT_LONG, 0x0E21));
+define('PR_PREPROCESS', mapi_prop_tag(PT_BOOLEAN, 0x0E22));
 
 /* 'PR_ORIGINAL_DISPLAY_TO, _CC, and _BCC moved to transmittible range 03/09/95 */
 
-define('PR_ORIGINATING_MTA_CERTIFICATE'               ,mapi_prop_tag(PT_BINARY,      0x0E25));
-define('PR_PROOF_OF_SUBMISSION'                       ,mapi_prop_tag(PT_BINARY,      0x0E26));
+define('PR_ORIGINATING_MTA_CERTIFICATE', mapi_prop_tag(PT_BINARY, 0x0E25));
+define('PR_PROOF_OF_SUBMISSION', mapi_prop_tag(PT_BINARY, 0x0E26));
 
-define('PR_TODO_ITEM_FLAGS'                           ,mapi_prop_tag(PT_LONG,        0x0E2B));
+define('PR_TODO_ITEM_FLAGS', mapi_prop_tag(PT_LONG, 0x0E2B));
 
 /*
  * The range of non-message and non-recipient property IDs (0x3000 - 0x3FFF)); is
@@ -326,80 +326,80 @@ 
  * -- these ids are in the non-transmittable range
  */
 
-define('PR_ENTRYID'                                   ,mapi_prop_tag(PT_BINARY,      0x0FFF));
-define('PR_OBJECT_TYPE'                               ,mapi_prop_tag(PT_LONG,        0x0FFE));
-define('PR_ICON'                                      ,mapi_prop_tag(PT_BINARY,      0x0FFD));
-define('PR_MINI_ICON'                                 ,mapi_prop_tag(PT_BINARY,      0x0FFC));
-define('PR_STORE_ENTRYID'                             ,mapi_prop_tag(PT_BINARY,      0x0FFB));
-define('PR_STORE_RECORD_KEY'                          ,mapi_prop_tag(PT_BINARY,      0x0FFA));
-define('PR_RECORD_KEY'                                ,mapi_prop_tag(PT_BINARY,      0x0FF9));
-define('PR_MAPPING_SIGNATURE'                         ,mapi_prop_tag(PT_BINARY,      0x0FF8));
-define('PR_ACCESS_LEVEL'                              ,mapi_prop_tag(PT_LONG,        0x0FF7));
-define('PR_INSTANCE_KEY'                              ,mapi_prop_tag(PT_BINARY,      0x0FF6));
-define('PR_ROW_TYPE'                                  ,mapi_prop_tag(PT_LONG,        0x0FF5));
-define('PR_ACCESS'                                    ,mapi_prop_tag(PT_LONG,        0x0FF4));
+define('PR_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0FFF));
+define('PR_OBJECT_TYPE', mapi_prop_tag(PT_LONG, 0x0FFE));
+define('PR_ICON', mapi_prop_tag(PT_BINARY, 0x0FFD));
+define('PR_MINI_ICON', mapi_prop_tag(PT_BINARY, 0x0FFC));
+define('PR_STORE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x0FFB));
+define('PR_STORE_RECORD_KEY', mapi_prop_tag(PT_BINARY, 0x0FFA));
+define('PR_RECORD_KEY', mapi_prop_tag(PT_BINARY, 0x0FF9));
+define('PR_MAPPING_SIGNATURE', mapi_prop_tag(PT_BINARY, 0x0FF8));
+define('PR_ACCESS_LEVEL', mapi_prop_tag(PT_LONG, 0x0FF7));
+define('PR_INSTANCE_KEY', mapi_prop_tag(PT_BINARY, 0x0FF6));
+define('PR_ROW_TYPE', mapi_prop_tag(PT_LONG, 0x0FF5));
+define('PR_ACCESS', mapi_prop_tag(PT_LONG, 0x0FF4));
 
 /*
  * properties that are common to multiple objects (usually not including message objects));
  * -- these ids are in the transmittable range
  */
 
-define('PR_ROWID'                                     ,mapi_prop_tag(PT_LONG,        0x3000));
-define('PR_DISPLAY_NAME'                              ,mapi_prop_tag(PT_TSTRING,     0x3001));
-define('PR_DISPLAY_NAME_W'                            ,mapi_prop_tag(PT_UNICODE,     0x3001));
-define('PR_ADDRTYPE'                                  ,mapi_prop_tag(PT_TSTRING,     0x3002));
-define('PR_EMAIL_ADDRESS'                             ,mapi_prop_tag(PT_TSTRING,     0x3003));
-define('PR_COMMENT'                                   ,mapi_prop_tag(PT_TSTRING,     0x3004));
-define('PR_DEPTH'                                     ,mapi_prop_tag(PT_LONG,        0x3005));
-define('PR_PROVIDER_DISPLAY'                          ,mapi_prop_tag(PT_TSTRING,     0x3006));
-define('PR_CREATION_TIME'                             ,mapi_prop_tag(PT_SYSTIME,     0x3007));
-define('PR_LAST_MODIFICATION_TIME'                    ,mapi_prop_tag(PT_SYSTIME,     0x3008));
-define('PR_RESOURCE_FLAGS'                            ,mapi_prop_tag(PT_LONG,        0x3009));
-define('PR_PROVIDER_DLL_NAME'                         ,mapi_prop_tag(PT_TSTRING,     0x300A));
-define('PR_SEARCH_KEY'                                ,mapi_prop_tag(PT_BINARY,      0x300B));
-define('PR_PROVIDER_UID'                              ,mapi_prop_tag(PT_BINARY,      0x300C));
-define('PR_PROVIDER_ORDINAL'                          ,mapi_prop_tag(PT_LONG,        0x300D));
+define('PR_ROWID', mapi_prop_tag(PT_LONG, 0x3000));
+define('PR_DISPLAY_NAME', mapi_prop_tag(PT_TSTRING, 0x3001));
+define('PR_DISPLAY_NAME_W', mapi_prop_tag(PT_UNICODE, 0x3001));
+define('PR_ADDRTYPE', mapi_prop_tag(PT_TSTRING, 0x3002));
+define('PR_EMAIL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x3003));
+define('PR_COMMENT', mapi_prop_tag(PT_TSTRING, 0x3004));
+define('PR_DEPTH', mapi_prop_tag(PT_LONG, 0x3005));
+define('PR_PROVIDER_DISPLAY', mapi_prop_tag(PT_TSTRING, 0x3006));
+define('PR_CREATION_TIME', mapi_prop_tag(PT_SYSTIME, 0x3007));
+define('PR_LAST_MODIFICATION_TIME', mapi_prop_tag(PT_SYSTIME, 0x3008));
+define('PR_RESOURCE_FLAGS', mapi_prop_tag(PT_LONG, 0x3009));
+define('PR_PROVIDER_DLL_NAME', mapi_prop_tag(PT_TSTRING, 0x300A));
+define('PR_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x300B));
+define('PR_PROVIDER_UID', mapi_prop_tag(PT_BINARY, 0x300C));
+define('PR_PROVIDER_ORDINAL', mapi_prop_tag(PT_LONG, 0x300D));
 
 /*
  *  MAPI Form properties
  */
-define('PR_FORM_VERSION'                              ,mapi_prop_tag(PT_TSTRING,     0x3301));
-define('PR_FORM_CLSID'                                ,mapi_prop_tag(PT_CLSID,       0x3302));
-define('PR_FORM_CONTACT_NAME'                         ,mapi_prop_tag(PT_TSTRING,     0x3303));
-define('PR_FORM_CATEGORY'                             ,mapi_prop_tag(PT_TSTRING,     0x3304));
-define('PR_FORM_CATEGORY_SUB'                         ,mapi_prop_tag(PT_TSTRING,     0x3305));
-define('PR_FORM_HOST_MAP'                             ,mapi_prop_tag(PT_MV_LONG,     0x3306));
-define('PR_FORM_HIDDEN'                               ,mapi_prop_tag(PT_BOOLEAN,     0x3307));
-define('PR_FORM_DESIGNER_NAME'                        ,mapi_prop_tag(PT_TSTRING,     0x3308));
-define('PR_FORM_DESIGNER_GUID'                        ,mapi_prop_tag(PT_CLSID,       0x3309));
-define('PR_FORM_MESSAGE_BEHAVIOR'                     ,mapi_prop_tag(PT_LONG,        0x330A));
+define('PR_FORM_VERSION', mapi_prop_tag(PT_TSTRING, 0x3301));
+define('PR_FORM_CLSID', mapi_prop_tag(PT_CLSID, 0x3302));
+define('PR_FORM_CONTACT_NAME', mapi_prop_tag(PT_TSTRING, 0x3303));
+define('PR_FORM_CATEGORY', mapi_prop_tag(PT_TSTRING, 0x3304));
+define('PR_FORM_CATEGORY_SUB', mapi_prop_tag(PT_TSTRING, 0x3305));
+define('PR_FORM_HOST_MAP', mapi_prop_tag(PT_MV_LONG, 0x3306));
+define('PR_FORM_HIDDEN', mapi_prop_tag(PT_BOOLEAN, 0x3307));
+define('PR_FORM_DESIGNER_NAME', mapi_prop_tag(PT_TSTRING, 0x3308));
+define('PR_FORM_DESIGNER_GUID', mapi_prop_tag(PT_CLSID, 0x3309));
+define('PR_FORM_MESSAGE_BEHAVIOR', mapi_prop_tag(PT_LONG, 0x330A));
 
 /*
  *  Message store properties
  */
 
-define('PR_DEFAULT_STORE'                             ,mapi_prop_tag(PT_BOOLEAN,     0x3400));
-define('PR_STORE_SUPPORT_MASK'                        ,mapi_prop_tag(PT_LONG,        0x340D));
-define('PR_STORE_STATE'                               ,mapi_prop_tag(PT_LONG,        0x340E));
+define('PR_DEFAULT_STORE', mapi_prop_tag(PT_BOOLEAN, 0x3400));
+define('PR_STORE_SUPPORT_MASK', mapi_prop_tag(PT_LONG, 0x340D));
+define('PR_STORE_STATE', mapi_prop_tag(PT_LONG, 0x340E));
 
-define('PR_IPM_SUBTREE_SEARCH_KEY'                    ,mapi_prop_tag(PT_BINARY,      0x3410));
-define('PR_IPM_OUTBOX_SEARCH_KEY'                     ,mapi_prop_tag(PT_BINARY,      0x3411));
-define('PR_IPM_WASTEBASKET_SEARCH_KEY'                ,mapi_prop_tag(PT_BINARY,      0x3412));
-define('PR_IPM_SENTMAIL_SEARCH_KEY'                   ,mapi_prop_tag(PT_BINARY,      0x3413));
-define('PR_MDB_PROVIDER'                              ,mapi_prop_tag(PT_BINARY,      0x3414));
-define('PR_RECEIVE_FOLDER_SETTINGS'                   ,mapi_prop_tag(PT_OBJECT,      0x3415));
+define('PR_IPM_SUBTREE_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3410));
+define('PR_IPM_OUTBOX_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3411));
+define('PR_IPM_WASTEBASKET_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3412));
+define('PR_IPM_SENTMAIL_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3413));
+define('PR_MDB_PROVIDER', mapi_prop_tag(PT_BINARY, 0x3414));
+define('PR_RECEIVE_FOLDER_SETTINGS', mapi_prop_tag(PT_OBJECT, 0x3415));
 
-define('PR_VALID_FOLDER_MASK'                         ,mapi_prop_tag(PT_LONG,        0x35DF));
-define('PR_IPM_SUBTREE_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x35E0));
+define('PR_VALID_FOLDER_MASK', mapi_prop_tag(PT_LONG, 0x35DF));
+define('PR_IPM_SUBTREE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E0));
 
-define('PR_IPM_OUTBOX_ENTRYID'                        ,mapi_prop_tag(PT_BINARY,      0x35E2));
-define('PR_IPM_WASTEBASKET_ENTRYID'                   ,mapi_prop_tag(PT_BINARY,      0x35E3));
-define('PR_IPM_SENTMAIL_ENTRYID'                      ,mapi_prop_tag(PT_BINARY,      0x35E4));
-define('PR_VIEWS_ENTRYID'                             ,mapi_prop_tag(PT_BINARY,      0x35E5));
-define('PR_COMMON_VIEWS_ENTRYID'                      ,mapi_prop_tag(PT_BINARY,      0x35E6));
-define('PR_FINDER_ENTRYID'                            ,mapi_prop_tag(PT_BINARY,      0x35E7));
-define('PR_IPM_FAVORITES_ENTRYID'                     ,mapi_prop_tag(PT_BINARY,      0x6630));
-define('PR_IPM_PUBLIC_FOLDERS_ENTRYID'                ,mapi_prop_tag(PT_BINARY,      0x6631));
+define('PR_IPM_OUTBOX_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E2));
+define('PR_IPM_WASTEBASKET_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E3));
+define('PR_IPM_SENTMAIL_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E4));
+define('PR_VIEWS_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E5));
+define('PR_COMMON_VIEWS_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E6));
+define('PR_FINDER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x35E7));
+define('PR_IPM_FAVORITES_ENTRYID', mapi_prop_tag(PT_BINARY, 0x6630));
+define('PR_IPM_PUBLIC_FOLDERS_ENTRYID', mapi_prop_tag(PT_BINARY, 0x6631));
 
 
 /* Proptags 0x35E8-0x35FF reserved for folders "guaranteed" by 'PR_VALID_FOLDER_MASK */
@@ -409,31 +409,31 @@ 
  *  Folder and AB Container properties
  */
 
-define('PR_CONTAINER_FLAGS'                           ,mapi_prop_tag(PT_LONG,        0x3600));
-define('PR_FOLDER_TYPE'                               ,mapi_prop_tag(PT_LONG,        0x3601));
-define('PR_CONTENT_COUNT'                             ,mapi_prop_tag(PT_LONG,        0x3602));
-define('PR_CONTENT_UNREAD'                            ,mapi_prop_tag(PT_LONG,        0x3603));
-define('PR_CREATE_TEMPLATES'                          ,mapi_prop_tag(PT_OBJECT,      0x3604));
-define('PR_DETAILS_TABLE'                             ,mapi_prop_tag(PT_OBJECT,      0x3605));
-define('PR_SEARCH'                                    ,mapi_prop_tag(PT_OBJECT,      0x3607));
-define('PR_SELECTABLE'                                ,mapi_prop_tag(PT_BOOLEAN,     0x3609));
-define('PR_SUBFOLDERS'                                ,mapi_prop_tag(PT_BOOLEAN,     0x360A));
-define('PR_STATUS'                                    ,mapi_prop_tag(PT_LONG,        0x360B));
-define('PR_ANR'                                       ,mapi_prop_tag(PT_TSTRING,     0x360C));
-define('PR_CONTENTS_SORT_ORDER'                       ,mapi_prop_tag(PT_MV_LONG,     0x360D));
-define('PR_CONTAINER_HIERARCHY'                       ,mapi_prop_tag(PT_OBJECT,      0x360E));
-define('PR_CONTAINER_CONTENTS'                        ,mapi_prop_tag(PT_OBJECT,      0x360F));
-define('PR_FOLDER_ASSOCIATED_CONTENTS'                ,mapi_prop_tag(PT_OBJECT,      0x3610));
-define('PR_DEF_CREATE_DL'                             ,mapi_prop_tag(PT_BINARY,      0x3611));
-define('PR_DEF_CREATE_MAILUSER'                       ,mapi_prop_tag(PT_BINARY,      0x3612));
-define('PR_CONTAINER_CLASS'                           ,mapi_prop_tag(PT_TSTRING,     0x3613));
-define('PR_CONTAINER_MODIFY_VERSION'                  ,mapi_prop_tag(PT_I8,          0x3614));
-define('PR_AB_PROVIDER_ID'                            ,mapi_prop_tag(PT_BINARY,      0x3615));
-define('PR_DEFAULT_VIEW_ENTRYID'                      ,mapi_prop_tag(PT_BINARY,      0x3616));
-define('PR_ASSOC_CONTENT_COUNT'                       ,mapi_prop_tag(PT_LONG,        0x3617));
-define('PR_EXTENDED_FOLDER_FLAGS'                     ,mapi_prop_tag(PT_BINARY,      0x36DA));
-
-define('PR_RIGHTS'                                    ,mapi_prop_tag(PT_LONG,        0x6639));
+define('PR_CONTAINER_FLAGS', mapi_prop_tag(PT_LONG, 0x3600));
+define('PR_FOLDER_TYPE', mapi_prop_tag(PT_LONG, 0x3601));
+define('PR_CONTENT_COUNT', mapi_prop_tag(PT_LONG, 0x3602));
+define('PR_CONTENT_UNREAD', mapi_prop_tag(PT_LONG, 0x3603));
+define('PR_CREATE_TEMPLATES', mapi_prop_tag(PT_OBJECT, 0x3604));
+define('PR_DETAILS_TABLE', mapi_prop_tag(PT_OBJECT, 0x3605));
+define('PR_SEARCH', mapi_prop_tag(PT_OBJECT, 0x3607));
+define('PR_SELECTABLE', mapi_prop_tag(PT_BOOLEAN, 0x3609));
+define('PR_SUBFOLDERS', mapi_prop_tag(PT_BOOLEAN, 0x360A));
+define('PR_STATUS', mapi_prop_tag(PT_LONG, 0x360B));
+define('PR_ANR', mapi_prop_tag(PT_TSTRING, 0x360C));
+define('PR_CONTENTS_SORT_ORDER', mapi_prop_tag(PT_MV_LONG, 0x360D));
+define('PR_CONTAINER_HIERARCHY', mapi_prop_tag(PT_OBJECT, 0x360E));
+define('PR_CONTAINER_CONTENTS', mapi_prop_tag(PT_OBJECT, 0x360F));
+define('PR_FOLDER_ASSOCIATED_CONTENTS', mapi_prop_tag(PT_OBJECT, 0x3610));
+define('PR_DEF_CREATE_DL', mapi_prop_tag(PT_BINARY, 0x3611));
+define('PR_DEF_CREATE_MAILUSER', mapi_prop_tag(PT_BINARY, 0x3612));
+define('PR_CONTAINER_CLASS', mapi_prop_tag(PT_TSTRING, 0x3613));
+define('PR_CONTAINER_MODIFY_VERSION', mapi_prop_tag(PT_I8, 0x3614));
+define('PR_AB_PROVIDER_ID', mapi_prop_tag(PT_BINARY, 0x3615));
+define('PR_DEFAULT_VIEW_ENTRYID', mapi_prop_tag(PT_BINARY, 0x3616));
+define('PR_ASSOC_CONTENT_COUNT', mapi_prop_tag(PT_LONG, 0x3617));
+define('PR_EXTENDED_FOLDER_FLAGS', mapi_prop_tag(PT_BINARY, 0x36DA));
+
+define('PR_RIGHTS', mapi_prop_tag(PT_LONG, 0x6639));
 
 /* Reserved 0x36C0-0x36FF */
 
@@ -441,273 +441,273 @@ 
  *  Attachment properties
  */
 
-define('PR_ATTACHMENT_X400_PARAMETERS'                ,mapi_prop_tag(PT_BINARY,      0x3700));
-define('PR_ATTACH_DATA_OBJ'                           ,mapi_prop_tag(PT_OBJECT,      0x3701));
-define('PR_ATTACH_DATA_BIN'                           ,mapi_prop_tag(PT_BINARY,      0x3701));
-define('PR_ATTACH_CONTENT_ID'                         ,mapi_prop_tag(PT_STRING8,     0x3712));
-define('PR_ATTACH_CONTENT_ID_W'                       ,mapi_prop_tag(PT_UNICODE,     0x3712));
-define('PR_ATTACH_CONTENT_LOCATION'                   ,mapi_prop_tag(PT_STRING8,     0x3713));
-define('PR_ATTACH_ENCODING'                           ,mapi_prop_tag(PT_BINARY,      0x3702));
-define('PR_ATTACH_EXTENSION'                          ,mapi_prop_tag(PT_TSTRING,     0x3703));
-define('PR_ATTACH_FILENAME'                           ,mapi_prop_tag(PT_TSTRING,     0x3704));
-define('PR_ATTACH_METHOD'                             ,mapi_prop_tag(PT_LONG,        0x3705));
-define('PR_ATTACH_LONG_FILENAME'                      ,mapi_prop_tag(PT_TSTRING,     0x3707));
-define('PR_ATTACH_PATHNAME'                           ,mapi_prop_tag(PT_TSTRING,     0x3708));
-define('PR_ATTACH_RENDERING'                          ,mapi_prop_tag(PT_BINARY,      0x3709));
-define('PR_ATTACH_TAG'                                ,mapi_prop_tag(PT_BINARY,      0x370A));
-define('PR_RENDERING_POSITION'                        ,mapi_prop_tag(PT_LONG,        0x370B));
-define('PR_ATTACH_TRANSPORT_NAME'                     ,mapi_prop_tag(PT_TSTRING,     0x370C));
-define('PR_ATTACH_LONG_PATHNAME'                      ,mapi_prop_tag(PT_TSTRING,     0x370D));
-define('PR_ATTACH_MIME_TAG'                           ,mapi_prop_tag(PT_TSTRING,     0x370E));
-define('PR_ATTACH_MIME_TAG_W'                         ,mapi_prop_tag(PT_UNICODE,     0x370E));
-define('PR_ATTACH_ADDITIONAL_INFO'                    ,mapi_prop_tag(PT_BINARY,      0x370F));
-define('PR_ATTACHMENT_FLAGS'                          ,mapi_prop_tag(PT_LONG,        0x7FFD));
-define('PR_ATTACHMENT_HIDDEN'                         ,mapi_prop_tag(PT_BOOLEAN,     0x7FFE));
-define('PR_ATTACHMENT_LINKID'                         ,mapi_prop_tag(PT_LONG,        0x7FFA));
-define('PR_ATTACH_FLAGS'                              ,mapi_prop_tag(PT_LONG,        0x3714));
-define('PR_EXCEPTION_STARTTIME'                       ,mapi_prop_tag(PT_SYSTIME,     0x7FFB));
-define('PR_EXCEPTION_ENDTIME'                         ,mapi_prop_tag(PT_SYSTIME,     0x7FFC));
+define('PR_ATTACHMENT_X400_PARAMETERS', mapi_prop_tag(PT_BINARY, 0x3700));
+define('PR_ATTACH_DATA_OBJ', mapi_prop_tag(PT_OBJECT, 0x3701));
+define('PR_ATTACH_DATA_BIN', mapi_prop_tag(PT_BINARY, 0x3701));
+define('PR_ATTACH_CONTENT_ID', mapi_prop_tag(PT_STRING8, 0x3712));
+define('PR_ATTACH_CONTENT_ID_W', mapi_prop_tag(PT_UNICODE, 0x3712));
+define('PR_ATTACH_CONTENT_LOCATION', mapi_prop_tag(PT_STRING8, 0x3713));
+define('PR_ATTACH_ENCODING', mapi_prop_tag(PT_BINARY, 0x3702));
+define('PR_ATTACH_EXTENSION', mapi_prop_tag(PT_TSTRING, 0x3703));
+define('PR_ATTACH_FILENAME', mapi_prop_tag(PT_TSTRING, 0x3704));
+define('PR_ATTACH_METHOD', mapi_prop_tag(PT_LONG, 0x3705));
+define('PR_ATTACH_LONG_FILENAME', mapi_prop_tag(PT_TSTRING, 0x3707));
+define('PR_ATTACH_PATHNAME', mapi_prop_tag(PT_TSTRING, 0x3708));
+define('PR_ATTACH_RENDERING', mapi_prop_tag(PT_BINARY, 0x3709));
+define('PR_ATTACH_TAG', mapi_prop_tag(PT_BINARY, 0x370A));
+define('PR_RENDERING_POSITION', mapi_prop_tag(PT_LONG, 0x370B));
+define('PR_ATTACH_TRANSPORT_NAME', mapi_prop_tag(PT_TSTRING, 0x370C));
+define('PR_ATTACH_LONG_PATHNAME', mapi_prop_tag(PT_TSTRING, 0x370D));
+define('PR_ATTACH_MIME_TAG', mapi_prop_tag(PT_TSTRING, 0x370E));
+define('PR_ATTACH_MIME_TAG_W', mapi_prop_tag(PT_UNICODE, 0x370E));
+define('PR_ATTACH_ADDITIONAL_INFO', mapi_prop_tag(PT_BINARY, 0x370F));
+define('PR_ATTACHMENT_FLAGS', mapi_prop_tag(PT_LONG, 0x7FFD));
+define('PR_ATTACHMENT_HIDDEN', mapi_prop_tag(PT_BOOLEAN, 0x7FFE));
+define('PR_ATTACHMENT_LINKID', mapi_prop_tag(PT_LONG, 0x7FFA));
+define('PR_ATTACH_FLAGS', mapi_prop_tag(PT_LONG, 0x3714));
+define('PR_EXCEPTION_STARTTIME', mapi_prop_tag(PT_SYSTIME, 0x7FFB));
+define('PR_EXCEPTION_ENDTIME', mapi_prop_tag(PT_SYSTIME, 0x7FFC));
 
 /*
  *  AB Object properties
  */
 
-define('PR_DISPLAY_TYPE'                              ,mapi_prop_tag(PT_LONG,        0x3900));
-define('PR_DISPLAY_TYPE_EX'                           ,mapi_prop_tag(PT_LONG,        0x3905));
-define('PR_TEMPLATEID'                                ,mapi_prop_tag(PT_BINARY,      0x3902));
-define('PR_PRIMARY_CAPABILITY'                        ,mapi_prop_tag(PT_BINARY,      0x3904));
+define('PR_DISPLAY_TYPE', mapi_prop_tag(PT_LONG, 0x3900));
+define('PR_DISPLAY_TYPE_EX', mapi_prop_tag(PT_LONG, 0x3905));
+define('PR_TEMPLATEID', mapi_prop_tag(PT_BINARY, 0x3902));
+define('PR_PRIMARY_CAPABILITY', mapi_prop_tag(PT_BINARY, 0x3904));
 
 
 /*
  *  Mail user properties
  */
-define('PR_7BIT_DISPLAY_NAME'                         ,mapi_prop_tag(PT_STRING8,     0x39FF));
-define('PR_ACCOUNT'                                   ,mapi_prop_tag(PT_TSTRING,     0x3A00));
-define('PR_ALTERNATE_RECIPIENT'                       ,mapi_prop_tag(PT_BINARY,      0x3A01));
-define('PR_CALLBACK_TELEPHONE_NUMBER'                 ,mapi_prop_tag(PT_TSTRING,     0x3A02));
-define('PR_CONVERSION_PROHIBITED'                     ,mapi_prop_tag(PT_BOOLEAN,     0x3A03));
-define('PR_DISCLOSE_RECIPIENTS'                       ,mapi_prop_tag(PT_BOOLEAN,     0x3A04));
-define('PR_GENERATION'                                ,mapi_prop_tag(PT_TSTRING,     0x3A05));
-define('PR_GIVEN_NAME'                                ,mapi_prop_tag(PT_TSTRING,     0x3A06));
-define('PR_GOVERNMENT_ID_NUMBER'                      ,mapi_prop_tag(PT_TSTRING,     0x3A07));
-define('PR_BUSINESS_TELEPHONE_NUMBER'                 ,mapi_prop_tag(PT_TSTRING,     0x3A08));
-define('PR_OFFICE_TELEPHONE_NUMBER'                   ,PR_BUSINESS_TELEPHONE_NUMBER);
-define('PR_HOME_TELEPHONE_NUMBER'                     ,mapi_prop_tag(PT_TSTRING,     0x3A09));
-define('PR_INITIALS'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A0A));
-define('PR_KEYWORD'                                   ,mapi_prop_tag(PT_TSTRING,     0x3A0B));
-define('PR_LANGUAGE'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A0C));
-define('PR_LOCATION'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A0D));
-define('PR_MAIL_PERMISSION'                           ,mapi_prop_tag(PT_BOOLEAN,     0x3A0E));
-define('PR_MHS_COMMON_NAME'                           ,mapi_prop_tag(PT_TSTRING,     0x3A0F));
-define('PR_ORGANIZATIONAL_ID_NUMBER'                  ,mapi_prop_tag(PT_TSTRING,     0x3A10));
-define('PR_SURNAME'                                   ,mapi_prop_tag(PT_TSTRING,     0x3A11));
-define('PR_ORIGINAL_ENTRYID'                          ,mapi_prop_tag(PT_BINARY,      0x3A12));
-define('PR_ORIGINAL_DISPLAY_NAME'                     ,mapi_prop_tag(PT_TSTRING,     0x3A13));
-define('PR_ORIGINAL_SEARCH_KEY'                       ,mapi_prop_tag(PT_BINARY,      0x3A14));
-define('PR_POSTAL_ADDRESS'                            ,mapi_prop_tag(PT_TSTRING,     0x3A15));
-define('PR_COMPANY_NAME'                              ,mapi_prop_tag(PT_TSTRING,     0x3A16));
-define('PR_TITLE'                                     ,mapi_prop_tag(PT_TSTRING,     0x3A17));
-define('PR_DEPARTMENT_NAME'                           ,mapi_prop_tag(PT_TSTRING,     0x3A18));
-define('PR_OFFICE_LOCATION'                           ,mapi_prop_tag(PT_TSTRING,     0x3A19));
-define('PR_PRIMARY_TELEPHONE_NUMBER'                  ,mapi_prop_tag(PT_TSTRING,     0x3A1A));
-define('PR_BUSINESS2_TELEPHONE_NUMBER'                ,mapi_prop_tag(PT_TSTRING,     0x3A1B));
-define('PR_OFFICE2_TELEPHONE_NUMBER'                  ,PR_BUSINESS2_TELEPHONE_NUMBER);
-define('PR_MOBILE_TELEPHONE_NUMBER'                   ,mapi_prop_tag(PT_TSTRING,     0x3A1C));
-define('PR_CELLULAR_TELEPHONE_NUMBER'                 ,PR_MOBILE_TELEPHONE_NUMBER);
-define('PR_RADIO_TELEPHONE_NUMBER'                    ,mapi_prop_tag(PT_TSTRING,     0x3A1D));
-define('PR_CAR_TELEPHONE_NUMBER'                      ,mapi_prop_tag(PT_TSTRING,     0x3A1E));
-define('PR_OTHER_TELEPHONE_NUMBER'                    ,mapi_prop_tag(PT_TSTRING,     0x3A1F));
-define('PR_TRANSMITABLE_DISPLAY_NAME'                 ,mapi_prop_tag(PT_TSTRING,     0x3A20));
-define('PR_PAGER_TELEPHONE_NUMBER'                    ,mapi_prop_tag(PT_TSTRING,     0x3A21));
-define('PR_BEEPER_TELEPHONE_NUMBER'                   ,PR_PAGER_TELEPHONE_NUMBER);
-define('PR_USER_CERTIFICATE'                          ,mapi_prop_tag(PT_BINARY,      0x3A22));
-define('PR_PRIMARY_FAX_NUMBER'                        ,mapi_prop_tag(PT_TSTRING,     0x3A23));
-define('PR_BUSINESS_FAX_NUMBER'                       ,mapi_prop_tag(PT_TSTRING,     0x3A24));
-define('PR_HOME_FAX_NUMBER'                           ,mapi_prop_tag(PT_TSTRING,     0x3A25));
-define('PR_COUNTRY'                                   ,mapi_prop_tag(PT_TSTRING,     0x3A26));
-define('PR_BUSINESS_ADDRESS_COUNTRY'                  ,PR_COUNTRY);
+define('PR_7BIT_DISPLAY_NAME', mapi_prop_tag(PT_STRING8, 0x39FF));
+define('PR_ACCOUNT', mapi_prop_tag(PT_TSTRING, 0x3A00));
+define('PR_ALTERNATE_RECIPIENT', mapi_prop_tag(PT_BINARY, 0x3A01));
+define('PR_CALLBACK_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A02));
+define('PR_CONVERSION_PROHIBITED', mapi_prop_tag(PT_BOOLEAN, 0x3A03));
+define('PR_DISCLOSE_RECIPIENTS', mapi_prop_tag(PT_BOOLEAN, 0x3A04));
+define('PR_GENERATION', mapi_prop_tag(PT_TSTRING, 0x3A05));
+define('PR_GIVEN_NAME', mapi_prop_tag(PT_TSTRING, 0x3A06));
+define('PR_GOVERNMENT_ID_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A07));
+define('PR_BUSINESS_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A08));
+define('PR_OFFICE_TELEPHONE_NUMBER', PR_BUSINESS_TELEPHONE_NUMBER);
+define('PR_HOME_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A09));
+define('PR_INITIALS', mapi_prop_tag(PT_TSTRING, 0x3A0A));
+define('PR_KEYWORD', mapi_prop_tag(PT_TSTRING, 0x3A0B));
+define('PR_LANGUAGE', mapi_prop_tag(PT_TSTRING, 0x3A0C));
+define('PR_LOCATION', mapi_prop_tag(PT_TSTRING, 0x3A0D));
+define('PR_MAIL_PERMISSION', mapi_prop_tag(PT_BOOLEAN, 0x3A0E));
+define('PR_MHS_COMMON_NAME', mapi_prop_tag(PT_TSTRING, 0x3A0F));
+define('PR_ORGANIZATIONAL_ID_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A10));
+define('PR_SURNAME', mapi_prop_tag(PT_TSTRING, 0x3A11));
+define('PR_ORIGINAL_ENTRYID', mapi_prop_tag(PT_BINARY, 0x3A12));
+define('PR_ORIGINAL_DISPLAY_NAME', mapi_prop_tag(PT_TSTRING, 0x3A13));
+define('PR_ORIGINAL_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3A14));
+define('PR_POSTAL_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x3A15));
+define('PR_COMPANY_NAME', mapi_prop_tag(PT_TSTRING, 0x3A16));
+define('PR_TITLE', mapi_prop_tag(PT_TSTRING, 0x3A17));
+define('PR_DEPARTMENT_NAME', mapi_prop_tag(PT_TSTRING, 0x3A18));
+define('PR_OFFICE_LOCATION', mapi_prop_tag(PT_TSTRING, 0x3A19));
+define('PR_PRIMARY_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1A));
+define('PR_BUSINESS2_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1B));
+define('PR_OFFICE2_TELEPHONE_NUMBER', PR_BUSINESS2_TELEPHONE_NUMBER);
+define('PR_MOBILE_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1C));
+define('PR_CELLULAR_TELEPHONE_NUMBER', PR_MOBILE_TELEPHONE_NUMBER);
+define('PR_RADIO_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1D));
+define('PR_CAR_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1E));
+define('PR_OTHER_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A1F));
+define('PR_TRANSMITABLE_DISPLAY_NAME', mapi_prop_tag(PT_TSTRING, 0x3A20));
+define('PR_PAGER_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A21));
+define('PR_BEEPER_TELEPHONE_NUMBER', PR_PAGER_TELEPHONE_NUMBER);
+define('PR_USER_CERTIFICATE', mapi_prop_tag(PT_BINARY, 0x3A22));
+define('PR_PRIMARY_FAX_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A23));
+define('PR_BUSINESS_FAX_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A24));
+define('PR_HOME_FAX_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A25));
+define('PR_COUNTRY', mapi_prop_tag(PT_TSTRING, 0x3A26));
+define('PR_BUSINESS_ADDRESS_COUNTRY', PR_COUNTRY);
 
-define('PR_FLAG_STATUS'                               ,mapi_prop_tag(PT_LONG,        0x1090));
-define('PR_FLAG_COMPLETE_TIME'                        ,mapi_prop_tag(PT_SYSTIME,     0x1091));
-define('PR_FLAG_ICON'                                 ,mapi_prop_tag(PT_LONG,        0x1095));
-define('PR_BLOCK_STATUS'                              ,mapi_prop_tag(PT_LONG,        0x1096));
+define('PR_FLAG_STATUS', mapi_prop_tag(PT_LONG, 0x1090));
+define('PR_FLAG_COMPLETE_TIME', mapi_prop_tag(PT_SYSTIME, 0x1091));
+define('PR_FLAG_ICON', mapi_prop_tag(PT_LONG, 0x1095));
+define('PR_BLOCK_STATUS', mapi_prop_tag(PT_LONG, 0x1096));
 
-define('PR_LOCALITY'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A27));
-define('PR_BUSINESS_ADDRESS_CITY'                     ,PR_LOCALITY);
+define('PR_LOCALITY', mapi_prop_tag(PT_TSTRING, 0x3A27));
+define('PR_BUSINESS_ADDRESS_CITY', PR_LOCALITY);
 
-define('PR_STATE_OR_PROVINCE'                         ,mapi_prop_tag(PT_TSTRING,     0x3A28));
-define('PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE'        ,PR_STATE_OR_PROVINCE);
+define('PR_STATE_OR_PROVINCE', mapi_prop_tag(PT_TSTRING, 0x3A28));
+define('PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE', PR_STATE_OR_PROVINCE);
 
-define('PR_STREET_ADDRESS'                            ,mapi_prop_tag(PT_TSTRING,     0x3A29));
-define('PR_BUSINESS_ADDRESS_STREET'                   ,PR_STREET_ADDRESS);
+define('PR_STREET_ADDRESS', mapi_prop_tag(PT_TSTRING, 0x3A29));
+define('PR_BUSINESS_ADDRESS_STREET', PR_STREET_ADDRESS);
 
-define('PR_POSTAL_CODE'                               ,mapi_prop_tag(PT_TSTRING,     0x3A2A));
-define('PR_BUSINESS_ADDRESS_POSTAL_CODE'              ,PR_POSTAL_CODE);
+define('PR_POSTAL_CODE', mapi_prop_tag(PT_TSTRING, 0x3A2A));
+define('PR_BUSINESS_ADDRESS_POSTAL_CODE', PR_POSTAL_CODE);
 
 
-define('PR_POST_OFFICE_BOX'                           ,mapi_prop_tag(PT_TSTRING,     0x3A2B));
-define('PR_BUSINESS_ADDRESS_POST_OFFICE_BOX'          ,PR_POST_OFFICE_BOX);
+define('PR_POST_OFFICE_BOX', mapi_prop_tag(PT_TSTRING, 0x3A2B));
+define('PR_BUSINESS_ADDRESS_POST_OFFICE_BOX', PR_POST_OFFICE_BOX);
 
 
-define('PR_TELEX_NUMBER'                              ,mapi_prop_tag(PT_TSTRING,     0x3A2C));
-define('PR_ISDN_NUMBER'                               ,mapi_prop_tag(PT_TSTRING,     0x3A2D));
-define('PR_ASSISTANT_TELEPHONE_NUMBER'                ,mapi_prop_tag(PT_TSTRING,     0x3A2E));
-define('PR_HOME2_TELEPHONE_NUMBER'                    ,mapi_prop_tag(PT_TSTRING,     0x3A2F));
-define('PR_ASSISTANT'                                 ,mapi_prop_tag(PT_TSTRING,     0x3A30));
-define('PR_SEND_RICH_INFO'                            ,mapi_prop_tag(PT_BOOLEAN,     0x3A40));
-define('PR_WEDDING_ANNIVERSARY'                       ,mapi_prop_tag(PT_SYSTIME,     0x3A41));
-define('PR_BIRTHDAY'                                  ,mapi_prop_tag(PT_SYSTIME,     0x3A42));
+define('PR_TELEX_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A2C));
+define('PR_ISDN_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A2D));
+define('PR_ASSISTANT_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A2E));
+define('PR_HOME2_TELEPHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A2F));
+define('PR_ASSISTANT', mapi_prop_tag(PT_TSTRING, 0x3A30));
+define('PR_SEND_RICH_INFO', mapi_prop_tag(PT_BOOLEAN, 0x3A40));
+define('PR_WEDDING_ANNIVERSARY', mapi_prop_tag(PT_SYSTIME, 0x3A41));
+define('PR_BIRTHDAY', mapi_prop_tag(PT_SYSTIME, 0x3A42));
 
 
-define('PR_HOBBIES'                                   ,mapi_prop_tag(PT_TSTRING,     0x3A43));
+define('PR_HOBBIES', mapi_prop_tag(PT_TSTRING, 0x3A43));
 
-define('PR_MIDDLE_NAME'                               ,mapi_prop_tag(PT_TSTRING,     0x3A44));
+define('PR_MIDDLE_NAME', mapi_prop_tag(PT_TSTRING, 0x3A44));
 
-define('PR_DISPLAY_NAME_PREFIX'                       ,mapi_prop_tag(PT_TSTRING,     0x3A45));
+define('PR_DISPLAY_NAME_PREFIX', mapi_prop_tag(PT_TSTRING, 0x3A45));
 
-define('PR_PROFESSION'                                ,mapi_prop_tag(PT_TSTRING,     0x3A46));
+define('PR_PROFESSION', mapi_prop_tag(PT_TSTRING, 0x3A46));
 
-define('PR_PREFERRED_BY_NAME'                         ,mapi_prop_tag(PT_TSTRING,     0x3A47));
+define('PR_PREFERRED_BY_NAME', mapi_prop_tag(PT_TSTRING, 0x3A47));
 
-define('PR_SPOUSE_NAME'                               ,mapi_prop_tag(PT_TSTRING,     0x3A48));
+define('PR_SPOUSE_NAME', mapi_prop_tag(PT_TSTRING, 0x3A48));
 
-define('PR_COMPUTER_NETWORK_NAME'                     ,mapi_prop_tag(PT_TSTRING,     0x3A49));
+define('PR_COMPUTER_NETWORK_NAME', mapi_prop_tag(PT_TSTRING, 0x3A49));
 
-define('PR_CUSTOMER_ID'                               ,mapi_prop_tag(PT_TSTRING,     0x3A4A));
+define('PR_CUSTOMER_ID', mapi_prop_tag(PT_TSTRING, 0x3A4A));
 
-define('PR_TTYTDD_PHONE_NUMBER'                       ,mapi_prop_tag(PT_TSTRING,     0x3A4B));
+define('PR_TTYTDD_PHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A4B));
 
-define('PR_FTP_SITE'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A4C));
+define('PR_FTP_SITE', mapi_prop_tag(PT_TSTRING, 0x3A4C));
 
-define('PR_GENDER'                                    ,mapi_prop_tag(PT_SHORT,       0x3A4D));
+define('PR_GENDER', mapi_prop_tag(PT_SHORT, 0x3A4D));
 
-define('PR_MANAGER_NAME'                              ,mapi_prop_tag(PT_TSTRING,     0x3A4E));
+define('PR_MANAGER_NAME', mapi_prop_tag(PT_TSTRING, 0x3A4E));
 
-define('PR_NICKNAME'                                  ,mapi_prop_tag(PT_TSTRING,     0x3A4F));
+define('PR_NICKNAME', mapi_prop_tag(PT_TSTRING, 0x3A4F));
 
-define('PR_PERSONAL_HOME_PAGE'                        ,mapi_prop_tag(PT_TSTRING,     0x3A50));
+define('PR_PERSONAL_HOME_PAGE', mapi_prop_tag(PT_TSTRING, 0x3A50));
 
 
-define('PR_BUSINESS_HOME_PAGE'                        ,mapi_prop_tag(PT_TSTRING,     0x3A51));
+define('PR_BUSINESS_HOME_PAGE', mapi_prop_tag(PT_TSTRING, 0x3A51));
 
-define('PR_CONTACT_VERSION'                           ,mapi_prop_tag(PT_CLSID,       0x3A52));
-define('PR_CONTACT_ENTRYIDS'                          ,mapi_prop_tag(PT_MV_BINARY,   0x3A53));
+define('PR_CONTACT_VERSION', mapi_prop_tag(PT_CLSID, 0x3A52));
+define('PR_CONTACT_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x3A53));
 
-define('PR_CONTACT_ADDRTYPES'                         ,mapi_prop_tag(PT_MV_TSTRING,  0x3A54));
+define('PR_CONTACT_ADDRTYPES', mapi_prop_tag(PT_MV_TSTRING, 0x3A54));
 
-define('PR_CONTACT_DEFAULT_ADDRESS_INDEX'             ,mapi_prop_tag(PT_LONG,        0x3A55));
+define('PR_CONTACT_DEFAULT_ADDRESS_INDEX', mapi_prop_tag(PT_LONG, 0x3A55));
 
-define('PR_CONTACT_EMAIL_ADDRESSES'                   ,mapi_prop_tag(PT_MV_TSTRING,  0x3A56));
-define('PR_ATTACHMENT_CONTACTPHOTO'                   ,mapi_prop_tag(PT_BOOLEAN,     0x7FFF));
+define('PR_CONTACT_EMAIL_ADDRESSES', mapi_prop_tag(PT_MV_TSTRING, 0x3A56));
+define('PR_ATTACHMENT_CONTACTPHOTO', mapi_prop_tag(PT_BOOLEAN, 0x7FFF));
 
 
-define('PR_COMPANY_MAIN_PHONE_NUMBER'                 ,mapi_prop_tag(PT_TSTRING,     0x3A57));
+define('PR_COMPANY_MAIN_PHONE_NUMBER', mapi_prop_tag(PT_TSTRING, 0x3A57));
 
-define('PR_CHILDRENS_NAMES'                           ,mapi_prop_tag(PT_MV_TSTRING,  0x3A58));
+define('PR_CHILDRENS_NAMES', mapi_prop_tag(PT_MV_TSTRING, 0x3A58));
 
 
 
-define('PR_HOME_ADDRESS_CITY'                         ,mapi_prop_tag(PT_TSTRING,     0x3A59));
+define('PR_HOME_ADDRESS_CITY', mapi_prop_tag(PT_TSTRING, 0x3A59));
 
-define('PR_HOME_ADDRESS_COUNTRY'                      ,mapi_prop_tag(PT_TSTRING,     0x3A5A));
+define('PR_HOME_ADDRESS_COUNTRY', mapi_prop_tag(PT_TSTRING, 0x3A5A));
 
-define('PR_HOME_ADDRESS_POSTAL_CODE'                  ,mapi_prop_tag(PT_TSTRING,     0x3A5B));
+define('PR_HOME_ADDRESS_POSTAL_CODE', mapi_prop_tag(PT_TSTRING, 0x3A5B));
 
-define('PR_HOME_ADDRESS_STATE_OR_PROVINCE'            ,mapi_prop_tag(PT_TSTRING,     0x3A5C));
+define('PR_HOME_ADDRESS_STATE_OR_PROVINCE', mapi_prop_tag(PT_TSTRING, 0x3A5C));
 
-define('PR_HOME_ADDRESS_STREET'                       ,mapi_prop_tag(PT_TSTRING,     0x3A5D));
+define('PR_HOME_ADDRESS_STREET', mapi_prop_tag(PT_TSTRING, 0x3A5D));
 
-define('PR_HOME_ADDRESS_POST_OFFICE_BOX'              ,mapi_prop_tag(PT_TSTRING,     0x3A5E));
+define('PR_HOME_ADDRESS_POST_OFFICE_BOX', mapi_prop_tag(PT_TSTRING, 0x3A5E));
 
-define('PR_OTHER_ADDRESS_CITY'                        ,mapi_prop_tag(PT_TSTRING,     0x3A5F));
+define('PR_OTHER_ADDRESS_CITY', mapi_prop_tag(PT_TSTRING, 0x3A5F));
 
-define('PR_OTHER_ADDRESS_COUNTRY'                     ,mapi_prop_tag(PT_TSTRING,     0x3A60));
+define('PR_OTHER_ADDRESS_COUNTRY', mapi_prop_tag(PT_TSTRING, 0x3A60));
 
-define('PR_OTHER_ADDRESS_POSTAL_CODE'                 ,mapi_prop_tag(PT_TSTRING,     0x3A61));
+define('PR_OTHER_ADDRESS_POSTAL_CODE', mapi_prop_tag(PT_TSTRING, 0x3A61));
 
-define('PR_OTHER_ADDRESS_STATE_OR_PROVINCE'           ,mapi_prop_tag(PT_TSTRING,     0x3A62));
+define('PR_OTHER_ADDRESS_STATE_OR_PROVINCE', mapi_prop_tag(PT_TSTRING, 0x3A62));
 
-define('PR_OTHER_ADDRESS_STREET'                      ,mapi_prop_tag(PT_TSTRING,     0x3A63));
+define('PR_OTHER_ADDRESS_STREET', mapi_prop_tag(PT_TSTRING, 0x3A63));
 
-define('PR_OTHER_ADDRESS_POST_OFFICE_BOX'             ,mapi_prop_tag(PT_TSTRING,     0x3A64));
+define('PR_OTHER_ADDRESS_POST_OFFICE_BOX', mapi_prop_tag(PT_TSTRING, 0x3A64));
 
-define('PR_USER_X509_CERTIFICATE'                     ,mapi_prop_tag(PT_MV_BINARY,   0x3A70));
+define('PR_USER_X509_CERTIFICATE', mapi_prop_tag(PT_MV_BINARY, 0x3A70));
 
 /*
  *  Profile section properties
  */
 
-define('PR_STORE_PROVIDERS'                           ,mapi_prop_tag(PT_BINARY,      0x3D00));
-define('PR_AB_PROVIDERS'                              ,mapi_prop_tag(PT_BINARY,      0x3D01));
-define('PR_TRANSPORT_PROVIDERS'                       ,mapi_prop_tag(PT_BINARY,      0x3D02));
-
-define('PR_DEFAULT_PROFILE'                           ,mapi_prop_tag(PT_BOOLEAN,     0x3D04));
-define('PR_AB_SEARCH_PATH'                            ,mapi_prop_tag(PT_MV_BINARY,   0x3D05));
-define('PR_AB_DEFAULT_DIR'                            ,mapi_prop_tag(PT_BINARY,      0x3D06));
-define('PR_AB_DEFAULT_PAB'                            ,mapi_prop_tag(PT_BINARY,      0x3D07));
-
-define('PR_FILTERING_HOOKS'                           ,mapi_prop_tag(PT_BINARY,      0x3D08));
-define('PR_SERVICE_NAME'                              ,mapi_prop_tag(PT_TSTRING,     0x3D09));
-define('PR_SERVICE_DLL_NAME'                          ,mapi_prop_tag(PT_TSTRING,     0x3D0A));
-define('PR_SERVICE_ENTRY_NAME'                        ,mapi_prop_tag(PT_STRING8,     0x3D0B));
-define('PR_SERVICE_UID'                               ,mapi_prop_tag(PT_BINARY,      0x3D0C));
-define('PR_SERVICE_EXTRA_UIDS'                        ,mapi_prop_tag(PT_BINARY,      0x3D0D));
-define('PR_SERVICES'                                  ,mapi_prop_tag(PT_BINARY,      0x3D0E));
-define('PR_SERVICE_SUPPORT_FILES'                     ,mapi_prop_tag(PT_MV_TSTRING,  0x3D0F));
-define('PR_SERVICE_DELETE_FILES'                      ,mapi_prop_tag(PT_MV_TSTRING,  0x3D10));
-define('PR_AB_SEARCH_PATH_UPDATE'                     ,mapi_prop_tag(PT_BINARY,      0x3D11));
-define('PR_PROFILE_NAME'                              ,mapi_prop_tag(PT_TSTRING,     0x3D12));
+define('PR_STORE_PROVIDERS', mapi_prop_tag(PT_BINARY, 0x3D00));
+define('PR_AB_PROVIDERS', mapi_prop_tag(PT_BINARY, 0x3D01));
+define('PR_TRANSPORT_PROVIDERS', mapi_prop_tag(PT_BINARY, 0x3D02));
+
+define('PR_DEFAULT_PROFILE', mapi_prop_tag(PT_BOOLEAN, 0x3D04));
+define('PR_AB_SEARCH_PATH', mapi_prop_tag(PT_MV_BINARY, 0x3D05));
+define('PR_AB_DEFAULT_DIR', mapi_prop_tag(PT_BINARY, 0x3D06));
+define('PR_AB_DEFAULT_PAB', mapi_prop_tag(PT_BINARY, 0x3D07));
+
+define('PR_FILTERING_HOOKS', mapi_prop_tag(PT_BINARY, 0x3D08));
+define('PR_SERVICE_NAME', mapi_prop_tag(PT_TSTRING, 0x3D09));
+define('PR_SERVICE_DLL_NAME', mapi_prop_tag(PT_TSTRING, 0x3D0A));
+define('PR_SERVICE_ENTRY_NAME', mapi_prop_tag(PT_STRING8, 0x3D0B));
+define('PR_SERVICE_UID', mapi_prop_tag(PT_BINARY, 0x3D0C));
+define('PR_SERVICE_EXTRA_UIDS', mapi_prop_tag(PT_BINARY, 0x3D0D));
+define('PR_SERVICES', mapi_prop_tag(PT_BINARY, 0x3D0E));
+define('PR_SERVICE_SUPPORT_FILES', mapi_prop_tag(PT_MV_TSTRING, 0x3D0F));
+define('PR_SERVICE_DELETE_FILES', mapi_prop_tag(PT_MV_TSTRING, 0x3D10));
+define('PR_AB_SEARCH_PATH_UPDATE', mapi_prop_tag(PT_BINARY, 0x3D11));
+define('PR_PROFILE_NAME', mapi_prop_tag(PT_TSTRING, 0x3D12));
 
 /*
  *  Status object properties
  */
 
-define('PR_IDENTITY_DISPLAY'                          ,mapi_prop_tag(PT_TSTRING,     0x3E00));
-define('PR_IDENTITY_ENTRYID'                          ,mapi_prop_tag(PT_BINARY,      0x3E01));
-define('PR_RESOURCE_METHODS'                          ,mapi_prop_tag(PT_LONG,        0x3E02));
-define('PR_RESOURCE_TYPE'                             ,mapi_prop_tag(PT_LONG,        0x3E03));
-define('PR_STATUS_CODE'                               ,mapi_prop_tag(PT_LONG,        0x3E04));
-define('PR_IDENTITY_SEARCH_KEY'                       ,mapi_prop_tag(PT_BINARY,      0x3E05));
-define('PR_OWN_STORE_ENTRYID'                         ,mapi_prop_tag(PT_BINARY,      0x3E06));
-define('PR_RESOURCE_PATH'                             ,mapi_prop_tag(PT_TSTRING,     0x3E07));
-define('PR_STATUS_STRING'                             ,mapi_prop_tag(PT_TSTRING,     0x3E08));
-define('PR_X400_DEFERRED_DELIVERY_CANCEL'             ,mapi_prop_tag(PT_BOOLEAN,     0x3E09));
-define('PR_HEADER_FOLDER_ENTRYID'                     ,mapi_prop_tag(PT_BINARY,      0x3E0A));
-define('PR_REMOTE_PROGRESS'                           ,mapi_prop_tag(PT_LONG,        0x3E0B));
-define('PR_REMOTE_PROGRESS_TEXT'                      ,mapi_prop_tag(PT_TSTRING,     0x3E0C));
-define('PR_REMOTE_VALIDATE_OK'                        ,mapi_prop_tag(PT_BOOLEAN,     0x3E0D));
+define('PR_IDENTITY_DISPLAY', mapi_prop_tag(PT_TSTRING, 0x3E00));
+define('PR_IDENTITY_ENTRYID', mapi_prop_tag(PT_BINARY, 0x3E01));
+define('PR_RESOURCE_METHODS', mapi_prop_tag(PT_LONG, 0x3E02));
+define('PR_RESOURCE_TYPE', mapi_prop_tag(PT_LONG, 0x3E03));
+define('PR_STATUS_CODE', mapi_prop_tag(PT_LONG, 0x3E04));
+define('PR_IDENTITY_SEARCH_KEY', mapi_prop_tag(PT_BINARY, 0x3E05));
+define('PR_OWN_STORE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x3E06));
+define('PR_RESOURCE_PATH', mapi_prop_tag(PT_TSTRING, 0x3E07));
+define('PR_STATUS_STRING', mapi_prop_tag(PT_TSTRING, 0x3E08));
+define('PR_X400_DEFERRED_DELIVERY_CANCEL', mapi_prop_tag(PT_BOOLEAN, 0x3E09));
+define('PR_HEADER_FOLDER_ENTRYID', mapi_prop_tag(PT_BINARY, 0x3E0A));
+define('PR_REMOTE_PROGRESS', mapi_prop_tag(PT_LONG, 0x3E0B));
+define('PR_REMOTE_PROGRESS_TEXT', mapi_prop_tag(PT_TSTRING, 0x3E0C));
+define('PR_REMOTE_VALIDATE_OK', mapi_prop_tag(PT_BOOLEAN, 0x3E0D));
 
 /*
  * Display table properties
  */
 
-define('PR_CONTROL_FLAGS'                             ,mapi_prop_tag(PT_LONG,        0x3F00));
-define('PR_CONTROL_STRUCTURE'                         ,mapi_prop_tag(PT_BINARY,      0x3F01));
-define('PR_CONTROL_TYPE'                              ,mapi_prop_tag(PT_LONG,        0x3F02));
-define('PR_DELTAX'                                    ,mapi_prop_tag(PT_LONG,        0x3F03));
-define('PR_DELTAY'                                    ,mapi_prop_tag(PT_LONG,        0x3F04));
-define('PR_XPOS'                                      ,mapi_prop_tag(PT_LONG,        0x3F05));
-define('PR_YPOS'                                      ,mapi_prop_tag(PT_LONG,        0x3F06));
-define('PR_CONTROL_ID'                                ,mapi_prop_tag(PT_BINARY,      0x3F07));
-define('PR_INITIAL_DETAILS_PANE'                      ,mapi_prop_tag(PT_LONG,        0x3F08));
+define('PR_CONTROL_FLAGS', mapi_prop_tag(PT_LONG, 0x3F00));
+define('PR_CONTROL_STRUCTURE', mapi_prop_tag(PT_BINARY, 0x3F01));
+define('PR_CONTROL_TYPE', mapi_prop_tag(PT_LONG, 0x3F02));
+define('PR_DELTAX', mapi_prop_tag(PT_LONG, 0x3F03));
+define('PR_DELTAY', mapi_prop_tag(PT_LONG, 0x3F04));
+define('PR_XPOS', mapi_prop_tag(PT_LONG, 0x3F05));
+define('PR_YPOS', mapi_prop_tag(PT_LONG, 0x3F06));
+define('PR_CONTROL_ID', mapi_prop_tag(PT_BINARY, 0x3F07));
+define('PR_INITIAL_DETAILS_PANE', mapi_prop_tag(PT_LONG, 0x3F08));
 
 /*
  * Secure property id range
  */
 
-define('PROP_ID_SECURE_MIN'                           ,0x67F0);
-define('PROP_ID_SECURE_MAX'                           ,0x67FF);
+define('PROP_ID_SECURE_MIN', 0x67F0);
+define('PROP_ID_SECURE_MAX', 0x67FF);
 
 /*
  * Extra properties
  */
 
-define('PR_IPM_APPOINTMENT_ENTRYID'                   ,mapi_prop_tag(PT_BINARY,      0x36D0));
-define('PR_IPM_CONTACT_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x36D1));
-define('PR_IPM_JOURNAL_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x36D2));
-define('PR_IPM_NOTE_ENTRYID'                          ,mapi_prop_tag(PT_BINARY,      0x36D3));
-define('PR_IPM_TASK_ENTRYID'                          ,mapi_prop_tag(PT_BINARY,      0x36D4));
-define('PR_IPM_DRAFTS_ENTRYID'                        ,mapi_prop_tag(PT_BINARY,      0x36D7));
+define('PR_IPM_APPOINTMENT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D0));
+define('PR_IPM_CONTACT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D1));
+define('PR_IPM_JOURNAL_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D2));
+define('PR_IPM_NOTE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D3));
+define('PR_IPM_TASK_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D4));
+define('PR_IPM_DRAFTS_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D7));
 /*
 PR_ADDITIONAL_REN_ENTRYIDS:
     This is a multivalued property which contains entry IDs for certain special folders.
@@ -719,11 +719,11 @@ 
         4 - Junk E-mail Folder
         5 - sfSpamTagDontUse (unknown what this is, disable olk spam stuff?)
 */
-define('PR_ADDITIONAL_REN_ENTRYIDS'                   ,mapi_prop_tag(PT_MV_BINARY,   0x36D8));
-define('PR_FREEBUSY_ENTRYIDS'                         ,mapi_prop_tag(PT_MV_BINARY,   0x36E4));
-define('PR_REM_ONLINE_ENTRYID'                        ,mapi_prop_tag(PT_BINARY,      0x36D5));
-define('PR_REM_OFFLINE_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x36D6));
-define('PR_FREEBUSY_COUNT_MONTHS'                     ,mapi_prop_tag(PT_LONG,        0x6869));
+define('PR_ADDITIONAL_REN_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x36D8));
+define('PR_FREEBUSY_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x36E4));
+define('PR_REM_ONLINE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D5));
+define('PR_REM_OFFLINE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x36D6));
+define('PR_FREEBUSY_COUNT_MONTHS', mapi_prop_tag(PT_LONG, 0x6869));
 /*
 PR_IPM_OL2007_ENTRYIDS:
     This is a single binary property containing the entryids for:
@@ -755,10 +755,10 @@ 
     00000000B774162F0098C84182DE9E4358E4249D01000B41FF66083D464EA7E34D6026C9B143000000006DDA0000 (entryid)
     00000000 (terminator?)
 */
-define('PR_IPM_OL2007_ENTRYIDS'                       ,mapi_prop_tag(PT_BINARY,      0x36D9));
+define('PR_IPM_OL2007_ENTRYIDS', mapi_prop_tag(PT_BINARY, 0x36D9));
 // Note: PR_IPM_OL2007_ENTRYIDS is the same property as PR_ADDITIONAL_REN_ENTRYIDS_EX, but Microsoft
 // seems to use the latter hence we will also use that to not confuse developers that want to Google it.
-define('PR_ADDITIONAL_REN_ENTRYIDS_EX'                ,mapi_prop_tag(PT_BINARY,      0x36D9));
+define('PR_ADDITIONAL_REN_ENTRYIDS_EX', mapi_prop_tag(PT_BINARY, 0x36D9));
 
 
 
@@ -766,160 +766,160 @@ 
  * Don't know where to put these
  */
 
-define('PR_ICON_INDEX'                                ,mapi_prop_tag(PT_LONG,        0x1080));
-define('PR_LAST_VERB_EXECUTED'                        ,mapi_prop_tag(PT_LONG,        0x1081));
-define('PR_LAST_VERB_EXECUTION_TIME'                  ,mapi_prop_tag(PT_SYSTIME,     0x1082));
-define('PR_INTERNET_CPID'                             ,mapi_prop_tag(PT_LONG,        0x3FDE));
-define('PR_RECIPIENT_ENTRYID'                         ,mapi_prop_tag(PT_BINARY,      0x5FF7));
-define('PR_SEND_INTERNET_ENCODING'                    ,mapi_prop_tag(PT_LONG,        0x3FDE));
-define('PR_RECIPIENT_DISPLAY_NAME'                    ,mapi_prop_tag(PT_STRING8,     0x5FF6));
-define('PR_RECIPIENT_TRACKSTATUS'                     ,mapi_prop_tag(PT_LONG,        0x5FFF));
-define('PR_RECIPIENT_FLAGS'                           ,mapi_prop_tag(PT_LONG,        0x5FFD));
-define('PR_RECIPIENT_TRACKSTATUS_TIME'                ,mapi_prop_tag(PT_SYSTIME,     0x5FFB));
-
-define('PR_EC_OUTOFOFFICE'                            ,mapi_prop_tag(PT_BOOLEAN,     0x6760));
-define('PR_EC_OUTOFOFFICE_MSG'                        ,mapi_prop_tag(PT_STRING8,     0x6761));
-define('PR_EC_OUTOFOFFICE_SUBJECT'                    ,mapi_prop_tag(PT_STRING8,     0x6762));
-define('PR_EC_OUTOFOFFICE_FROM'                       ,mapi_prop_tag(PT_SYSTIME,     0x6763));
-define('PR_EC_OUTOFOFFICE_UNTIL'                      ,mapi_prop_tag(PT_SYSTIME,     0x6764));
+define('PR_ICON_INDEX', mapi_prop_tag(PT_LONG, 0x1080));
+define('PR_LAST_VERB_EXECUTED', mapi_prop_tag(PT_LONG, 0x1081));
+define('PR_LAST_VERB_EXECUTION_TIME', mapi_prop_tag(PT_SYSTIME, 0x1082));
+define('PR_INTERNET_CPID', mapi_prop_tag(PT_LONG, 0x3FDE));
+define('PR_RECIPIENT_ENTRYID', mapi_prop_tag(PT_BINARY, 0x5FF7));
+define('PR_SEND_INTERNET_ENCODING', mapi_prop_tag(PT_LONG, 0x3FDE));
+define('PR_RECIPIENT_DISPLAY_NAME', mapi_prop_tag(PT_STRING8, 0x5FF6));
+define('PR_RECIPIENT_TRACKSTATUS', mapi_prop_tag(PT_LONG, 0x5FFF));
+define('PR_RECIPIENT_FLAGS', mapi_prop_tag(PT_LONG, 0x5FFD));
+define('PR_RECIPIENT_TRACKSTATUS_TIME', mapi_prop_tag(PT_SYSTIME, 0x5FFB));
+
+define('PR_EC_OUTOFOFFICE', mapi_prop_tag(PT_BOOLEAN, 0x6760));
+define('PR_EC_OUTOFOFFICE_MSG', mapi_prop_tag(PT_STRING8, 0x6761));
+define('PR_EC_OUTOFOFFICE_SUBJECT', mapi_prop_tag(PT_STRING8, 0x6762));
+define('PR_EC_OUTOFOFFICE_FROM', mapi_prop_tag(PT_SYSTIME, 0x6763));
+define('PR_EC_OUTOFOFFICE_UNTIL', mapi_prop_tag(PT_SYSTIME, 0x6764));
 
 /* quota support */
-define('PR_QUOTA_WARNING_THRESHOLD'                   ,mapi_prop_tag(PT_LONG,        0x6721));
-define('PR_QUOTA_SEND_THRESHOLD'                      ,mapi_prop_tag(PT_LONG,        0x6722));
-define('PR_QUOTA_RECEIVE_THRESHOLD'                   ,mapi_prop_tag(PT_LONG,        0x6723));
+define('PR_QUOTA_WARNING_THRESHOLD', mapi_prop_tag(PT_LONG, 0x6721));
+define('PR_QUOTA_SEND_THRESHOLD', mapi_prop_tag(PT_LONG, 0x6722));
+define('PR_QUOTA_RECEIVE_THRESHOLD', mapi_prop_tag(PT_LONG, 0x6723));
 
 /* storage for the settings for the webaccess 6.xx */
-define('PR_EC_WEBACCESS_SETTINGS'                     ,mapi_prop_tag(PT_STRING8,     0x6770));
-define('PR_EC_RECIPIENT_HISTORY'                      ,mapi_prop_tag(PT_STRING8,     0x6771));
+define('PR_EC_WEBACCESS_SETTINGS', mapi_prop_tag(PT_STRING8, 0x6770));
+define('PR_EC_RECIPIENT_HISTORY', mapi_prop_tag(PT_STRING8, 0x6771));
 
 /* storage for the settings for the webaccess 7.xx */
-define('PR_EC_WEBACCESS_SETTINGS_JSON'                ,mapi_prop_tag(PT_STRING8,     0x6772));
-define('PR_EC_RECIPIENT_HISTORY_JSON'                 ,mapi_prop_tag(PT_STRING8,     0x6773));
+define('PR_EC_WEBACCESS_SETTINGS_JSON', mapi_prop_tag(PT_STRING8, 0x6772));
+define('PR_EC_RECIPIENT_HISTORY_JSON', mapi_prop_tag(PT_STRING8, 0x6773));
 
 /* The persistent settings are settings that will not be touched when the settings are reset */
-define('PR_EC_WEBAPP_PERSISTENT_SETTINGS_JSON'        ,mapi_prop_tag(PT_STRING8,     0x6774));
+define('PR_EC_WEBAPP_PERSISTENT_SETTINGS_JSON', mapi_prop_tag(PT_STRING8, 0x6774));
 
 /* statistics properties */
-define('PR_EC_STATSTABLE_SYSTEM'                      ,mapi_prop_tag(PT_OBJECT,      0x6730));
-define('PR_EC_STATSTABLE_SESSIONS'                    ,mapi_prop_tag(PT_OBJECT,      0x6731));
-define('PR_EC_STATSTABLE_USERS'                       ,mapi_prop_tag(PT_OBJECT,      0x6732));
-define('PR_EC_STATSTABLE_COMPANY'                     ,mapi_prop_tag(PT_OBJECT,      0x6733));
-
-define('PR_EC_STATS_SYSTEM_DESCRIPTION'               ,mapi_prop_tag(PT_STRING8,     0x6740));
-define('PR_EC_STATS_SYSTEM_VALUE'                     ,mapi_prop_tag(PT_STRING8,     0x6741));
-define('PR_EC_STATS_SESSION_ID'                       ,mapi_prop_tag(PT_LONG,        0x6742));
-define('PR_EC_STATS_SESSION_IPADDRESS'                ,mapi_prop_tag(PT_STRING8,     0x6743));
-define('PR_EC_STATS_SESSION_IDLETIME'                 ,mapi_prop_tag(PT_LONG,        0x6744));
-define('PR_EC_STATS_SESSION_CAPABILITY'               ,mapi_prop_tag(PT_LONG,        0x6745));
-define('PR_EC_STATS_SESSION_LOCKED'                   ,mapi_prop_tag(PT_BOOLEAN,     0x6746));
-define('PR_EC_STATS_SESSION_BUSYSTATES'               ,mapi_prop_tag(PT_MV_STRING8,  0x6747));
-define('PR_EC_COMPANY_NAME'                           ,mapi_prop_tag(PT_STRING8,     0x6748));
+define('PR_EC_STATSTABLE_SYSTEM', mapi_prop_tag(PT_OBJECT, 0x6730));
+define('PR_EC_STATSTABLE_SESSIONS', mapi_prop_tag(PT_OBJECT, 0x6731));
+define('PR_EC_STATSTABLE_USERS', mapi_prop_tag(PT_OBJECT, 0x6732));
+define('PR_EC_STATSTABLE_COMPANY', mapi_prop_tag(PT_OBJECT, 0x6733));
+
+define('PR_EC_STATS_SYSTEM_DESCRIPTION', mapi_prop_tag(PT_STRING8, 0x6740));
+define('PR_EC_STATS_SYSTEM_VALUE', mapi_prop_tag(PT_STRING8, 0x6741));
+define('PR_EC_STATS_SESSION_ID', mapi_prop_tag(PT_LONG, 0x6742));
+define('PR_EC_STATS_SESSION_IPADDRESS', mapi_prop_tag(PT_STRING8, 0x6743));
+define('PR_EC_STATS_SESSION_IDLETIME', mapi_prop_tag(PT_LONG, 0x6744));
+define('PR_EC_STATS_SESSION_CAPABILITY', mapi_prop_tag(PT_LONG, 0x6745));
+define('PR_EC_STATS_SESSION_LOCKED', mapi_prop_tag(PT_BOOLEAN, 0x6746));
+define('PR_EC_STATS_SESSION_BUSYSTATES', mapi_prop_tag(PT_MV_STRING8, 0x6747));
+define('PR_EC_COMPANY_NAME', mapi_prop_tag(PT_STRING8, 0x6748));
 
 /* user features */
-define('PR_EC_ENABLED_FEATURES'                       ,mapi_prop_tag(PT_MV_TSTRING,  0x67B3));
-define('PR_EC_DISABLED_FEATURES'                      ,mapi_prop_tag(PT_MV_TSTRING,  0x67B4));
+define('PR_EC_ENABLED_FEATURES', mapi_prop_tag(PT_MV_TSTRING, 0x67B3));
+define('PR_EC_DISABLED_FEATURES', mapi_prop_tag(PT_MV_TSTRING, 0x67B4));
 
 /* WA properties */
-define('PR_EC_WA_ATTACHMENT_HIDDEN_OVERRIDE'          ,mapi_prop_tag(PT_BOOLEAN,     0x67E0));
-define('PR_EC_WA_ATTACHMENT_ID'                       ,mapi_prop_tag(PT_STRING8,     0x67E1));
+define('PR_EC_WA_ATTACHMENT_HIDDEN_OVERRIDE', mapi_prop_tag(PT_BOOLEAN, 0x67E0));
+define('PR_EC_WA_ATTACHMENT_ID', mapi_prop_tag(PT_STRING8, 0x67E1));
 
 // edkmdb, rules properties
 #define pidSpecialMin                                   0x6670
-define('PR_RULE_ID'                                   ,mapi_prop_tag(PT_I8,          0x6674)); // only lower 32bits are used.
-define('PR_RULE_IDS'                                  ,mapi_prop_tag(PT_BINARY,      0x6675));
-define('PR_RULE_SEQUENCE'                             ,mapi_prop_tag(PT_LONG,        0x6676));
-define('PR_RULE_STATE'                                ,mapi_prop_tag(PT_LONG,        0x6677));
-define('PR_RULE_USER_FLAGS'                           ,mapi_prop_tag(PT_LONG,        0x6678));
-define('PR_RULE_CONDITION'                            ,mapi_prop_tag(PT_SRESTRICTION,0x6679));
-define('PR_RULE_ACTIONS'                              ,mapi_prop_tag(PT_ACTIONS,     0x6680));
-define('PR_RULE_PROVIDER'                             ,mapi_prop_tag(PT_STRING8,     0x6681));
-define('PR_RULE_NAME'                                 ,mapi_prop_tag(PT_TSTRING,     0x6682));
-define('PR_RULE_LEVEL'                                ,mapi_prop_tag(PT_LONG,        0x6683));
-define('PR_RULE_PROVIDER_DATA'                        ,mapi_prop_tag(PT_BINARY,      0x6684));
+define('PR_RULE_ID', mapi_prop_tag(PT_I8, 0x6674)); // only lower 32bits are used.
+define('PR_RULE_IDS', mapi_prop_tag(PT_BINARY, 0x6675));
+define('PR_RULE_SEQUENCE', mapi_prop_tag(PT_LONG, 0x6676));
+define('PR_RULE_STATE', mapi_prop_tag(PT_LONG, 0x6677));
+define('PR_RULE_USER_FLAGS', mapi_prop_tag(PT_LONG, 0x6678));
+define('PR_RULE_CONDITION', mapi_prop_tag(PT_SRESTRICTION, 0x6679));
+define('PR_RULE_ACTIONS', mapi_prop_tag(PT_ACTIONS, 0x6680));
+define('PR_RULE_PROVIDER', mapi_prop_tag(PT_STRING8, 0x6681));
+define('PR_RULE_NAME', mapi_prop_tag(PT_TSTRING, 0x6682));
+define('PR_RULE_LEVEL', mapi_prop_tag(PT_LONG, 0x6683));
+define('PR_RULE_PROVIDER_DATA', mapi_prop_tag(PT_BINARY, 0x6684));
 
 // edkmdb, ICS properties
-define('PR_SOURCE_KEY'                                ,mapi_prop_tag(PT_BINARY,      0x65E0));
-define('PR_PARENT_SOURCE_KEY'                         ,mapi_prop_tag(PT_BINARY,      0x65E1));
-define('PR_CHANGE_KEY'                                ,mapi_prop_tag(PT_BINARY,      0x65E2));
-define('PR_PREDECESSOR_CHANGE_LIST'                   ,mapi_prop_tag(PT_BINARY,      0x65E3));
+define('PR_SOURCE_KEY', mapi_prop_tag(PT_BINARY, 0x65E0));
+define('PR_PARENT_SOURCE_KEY', mapi_prop_tag(PT_BINARY, 0x65E1));
+define('PR_CHANGE_KEY', mapi_prop_tag(PT_BINARY, 0x65E2));
+define('PR_PREDECESSOR_CHANGE_LIST', mapi_prop_tag(PT_BINARY, 0x65E3));
 
 
-define('PR_PROCESS_MEETING_REQUESTS'                  ,mapi_prop_tag(PT_BOOLEAN,     0x686D));
-define('PR_DECLINE_RECURRING_MEETING_REQUESTS'        ,mapi_prop_tag(PT_BOOLEAN,     0x686E));
-define('PR_DECLINE_CONFLICTING_MEETING_REQUESTS'      ,mapi_prop_tag(PT_BOOLEAN,     0x686F));
+define('PR_PROCESS_MEETING_REQUESTS', mapi_prop_tag(PT_BOOLEAN, 0x686D));
+define('PR_DECLINE_RECURRING_MEETING_REQUESTS', mapi_prop_tag(PT_BOOLEAN, 0x686E));
+define('PR_DECLINE_CONFLICTING_MEETING_REQUESTS', mapi_prop_tag(PT_BOOLEAN, 0x686F));
 
 
-define('PR_PROPOSEDNEWTIME'                           ,mapi_prop_tag(PT_BOOLEAN,     0x5FE1));
-define('PR_PROPOSENEWTIME_START'                      ,mapi_prop_tag(PT_SYSTIME,     0x5FE3));
-define('PR_PROPOSENEWTIME_END'                        ,mapi_prop_tag(PT_SYSTIME,     0x5FE4));
+define('PR_PROPOSEDNEWTIME', mapi_prop_tag(PT_BOOLEAN, 0x5FE1));
+define('PR_PROPOSENEWTIME_START', mapi_prop_tag(PT_SYSTIME, 0x5FE3));
+define('PR_PROPOSENEWTIME_END', mapi_prop_tag(PT_SYSTIME, 0x5FE4));
 
 // property for sort the recoverable items.
-define('PR_DELETED_ON'                                ,mapi_prop_tag(PT_SYSTIME,     0x668F));
+define('PR_DELETED_ON', mapi_prop_tag(PT_SYSTIME, 0x668F));
 
-define('PR_PROCESSED'                                 ,mapi_prop_tag(PT_BOOLEAN,     0x7D01));
+define('PR_PROCESSED', mapi_prop_tag(PT_BOOLEAN, 0x7D01));
 
 // Delegates properties
-define('PR_DELEGATES_SEE_PRIVATE'                     ,mapi_prop_tag(PT_MV_LONG,     0x686B));
-define('PR_SCHDINFO_DELEGATE_ENTRYIDS'                ,mapi_prop_tag(PT_MV_BINARY,   0x6845));
-define('PR_SCHDINFO_DELEGATE_NAMES'                   ,mapi_prop_tag(PT_MV_STRING8,  0x6844));
-define('PR_DELEGATED_BY_RULE'                         ,mapi_prop_tag(PT_BOOLEAN,     0x3FE3));
+define('PR_DELEGATES_SEE_PRIVATE', mapi_prop_tag(PT_MV_LONG, 0x686B));
+define('PR_SCHDINFO_DELEGATE_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x6845));
+define('PR_SCHDINFO_DELEGATE_NAMES', mapi_prop_tag(PT_MV_STRING8, 0x6844));
+define('PR_DELEGATED_BY_RULE', mapi_prop_tag(PT_BOOLEAN, 0x3FE3));
 
 // properties required in Reply mail.
-define('PR_INTERNET_REFERENCES'                       ,mapi_prop_tag(PT_STRING8,     0x1039));
-define('PR_IN_REPLY_TO_ID'                            ,mapi_prop_tag(PT_STRING8,     0x1042));
-define('PR_INTERNET_MESSAGE_ID'                       ,mapi_prop_tag(PT_STRING8,     0x1035));
+define('PR_INTERNET_REFERENCES', mapi_prop_tag(PT_STRING8, 0x1039));
+define('PR_IN_REPLY_TO_ID', mapi_prop_tag(PT_STRING8, 0x1042));
+define('PR_INTERNET_MESSAGE_ID', mapi_prop_tag(PT_STRING8, 0x1035));
 
 // for hidden folders
-define('PR_ATTR_HIDDEN'                               ,mapi_prop_tag(PT_BOOLEAN,     0x10F4));
+define('PR_ATTR_HIDDEN', mapi_prop_tag(PT_BOOLEAN, 0x10F4));
 
 /**
  * Addressbook detail properties.
  * It is not defined by MAPI, but to keep in sync with the interface of outlook we have to use these
  * properties. Outlook actually uses these properties for it's addressbook details.
  */
-define('PR_HOME2_TELEPHONE_NUMBER_MV'                 ,mapi_prop_tag(PT_MV_TSTRING,  0x3A2F));
-define('PR_BUSINESS2_TELEPHONE_NUMBER_MV'             ,mapi_prop_tag(PT_MV_TSTRING,  0x3A1B));
-define('PR_EMS_AB_PROXY_ADDRESSES'                    ,mapi_prop_tag(PT_TSTRING,     0x800F));
-define('PR_EMS_AB_PROXY_ADDRESSES_MV'                 ,mapi_prop_tag(PT_MV_TSTRING,  0x800F));
-define('PR_EMS_AB_MANAGER'                            ,mapi_prop_tag(PT_BINARY,      0x8005));
-define('PR_EMS_AB_REPORTS'                            ,mapi_prop_tag(PT_BINARY,      0x800E));
-define('PR_EMS_AB_REPORTS_MV'                         ,mapi_prop_tag(PT_MV_BINARY,   0x800E));
-define('PR_EMS_AB_IS_MEMBER_OF_DL'                    ,mapi_prop_tag(PT_MV_BINARY,   0x8008));
-define('PR_EMS_AB_OWNER'                              ,mapi_prop_tag(PT_BINARY,      0x800C));
-define('PR_EMS_AB_ROOM_CAPACITY'                      ,mapi_prop_tag(PT_LONG,        0x0807));
-define('PR_EMS_AB_TAGGED_X509_CERT'                   ,mapi_prop_tag(PT_MV_BINARY,   0x8C6A));
-define('PR_EMS_AB_THUMBNAIL_PHOTO'                    ,mapi_prop_tag(PT_BINARY,      0x8C9E));
-
-define('PR_EC_ARCHIVE_SERVERS'                        ,mapi_prop_tag(PT_MV_TSTRING,  0x67c4));
+define('PR_HOME2_TELEPHONE_NUMBER_MV', mapi_prop_tag(PT_MV_TSTRING, 0x3A2F));
+define('PR_BUSINESS2_TELEPHONE_NUMBER_MV', mapi_prop_tag(PT_MV_TSTRING, 0x3A1B));
+define('PR_EMS_AB_PROXY_ADDRESSES', mapi_prop_tag(PT_TSTRING, 0x800F));
+define('PR_EMS_AB_PROXY_ADDRESSES_MV', mapi_prop_tag(PT_MV_TSTRING, 0x800F));
+define('PR_EMS_AB_MANAGER', mapi_prop_tag(PT_BINARY, 0x8005));
+define('PR_EMS_AB_REPORTS', mapi_prop_tag(PT_BINARY, 0x800E));
+define('PR_EMS_AB_REPORTS_MV', mapi_prop_tag(PT_MV_BINARY, 0x800E));
+define('PR_EMS_AB_IS_MEMBER_OF_DL', mapi_prop_tag(PT_MV_BINARY, 0x8008));
+define('PR_EMS_AB_OWNER', mapi_prop_tag(PT_BINARY, 0x800C));
+define('PR_EMS_AB_ROOM_CAPACITY', mapi_prop_tag(PT_LONG, 0x0807));
+define('PR_EMS_AB_TAGGED_X509_CERT', mapi_prop_tag(PT_MV_BINARY, 0x8C6A));
+define('PR_EMS_AB_THUMBNAIL_PHOTO', mapi_prop_tag(PT_BINARY, 0x8C9E));
+
+define('PR_EC_ARCHIVE_SERVERS', mapi_prop_tag(PT_MV_TSTRING, 0x67c4));
 
 /* grommunio contacts provider properties */
-define('PR_ZC_CONTACT_STORE_ENTRYIDS'                 ,mapi_prop_tag(PT_MV_BINARY,   0x6711));
-define('PR_ZC_CONTACT_FOLDER_ENTRYIDS'                ,mapi_prop_tag(PT_MV_BINARY,   0x6712));
-define('PR_ZC_CONTACT_FOLDER_NAMES'                   ,mapi_prop_tag(PT_MV_TSTRING,  0x6713));
+define('PR_ZC_CONTACT_STORE_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x6711));
+define('PR_ZC_CONTACT_FOLDER_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x6712));
+define('PR_ZC_CONTACT_FOLDER_NAMES', mapi_prop_tag(PT_MV_TSTRING, 0x6713));
 
 /* grommunio specific properties for optimization of imap functionality */
-define('PR_EC_IMAP_EMAIL'                             ,mapi_prop_tag(PT_BINARY,      0x678C)); //the complete rfc822 email
-define('PR_EC_IMAP_EMAIL_SIZE'                        ,mapi_prop_tag(PT_LONG,        0x678D));
-define('PR_EC_IMAP_BODY'                              ,mapi_prop_tag(PT_STRING8,     0x678E)); //simplified bodystructure (mostly unused by clients)
-define('PR_EC_IMAP_BODYSTRUCTURE'                     ,mapi_prop_tag(PT_STRING8,     0x678F)); //extended bodystructure (often used by clients)
+define('PR_EC_IMAP_EMAIL', mapi_prop_tag(PT_BINARY, 0x678C)); //the complete rfc822 email
+define('PR_EC_IMAP_EMAIL_SIZE', mapi_prop_tag(PT_LONG, 0x678D));
+define('PR_EC_IMAP_BODY', mapi_prop_tag(PT_STRING8, 0x678E)); //simplified bodystructure (mostly unused by clients)
+define('PR_EC_IMAP_BODYSTRUCTURE', mapi_prop_tag(PT_STRING8, 0x678F)); //extended bodystructure (often used by clients)
 
 /* Folder properties for unread counters */
-define('PR_LOCAL_COMMIT_TIME_MAX'                     ,mapi_prop_tag(PT_SYSTIME,     0x670A));
-define('PR_DELETED_MSG_COUNT'                         ,mapi_prop_tag(PT_LONG,        0x6640));
+define('PR_LOCAL_COMMIT_TIME_MAX', mapi_prop_tag(PT_SYSTIME, 0x670A));
+define('PR_DELETED_MSG_COUNT', mapi_prop_tag(PT_LONG, 0x6640));
 
 /* Favorites folder properties*/
-define('PR_WLINK_ENTRYID'                             ,mapi_prop_tag(PT_BINARY,      0x684C));
-define('PR_WLINK_FLAGS'                               ,mapi_prop_tag(PT_LONG,        0x684A));
-define('PR_WLINK_ORDINAL'                             ,mapi_prop_tag(PT_BINARY,      0x684B));
-define('PR_WLINK_STORE_ENTRYID'                       ,mapi_prop_tag(PT_BINARY,      0x684E));
-define('PR_WLINK_TYPE'                                ,mapi_prop_tag(PT_LONG,        0x6849));
-define('PR_WLINK_SECTION'                             ,mapi_prop_tag(PT_LONG,        0x6852));
-define('PR_WLINK_RECKEY'                              ,mapi_prop_tag(PT_BINARY,      0x684D));
-define('PR_WB_SF_ID'                                  ,mapi_prop_tag(PT_BINARY,      0x6842));
+define('PR_WLINK_ENTRYID', mapi_prop_tag(PT_BINARY, 0x684C));
+define('PR_WLINK_FLAGS', mapi_prop_tag(PT_LONG, 0x684A));
+define('PR_WLINK_ORDINAL', mapi_prop_tag(PT_BINARY, 0x684B));
+define('PR_WLINK_STORE_ENTRYID', mapi_prop_tag(PT_BINARY, 0x684E));
+define('PR_WLINK_TYPE', mapi_prop_tag(PT_LONG, 0x6849));
+define('PR_WLINK_SECTION', mapi_prop_tag(PT_LONG, 0x6852));
+define('PR_WLINK_RECKEY', mapi_prop_tag(PT_BINARY, 0x684D));
+define('PR_WB_SF_ID', mapi_prop_tag(PT_BINARY, 0x6842));
 
 /* Search folder properties */
-define('PR_EC_SUGGESTION'                             ,mapi_prop_tag(PT_TSTRING,     0x6707));
+define('PR_EC_SUGGESTION', mapi_prop_tag(PT_TSTRING, 0x6707));
 
-define('PR_EC_BODY_FILTERED'                          ,mapi_prop_tag(PT_BINARY, 0x6791));
-define('PR_PROPOSEDNEWTIME_START'                     ,PR_PROPOSENEWTIME_START);
-define('PR_PROPOSEDNEWTIME_END'                       ,PR_PROPOSENEWTIME_END);
+define('PR_EC_BODY_FILTERED', mapi_prop_tag(PT_BINARY, 0x6791));
+define('PR_PROPOSEDNEWTIME_START', PR_PROPOSENEWTIME_START);
+define('PR_PROPOSEDNEWTIME_END', PR_PROPOSENEWTIME_END);