Completed
Pull Request — master (#194)
by
unknown
15:06
created
lib/midgard/admin/asgard/toolbar.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,8 @@
 block discarded – undo
117 117
                                 }
118 118
                                 break;
119 119
                         }
120
-                    } catch (midcom_error $e) {
120
+                    }
121
+                    catch (midcom_error $e) {
121 122
                         $e->log();
122 123
                     }
123 124
                 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
             ];
145 145
         }
146 146
 
147
-        if (   midcom::get()->config->get('midcom_services_rcs_enable')
147
+        if (midcom::get()->config->get('midcom_services_rcs_enable')
148 148
             && $object->can_do('midgard:update')
149 149
             && $object->_use_rcs) {
150 150
             $buttons[] = [
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
     private function get_toolbar_update_items($object)
206 206
     {
207 207
         $buttons = [];
208
-        if (   is_a($object, midcom_db_topic::class)
208
+        if (is_a($object, midcom_db_topic::class)
209 209
             && $object->component
210 210
             && $object->can_do('midcom:component_config')) {
211 211
             $buttons[] = [
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
             MIDCOM_TOOLBAR_ENABLED => $object->can_do('midgard:privileges'),
244 244
         ];
245 245
 
246
-        if (   midcom::get()->componentloader->is_installed('midcom.helper.replicator')
246
+        if (midcom::get()->componentloader->is_installed('midcom.helper.replicator')
247 247
             && midcom::get()->auth->admin) {
248 248
             $buttons[] = [
249 249
                 MIDCOM_TOOLBAR_URL => "__mfa/asgard_midcom.helper.replicator/object/{$object->guid}/",
Please login to merge, or discard this patch.
lib/midgard/admin/user/handler/list.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -217,7 +217,8 @@
 block discarded – undo
217 217
 
218 218
         try {
219 219
             $account = new midcom_core_account($person);
220
-        } catch (midcom_error $e) {
220
+        }
221
+        catch (midcom_error $e) {
221 222
             midcom::get()->uimessages->add($this->_l10n->get('midgard.admin.user'), sprintf($this->_l10n->get('failed to get the user with id %s'), $person->id), 'error');
222 223
             return;
223 224
         }
Please login to merge, or discard this patch.
lib/midgard/admin/user/validator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,8 @@
 block discarded – undo
27 27
         if (!empty($fields["username"])) {
28 28
             $user = midcom::get()->auth->get_user_by_name($fields["username"]);
29 29
 
30
-            if (   $user
31
-                && (   !isset($fields['person'])
30
+            if ($user
31
+                && (!isset($fields['person'])
32 32
                     || $user->guid != $fields['person'])) {
33 33
                 $result["username"] = sprintf(midcom::get()->i18n->get_string("username %s is already in use", "midgard.admin.user"), $fields['username']);
34 34
             }
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/handler/journal/list.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -171,7 +171,8 @@
 block discarded – undo
171 171
                 //create reflector with linked object to get the right label
172 172
                 try {
173 173
                     $linked_object = midcom::get()->dbfactory->get_object_by_guid($entry->linkGuid);
174
-                } catch (midcom_error $e) {
174
+                }
175
+                catch (midcom_error $e) {
175 176
                     unset($data['entries'][$i]);
176 177
                     $e->log();
177 178
                     continue;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -162,7 +162,7 @@
 block discarded – undo
162 162
                 }
163 163
 
164 164
                 $reflector = midcom_helper_reflector::get($linked_object);
165
-                $link_html = "<a href='" . midcom::get()->permalinks->create_permalink($linked_object->guid) . "'>" . $reflector->get_object_label($linked_object) ."</a>";
165
+                $link_html = "<a href='" . midcom::get()->permalinks->create_permalink($linked_object->guid) . "'>" . $reflector->get_object_label($linked_object) . "</a>";
166 166
                 $data['linked_objects'][$entry->linkGuid] = $link_html;
167 167
                 $data['linked_raw_objects'][$entry->linkGuid] = $reflector->get_object_label($linked_object);
168 168
             }
Please login to merge, or discard this patch.
lib/org/openpsa/mypage/handler/workingon.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,8 @@
 block discarded – undo
92 92
                         $customer = new org_openpsa_contacts_group_dba($customer_id);
93 93
                         $customer_label = $customer->official;
94 94
                         $customer = $customer_id;
95
-                    } catch (midcom_error $e) {
95
+                    }
96
+                    catch (midcom_error $e) {
96 97
                     }
97 98
                 }
98 99
             }
Please login to merge, or discard this patch.
lib/org/openpsa/documents/directory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
         $ownerwg = $this->get_parameter('org.openpsa.core', 'orgOpenpsaOwnerWg');
21 21
         $accesstype = $this->get_parameter('org.openpsa.core', 'orgOpenpsaAccesstype');
22 22
 
23
-        if (   $ownerwg
23
+        if ($ownerwg
24 24
             && $accesstype) {
25 25
             // Sync the object's ACL properties into MidCOM ACL system
26 26
             $sync = new org_openpsa_core_acl_synchronizer();
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     private function _update_parent_timestamp()
42 42
     {
43 43
         $parent = $this->get_parent();
44
-        if (   $parent
44
+        if ($parent
45 45
             && $parent->component == 'org.openpsa.documents') {
46 46
             midcom::get()->auth->request_sudo('org.openpsa.documents');
47 47
 
Please login to merge, or discard this patch.
lib/org/openpsa/httplib/exec/test_post.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 
18 18
 } else {
19 19
     $client = new org_openpsa_httplib();
20
-    if (   !empty($_REQUEST['username'])
20
+    if (!empty($_REQUEST['username'])
21 21
         && !empty($_REQUEST['password'])) {
22 22
         $client->basicauth['user'] = $_REQUEST['username'];
23 23
         $client->basicauth['password'] = $_REQUEST['password'];
Please login to merge, or discard this patch.
lib/org/openpsa/mail/exec/test.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 midcom::get()->auth->require_admin_user();
3 3
 
4
-if (   empty($_POST['to'])
4
+if (empty($_POST['to'])
5 5
     || empty($_POST['from'])) {
6 6
     ?>
7 7
     <h2>Send test email</h2>
Please login to merge, or discard this patch.
lib/org/openpsa/mail/template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
         foreach ($this->_parameters as $key => $value) {
112 112
             $this->_patterns[] = "/__({$key})__/";
113 113
 
114
-            if (   is_array($value)
114
+            if (is_array($value)
115 115
                 || is_object($value)) {
116 116
                 $this->_patterns[] = "/__({$key})_([^ \.>\"-]*?)__/";
117 117
             }
Please login to merge, or discard this patch.