@@ -97,7 +97,7 @@ |
||
| 97 | 97 | <?php include '/etc/grommunio-web/disclaimer.html'; ?> |
| 98 | 98 | </div> |
| 99 | 99 | <?php } |
| 100 | - elseif (file_exists('disclaimer.html')) { ?> |
|
| 100 | +elseif (file_exists('disclaimer.html')) { ?> |
|
| 101 | 101 | <div class="disclaimer"> |
| 102 | 102 | <?php include 'disclaimer.html'; ?> |
| 103 | 103 | </div> |
@@ -298,7 +298,8 @@ discard block |
||
| 298 | 298 | ]; |
| 299 | 299 | } |
| 300 | 300 | } |
| 301 | - } else { |
|
| 301 | + } |
|
| 302 | + else { |
|
| 302 | 303 | $terms[] = [ |
| 303 | 304 | 'type' => 'term', |
| 304 | 305 | 'fields' => $fields, |
@@ -329,7 +330,8 @@ discard block |
||
| 329 | 330 | if ($value !== null) { |
| 330 | 331 | if ($subres[RELOP] == RELOP_LT || $subres[RELOP] == RELOP_LE) { |
| 331 | 332 | $filters['date_end'] = $value; |
| 332 | - } elseif ($subres[RELOP] == RELOP_GT || $subres[RELOP] == RELOP_GE) { |
|
| 333 | + } |
|
| 334 | + elseif ($subres[RELOP] == RELOP_GT || $subres[RELOP] == RELOP_GE) { |
|
| 333 | 335 | $filters['date_start'] = $value; |
| 334 | 336 | } |
| 335 | 337 | } |
@@ -649,13 +649,15 @@ |
||
| 649 | 649 | // Either use PR_CLIENT_SUBMIT_TIME or extract date from EML and set PR_MESSAGE_DELIVERY_TIME |
| 650 | 650 | $props = mapi_getprops($newMessage, [PR_CLIENT_SUBMIT_TIME, PR_MESSAGE_DELIVERY_TIME]); |
| 651 | 651 | if (empty($props[PR_MESSAGE_DELIVERY_TIME])) { |
| 652 | - if (!empty($props[PR_CLIENT_SUBMIT_TIME])) |
|
| 653 | - mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $props[PR_CLIENT_SUBMIT_TIME]]); |
|
| 652 | + if (!empty($props[PR_CLIENT_SUBMIT_TIME])) { |
|
| 653 | + mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $props[PR_CLIENT_SUBMIT_TIME]]); |
|
| 654 | + } |
|
| 654 | 655 | else { |
| 655 | 656 | if (preg_match('/^Date:\s*(.+)$/mi', $attachmentStream, $matches)) { |
| 656 | 657 | $deliverytime = strtotime(trim($matches[1])); |
| 657 | - if ($deliverytime) |
|
| 658 | - mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $deliverytime]); |
|
| 658 | + if ($deliverytime) { |
|
| 659 | + mapi_setprops($newMessage, [PR_MESSAGE_DELIVERY_TIME => $deliverytime]); |
|
| 660 | + } |
|
| 659 | 661 | |
| 660 | 662 | } |
| 661 | 663 | } |