Completed
Pull Request — master (#198)
by
unknown
19:02
created
lib/org/openpsa/invoices/handler/invoice/view.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -63,12 +63,12 @@  discard block
 block discarded – undo
63 63
             foreach ($vat_array as $vat) {
64 64
                 $vat_values[$vat] = "{$vat}%";
65 65
             }
66
-            $vat_field =& $schemadb->get('default')->get_field('vat');
66
+            $vat_field = & $schemadb->get('default')->get_field('vat');
67 67
             $vat_field['type_config']['options'] = $vat_values;
68 68
         }
69 69
 
70 70
         if ($this->_config->get('invoice_pdfbuilder_class')) {
71
-            $pdf_field =& $schemadb->get('default')->get_field('pdf_file');
71
+            $pdf_field = & $schemadb->get('default')->get_field('pdf_file');
72 72
             $pdf_field['hidden'] = false;
73 73
         }
74 74
 
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 
113 113
             // sending per email enabled in billing data?
114 114
             $billing_data = org_openpsa_invoices_billing_data_dba::get_by_object($this->invoice);
115
-            if (    !$this->invoice->sent
115
+            if (!$this->invoice->sent
116 116
                  && intval($billing_data->sendingoption) == 2) {
117 117
                 $buttons[] = $this->build_button('send_by_mail', 'paper-plane');
118 118
             }
Please login to merge, or discard this patch.
lib/org/openpsa/httplib/main.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
         $request = $request->withHeader('User-Agent', 'Midgard/' . substr(mgd_version(), 0, 4));
112 112
 
113 113
         // Handle basic auth
114
-        if (   !empty($username)
114
+        if (!empty($username)
115 115
             && !empty($password)) {
116 116
             // Set basic auth
117 117
             $request = $request->withHeader('Authorization', 'Basic ' . base64_encode($username . ':' . $password));
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -121,7 +121,8 @@
 block discarded – undo
121 121
 
122 122
         try {
123 123
             $response = $client->send($request);
124
-        } catch (Exception $e) {
124
+        }
125
+        catch (Exception $e) {
125 126
             $this->error = $e->getMessage();
126 127
             debug_add("Got error '{$this->error}' from HTTP request", MIDCOM_LOG_INFO);
127 128
             return false;
Please login to merge, or discard this patch.
lib/org/openpsa/projects/handler/task/view.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -115,7 +115,8 @@
 block discarded – undo
115 115
                         MIDCOM_TOOLBAR_GLYPHICON => 'money',
116 116
                     ];
117 117
                 }
118
-            } catch (midcom_error $e) {
118
+            }
119
+            catch (midcom_error $e) {
119 120
             }
120 121
         }
121 122
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
             MIDCOM_TOOLBAR_ACCESSKEY => 'e',
68 68
         ]);
69 69
 
70
-        if (   $this->task->reportedHours == 0
70
+        if ($this->task->reportedHours == 0
71 71
             && $this->task->can_do('midgard:delete')) {
72 72
             $delete_workflow = $this->get_workflow('delete', ['object' => $this->task]);
73 73
             $buttons[] = $delete_workflow->get_button($this->router->generate('task_delete', ['guid' => $this->task->guid]));
Please login to merge, or discard this patch.
lib/net/nehmer/comments/viewer.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     public function _on_handle($handler, array $args)
28 28
     {
29 29
         $buttons = [];
30
-        if (   $this->_topic->can_do('midgard:update')
30
+        if ($this->_topic->can_do('midgard:update')
31 31
             && $this->_topic->can_do('midcom:component_config')) {
32 32
             $workflow = $this->get_workflow('datamanager');
33 33
             $buttons[] = $workflow->get_button('config/', [
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
                 MIDCOM_TOOLBAR_GLYPHICON => 'wrench',
36 36
             ]);
37 37
         }
38
-        if (   $this->_topic->can_do('midgard:update')
38
+        if ($this->_topic->can_do('midgard:update')
39 39
             && $this->_topic->can_do('net.nehmer.comments:moderation')) {
40 40
             $buttons[] = [
41 41
                 MIDCOM_TOOLBAR_URL => 'moderate/reported_abuse/',
Please login to merge, or discard this patch.
lib/midcom/admin/folder/style/midcom-admin-folder-order-type.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 $count = count($data['navigation_items']);
5 5
 
6 6
 foreach ($data['navigation_items'] as $i => $item) {
7
-    if (   isset($item[MIDCOM_NAV_SORTABLE])
7
+    if (isset($item[MIDCOM_NAV_SORTABLE])
8 8
         && !$item[MIDCOM_NAV_SORTABLE]) {
9 9
         continue;
10 10
     }
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
     }
20 20
 
21 21
     // Actually we should skip all components that return the default icon as icon here!
22
-    if (   isset($item[MIDCOM_NAV_COMPONENT])
22
+    if (isset($item[MIDCOM_NAV_COMPONENT])
23 23
         && $item[MIDCOM_NAV_COMPONENT] !== 'net.nehmer.static'
24 24
         && $item[MIDCOM_NAV_COMPONENT] !== 'net.nehmer.blog'
25 25
         && ($tmp = midcom::get()->componentloader->get_component_icon($item[MIDCOM_NAV_COMPONENT], false))) {
Please login to merge, or discard this patch.
lib/org/openpsa/expenses/handler/index.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -114,7 +114,8 @@  discard block
 block discarded – undo
114 114
         foreach ($hours as $guid => $row) {
115 115
             try {
116 116
                 $task = org_openpsa_projects_task_dba::get_cached($row['task']);
117
-            } catch (midcom_error $e) {
117
+            }
118
+            catch (midcom_error $e) {
118 119
                 // Task couldn't be loaded, probably because of ACL
119 120
                 continue;
120 121
             }
@@ -127,7 +128,8 @@  discard block
 block discarded – undo
127 128
                     $person_object = org_openpsa_contacts_person_dba::get_cached($row['person']);
128 129
                     $person_label = $this->_get_list_link($person_object->name, null, null, $row['person']);
129 130
                     $person_name = $person_object->name;
130
-                } catch (midcom_error $e) {
131
+                }
132
+                catch (midcom_error $e) {
131 133
                     $person_label = $this->_l10n->get('no person');
132 134
                     $person_name = '';
133 135
                 }
Please login to merge, or discard this patch.
lib/net/nemein/redirector/handler/redirect.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
 
36 36
         // Catch first the configuration option for showing editing interface instead
37 37
         // of redirecting administrators
38
-        if (   $this->_topic->can_do('net.nemein.redirector:noredirect')
38
+        if ($this->_topic->can_do('net.nemein.redirector:noredirect')
39 39
             && !$this->_config->get('admin_redirection')) {
40 40
             return new midcom_response_relocate("{$this->_topic->name}/edit/{$args[0]}/");
41 41
         }
Please login to merge, or discard this patch.
lib/midcom/baseclasses/components/handler.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -108,12 +108,12 @@
 block discarded – undo
108 108
         $this->_master = $master;
109 109
         $this->router = $router;
110 110
 
111
-        $this->_request_data =& $master->_request_data;
111
+        $this->_request_data = & $master->_request_data;
112 112
         $this->_topic = $master->_topic;
113 113
 
114 114
         // Load component specific stuff, special treatment if the handler has
115 115
         // a component different than the master handler set.
116
-        if (   $this->_component
116
+        if ($this->_component
117 117
             && $this->_component != $master->_component) {
118 118
             $this->_config->store_from_object($this->_topic, $this->_component, true);
119 119
         } else {
Please login to merge, or discard this patch.
lib/midcom/helper/search/style/basic_form.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,13 +5,13 @@
 block discarded – undo
5 5
 ?>
6 6
 <form method='get' name='midcom_helper_search_form' action='&(action);' class='midcom.helper.search'>
7 7
 <label for="midcom_helper_search_query">
8
-<?php echo $data['l10n']->get('query');?>:
8
+<?php echo $data['l10n']->get('query'); ?>:
9 9
 <input type='text' size='60' name='query' id='midcom_helper_search_query' value=&(query:h); />
10 10
 </label>
11 11
 <input type='hidden' name='type' value='basic' />
12 12
 <input type='hidden' name='page' value='1' />
13
-<input type='submit' name='submit' value='<?php echo $data['l10n']->get('search');?>' />
13
+<input type='submit' name='submit' value='<?php echo $data['l10n']->get('search'); ?>' />
14 14
 </form>
15 15
 <p>
16
-  <a href="&(advanced);&(data['params']);"><?php echo $data['l10n']->get('advanced search');?></a>
16
+  <a href="&(advanced);&(data['params']);"><?php echo $data['l10n']->get('advanced search'); ?></a>
17 17
 </p>
18 18
\ No newline at end of file
Please login to merge, or discard this patch.