@@ -25,9 +25,11 @@ |
||
| 25 | 25 | * @return bool true on success or false on failure |
| 26 | 26 | */ |
| 27 | 27 | public function execute() { |
| 28 | - foreach ($this->data as $actionType => $actionData) try { |
|
| 28 | + foreach ($this->data as $actionType => $actionData) { |
|
| 29 | + try { |
|
| 29 | 30 | if (!isset($actionType)) |
| 30 | 31 | continue; |
| 32 | + } |
|
| 31 | 33 | switch ($actionType) { |
| 32 | 34 | case 'certificate': |
| 33 | 35 | $data = $this->verifyCertificate($actionData); |
@@ -98,8 +98,9 @@ |
||
| 98 | 98 | // Get messages from certificates |
| 99 | 99 | foreach ($privateCerts as $privateCert) { |
| 100 | 100 | $privateCertMessage = mapi_msgstore_openentry($store, $privateCert[PR_ENTRYID]); |
| 101 | - if ($privateCertMessage === false) |
|
| 102 | - continue; |
|
| 101 | + if ($privateCertMessage === false) { |
|
| 102 | + continue; |
|
| 103 | + } |
|
| 103 | 104 | $pkcs12 = ""; |
| 104 | 105 | $certs = []; |
| 105 | 106 | // Read pkcs12 cert from message |
@@ -96,7 +96,8 @@ |
||
| 96 | 96 | <div class="disclaimer"> |
| 97 | 97 | <?php include '/etc/grommunio-web/disclaimer.html'; ?> |
| 98 | 98 | </div> |
| 99 | - <?php } elseif (file_exists('disclaimer.html')) { ?> |
|
| 99 | + <?php } |
|
| 100 | +elseif (file_exists('disclaimer.html')) { ?> |
|
| 100 | 101 | <div class="disclaimer"> |
| 101 | 102 | <?php include 'disclaimer.html'; ?> |
| 102 | 103 | </div> |
@@ -908,14 +908,14 @@ |
||
| 908 | 908 | // Do not show contacts' folders in the AB list view for which |
| 909 | 909 | // the user has permissions, but hasn't added them to the folder hierarchy. |
| 910 | 910 | if (!empty($sharedUserSetting) && |
| 911 | - !isset($sharedUserSetting['all']) && |
|
| 912 | - !isset($sharedUserSetting['contact']) && |
|
| 913 | - in_array($mainUserEntryId, array_column($grants, 'userid'))) { |
|
| 911 | + !isset($sharedUserSetting['all']) && |
|
| 912 | + !isset($sharedUserSetting['contact']) && |
|
| 913 | + in_array($mainUserEntryId, array_column($grants, 'userid'))) { |
|
| 914 | 914 | continue; |
| 915 | 915 | } |
| 916 | 916 | if (isset($sharedUserSetting['all']) || |
| 917 | - isset($sharedUserSetting['contact']) || |
|
| 918 | - in_array($mainUserEntryId, array_column($grants, 'userid'))) |
|
| 917 | + isset($sharedUserSetting['contact']) || |
|
| 918 | + in_array($mainUserEntryId, array_column($grants, 'userid'))) |
|
| 919 | 919 | { |
| 920 | 920 | $this->addFolder($folders, [ |
| 921 | 921 | // Postfix display name of every contact folder with respective owner name |