Completed
Pull Request — master (#198)
by
unknown
19:02
created
lib/midgard/admin/asgard/handler/object/manage.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,8 @@
 block discarded – undo
61 61
     {
62 62
         try {
63 63
             $this->_object = midcom::get()->dbfactory->get_object_by_guid($guid);
64
-        } catch (midcom_error $e) {
64
+        }
65
+        catch (midcom_error $e) {
65 66
             if (midcom_connection::get_error() == MGD_ERR_OBJECT_DELETED) {
66 67
                 $relocate = $this->router->generate('object_deleted', ['guid' => $guid]);
67 68
                 midcom::get()->relocate($relocate);
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
         $this->_load_schemadb();
124 124
 
125 125
         // Hide the revision message
126
-        $field =& $this->schemadb->get_first()->get_field('_rcs_message');
126
+        $field = & $this->schemadb->get_first()->get_field('_rcs_message');
127 127
         $field['hidden'] = true;
128 128
 
129 129
         $this->datamanager = new datamanager($this->schemadb);
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
         }
214 214
         $this->_new_object = new $create_type();
215 215
 
216
-        if (   $handler_id == 'object_create_toplevel'
216
+        if ($handler_id == 'object_create_toplevel'
217 217
             || $handler_id == 'object_create_chooser') {
218 218
             midcom::get()->auth->require_user_do('midgard:create', null, $create_type);
219 219
 
@@ -269,11 +269,11 @@  discard block
 block discarded – undo
269 269
             $type_to_link_to = midcom_helper_reflector::class_rewrite($this->_object->__mgdschema_class_name__);
270 270
             foreach ($link_properties as $child_property => $link) {
271 271
                 $linked_type = midcom_helper_reflector::class_rewrite($link['class']);
272
-                if (   midcom_helper_reflector::is_same_class($linked_type, $type_to_link_to)
273
-                    || (   $link['type'] == MGD_TYPE_GUID
272
+                if (midcom_helper_reflector::is_same_class($linked_type, $type_to_link_to)
273
+                    || ($link['type'] == MGD_TYPE_GUID
274 274
                         && $link['class'] === null)) {
275 275
                     $defaults[$child_property] = $this->_object->{$link['target']};
276
-                } elseif (   $child_property == $parent_property
276
+                } elseif ($child_property == $parent_property
277 277
                           && midcom_helper_reflector::is_same_class($new_type, $type_to_link_to)) {
278 278
                     $defaults[$child_property] = $this->_object->$parent_property;
279 279
                 }
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
     {
302 302
         if ($handler_id == 'object_create_chooser') {
303 303
             midcom_show_style('midgard_admin_asgard_popup_header');
304
-            if (   $this->_new_object->id
304
+            if ($this->_new_object->id
305 305
                 || isset($data['cancelled'])) {
306 306
                 $data['jsdata'] = $this->_object_to_jsdata($this->_new_object);
307 307
                 midcom_show_style('midgard_admin_asgard_object_create_after');
@@ -437,7 +437,7 @@  discard block
 block discarded – undo
437 437
             $parent = midcom_helper_reflector_copy::get_parent_property($this->_object->__object);
438 438
             $this->_load_schemadb(get_class($this->_object), $parent, true);
439 439
             // Change the name for the parent field
440
-            $field =& $this->schemadb->get_first()->get_field($parent);
440
+            $field = & $this->schemadb->get_first()->get_field($parent);
441 441
             $field['title'] = $this->_l10n->get('choose the target');
442 442
         } else {
443 443
             $parent = null;
Please login to merge, or discard this patch.
lib/org/openpsa/user/style/show-person-account.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
             echo '<span class="toolbar_label">' . $data['l10n_midcom']->get('delete') . '</span></a></li>';
27 27
             if (    midcom::get()->config->get('auth_allow_trusted') === true
28 28
                  && $data['person']->can_do('org.openpsa.user:su')) {
29
-                 echo '<li><a class="button" href="' . $data['router']->generate('account_su', ['guid' => $data['person']->guid]) . '" />' . $data['l10n']->get('switch to user') . "</a></li>\n";
29
+                    echo '<li><a class="button" href="' . $data['router']->generate('account_su', ['guid' => $data['person']->guid]) . '" />' . $data['l10n']->get('switch to user') . "</a></li>\n";
30 30
             }
31 31
             echo "</ul>\n";
32 32
         }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
             $formatter = $data['l10n']->get_formatter();
14 14
             echo '<p>' . $data['l10n']->get('last login') . ': ' . $formatter->datetime($lastlogin) . "</p>\n";
15 15
         }
16
-        if (   $data['person']->id == midcom_connection::get_user()
16
+        if ($data['person']->id == midcom_connection::get_user()
17 17
             || midcom::get()->auth->can_user_do('org.openpsa.user:manage', null, org_openpsa_user_interface::class)) {
18 18
             $workflow = new midcom\workflow\datamanager;
19 19
             echo '<ul class="area_toolbar">';
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
22 22
                 'object' => $data['person'],
23 23
                 'label' => $data['l10n']->get('account')
24 24
             ]);
25
-            echo '<li><a href="' . $data['router']->generate('account_delete', ['guid' => $data['person']->guid]). '" ' . $workflow->render_attributes() . '"  class="button">';
25
+            echo '<li><a href="' . $data['router']->generate('account_delete', ['guid' => $data['person']->guid]) . '" ' . $workflow->render_attributes() . '"  class="button">';
26 26
             echo '<span class="toolbar_label">' . $data['l10n_midcom']->get('delete') . '</span></a></li>';
27
-            if (    midcom::get()->config->get('auth_allow_trusted') === true
27
+            if (midcom::get()->config->get('auth_allow_trusted') === true
28 28
                  && $data['person']->can_do('org.openpsa.user:su')) {
29 29
                  echo '<li><a class="button" href="' . $data['router']->generate('account_su', ['guid' => $data['person']->guid]) . '" />' . $data['l10n']->get('switch to user') . "</a></li>\n";
30 30
             }
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
         }
33 33
     } else {
34 34
         echo '<p><span class="metadata">' . $data['l10n']->get("no account") . '</span></p>';
35
-        if (   $data['person']->id == midcom_connection::get_user()
35
+        if ($data['person']->id == midcom_connection::get_user()
36 36
             || midcom::get()->auth->can_user_do('org.openpsa.user:manage', null, org_openpsa_user_interface::class)) {
37 37
             $workflow = new midcom\workflow\datamanager;
38 38
             echo '<ul class="area_toolbar">';
Please login to merge, or discard this patch.
lib/org/openpsa/user/handler/person/view.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
         $this->add_breadcrumb('', $this->_person->get_label());
37 37
 
38 38
         $auth = midcom::get()->auth;
39
-        if (   $this->_person->id == midcom_connection::get_user()
39
+        if ($this->_person->id == midcom_connection::get_user()
40 40
             || $auth->can_user_do('org.openpsa.user:manage', null, org_openpsa_user_interface::class)) {
41 41
             $buttons = [];
42 42
             $workflow = $this->get_workflow('datamanager');
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
                 $delete_workflow = $this->get_workflow('delete', ['object' => $this->_person]);
50 50
                 $buttons[] = $delete_workflow->get_button($this->router->generate('user_delete', ['guid' => $this->_person->guid]));
51 51
             }
52
-            if (   midcom_connection::is_user($this->_person)
52
+            if (midcom_connection::is_user($this->_person)
53 53
                 && $this->_person->can_do('midgard:privileges')) {
54 54
                 $buttons[] = $workflow->get_button($this->router->generate('user_privileges', ['guid' => $this->_person->guid]), [
55 55
                     MIDCOM_TOOLBAR_LABEL => $this->_l10n->get("permissions"),
Please login to merge, or discard this patch.
lib/org/openpsa/directmarketing/viewer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
      */
21 21
     private function _populate_node_toolbar()
22 22
     {
23
-        if (   $this->_topic->can_do('midgard:update')
23
+        if ($this->_topic->can_do('midgard:update')
24 24
             && $this->_topic->can_do('midcom:component_config')) {
25 25
             $workflow = $this->get_workflow('datamanager');
26 26
             $this->_node_toolbar->add_item($workflow->get_button($this->router->generate('config'), [
Please login to merge, or discard this patch.
lib/org/openpsa/relatedto/style/show_entries_list.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
     <?php
18 18
         //index is needed for sorting
19 19
         echo "'index_name',";
20
-echo "'" . midcom::get()->i18n->get_string('entry title', 'org.openpsa.relatedto') ."',";
20
+echo "'" . midcom::get()->i18n->get_string('entry title', 'org.openpsa.relatedto') . "',";
21 21
 echo "'" . midcom::get()->i18n->get_string('entry text', 'org.openpsa.relatedto') . "',";
22 22
 echo "'" . midcom::get()->i18n->get_string('followup', 'org.openpsa.relatedto') . "',";
23 23
 echo "'index_object',";
Please login to merge, or discard this patch.
lib/org/openpsa/documents/style/show-search-form-simple.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 $search_config = org_openpsa_widgets_ui::get_search_providers();
3
-if (   array_key_exists('org.openpsa.documents', $search_config)
3
+if (array_key_exists('org.openpsa.documents', $search_config)
4 4
     && midcom::get()->indexer->enabled()) {
5 5
     $url = $data['router']->generate('search'); ?>
6 6
 <div class="area" id="document_search">
Please login to merge, or discard this patch.
lib/org/openpsa/contacts/handler/frontpage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
         }
59 59
         $this->_view_toolbar->add_items($buttons);
60 60
 
61
-        if (   $this->_topic->can_do('midgard:update')
61
+        if ($this->_topic->can_do('midgard:update')
62 62
             && $this->_topic->can_do('midcom:component_config')) {
63 63
             $this->_node_toolbar->add_item($workflow->get_button($this->router->generate('config'), [
64 64
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),
Please login to merge, or discard this patch.
lib/org/openpsa/contacts/handler/group/view.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
             ];
49 49
         }
50 50
 
51
-        if (   midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_contacts_person_dba::class)
51
+        if (midcom::get()->auth->can_user_do('midgard:create', null, org_openpsa_contacts_person_dba::class)
52 52
             && $this->group->can_do('midgard:create')) {
53 53
                 $buttons[] = $workflow->get_button($this->router->generate('person_new_group', ['guid' => $this->group->guid]), [
54 54
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create person'),
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
         $siteconfig = org_openpsa_core_siteconfig::get_instance();
60 60
         $user_url = $siteconfig->get_node_full_url('org.openpsa.user');
61
-        if (   $user_url
61
+        if ($user_url
62 62
             && midcom::get()->auth->can_user_do('org.openpsa.user:access', null, org_openpsa_user_interface::class)) {
63 63
             $buttons[] = [
64 64
                 MIDCOM_TOOLBAR_URL => $user_url . "group/{$this->group->guid}/",
Please login to merge, or discard this patch.
lib/org/openpsa/invoices/handler/list.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -171,7 +171,7 @@
 block discarded – undo
171 171
     {
172 172
         $this->prepare_toolbar(false);
173 173
 
174
-        if (   $this->_topic->can_do('midgard:update')
174
+        if ($this->_topic->can_do('midgard:update')
175 175
             && $this->_topic->can_do('midcom:component_config')) {
176 176
             $workflow = $this->get_workflow('datamanager');
177 177
             $this->_node_toolbar->add_item($workflow->get_button($this->router->generate('config'), [
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -106,7 +106,8 @@  discard block
 block discarded – undo
106 106
                 $customer = org_openpsa_contacts_group_dba::get_cached($invoice->customer);
107 107
                 $entry['customer'] = "<a href=\"{$this->_request_data['invoices_url']}list/customer/all/{$customer->guid}/\">" . $customer->get_label() . "</a>";
108 108
                 $entry['index_customer'] = $customer->get_label();
109
-            } catch (midcom_error $e) {
109
+            }
110
+            catch (midcom_error $e) {
110 111
                 $entry['customer'] = '';
111 112
                 $entry['index_customer'] = '';
112 113
             }
@@ -117,7 +118,8 @@  discard block
 block discarded – undo
117 118
                 $contact = org_openpsa_contacts_person_dba::get_cached($invoice->customerContact);
118 119
                 $entry['contact'] = "<a href=\"{$this->_request_data['invoices_url']}list/customer/all/{$contact->guid}/\">" . $contact->get_label() . "</a>";
119 120
                 $entry['index_contact'] = $contact->get_label();
120
-            } catch (midcom_error $e) {
121
+            }
122
+            catch (midcom_error $e) {
121 123
                 $entry['contact'] = '';
122 124
                 $entry['index_contact'] = '';
123 125
             }
@@ -282,7 +284,8 @@  discard block
 block discarded – undo
282 284
     {
283 285
         try {
284 286
             $this->_customer = new org_openpsa_contacts_group_dba($guid);
285
-        } catch (midcom_error $e) {
287
+        }
288
+        catch (midcom_error $e) {
286 289
             $this->_customer = new org_openpsa_contacts_person_dba($guid);
287 290
         }
288 291
         $data['customer'] = $this->_customer;
Please login to merge, or discard this patch.