Completed
Pull Request — master (#195)
by
unknown
29:31 queued 14:30
created
lib/org/openpsa/directmarketing/exec/cleanup.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
     echo "            <th>{$type}</th>\n";
35 35
     echo "            <td style=\"text-align: right;\">" . number_format($count) . "</td>\n";
36 36
     if (isset($cleanups_kept[$type])) {
37
-        echo "            <td style=\"text-align: right;\">" . number_format($cleanups_kept[$type]) ."</td>\n";
37
+        echo "            <td style=\"text-align: right;\">" . number_format($cleanups_kept[$type]) . "</td>\n";
38 38
     }
39 39
     echo "        </tr>\n";
40 40
 }
Please login to merge, or discard this patch.
src/midcom/events/watcher.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,8 @@
 block discarded – undo
48 48
 
49 49
         try {
50 50
             $interface = \midcom::get()->componentloader->get_interface_class($this->component);
51
-        } catch (\midcom_error $e) {
51
+        }
52
+        catch (\midcom_error $e) {
52 53
             debug_add("Failed to load the component {$this->component}: " . $e->getMessage(), MIDCOM_LOG_INFO);
53 54
             return;
54 55
         }
Please login to merge, or discard this patch.
src/midcom/workflow/dialog.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
         $button_config[MIDCOM_TOOLBAR_URL] = $url;
74 74
         //The constants are numeric, so array_merge won't work...
75 75
         foreach ($options as $key => $value) {
76
-            if (   is_array($value)
76
+            if (is_array($value)
77 77
                 && !empty($button_config[$key])) {
78 78
                 $value = array_merge($button_config[$key], $value);
79 79
             }
Please login to merge, or discard this patch.
src/midcom/datamanager/storage/container/dbacontainer.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -65,8 +65,8 @@
 block discarded – undo
65 65
     private function prepare_field(array $config)
66 66
     {
67 67
         if (   empty($config['storage']['location'])
68
-               // This line is needed because a parameter default is set by the schema parser and then ignored
69
-               // by the type. The things we do for backwards compatibility...
68
+                // This line is needed because a parameter default is set by the schema parser and then ignored
69
+                // by the type. The things we do for backwards compatibility...
70 70
             || $config['storage']['location'] === 'parameter') {
71 71
             if (class_exists('midcom\datamanager\storage\\' . $config['type'])) {
72 72
                 $classname = 'midcom\datamanager\storage\\' . $config['type'];
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
             }
33 33
             $config['name'] = $name;
34 34
             $field = $this->prepare_field($config);
35
-            if (   isset($config['default'])
35
+            if (isset($config['default'])
36 36
                 && (!$this->object->id || $field instanceof transientnode)) {
37 37
                 $field->set_value($config['default']);
38 38
             }
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
      */
65 65
     private function prepare_field(array $config)
66 66
     {
67
-        if (   empty($config['storage']['location'])
67
+        if (empty($config['storage']['location'])
68 68
                // This line is needed because a parameter default is set by the schema parser and then ignored
69 69
                // by the type. The things we do for backwards compatibility...
70 70
             || $config['storage']['location'] === 'parameter') {
Please login to merge, or discard this patch.
lib/net/nehmer/blog/handler/view.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -218,7 +218,8 @@
 block discarded – undo
218 218
         if ($this->_config->get('comments_topic')) {
219 219
             try {
220 220
                 $comments_topic = new midcom_db_topic($this->_config->get('comments_topic'));
221
-            } catch (midcom_error $e) {
221
+            }
222
+            catch (midcom_error $e) {
222 223
                 return false;
223 224
             }
224 225
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
             ]);
45 45
         }
46 46
 
47
-        if (   $this->_article->topic === $this->_topic->id
47
+        if ($this->_article->topic === $this->_topic->id
48 48
             && $this->_article->can_do('midgard:delete')) {
49 49
             $delete = $this->get_workflow('delete', ['object' => $this->_article]);
50 50
             $buttons[] = $delete->get_button("delete/{$this->_article->guid}/");
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
         if ($this->_config->get('comments_enable')) {
97 97
             if ($comments_node = $this->_seek_comments()) {
98 98
                 $this->_request_data['comments_url'] = $comments_node[MIDCOM_NAV_RELATIVEURL] . "comment/{$this->_article->guid}";
99
-                if (   $this->_topic->can_do('midgard:update')
99
+                if ($this->_topic->can_do('midgard:update')
100 100
                     && $this->_topic->can_do('net.nehmer.comments:moderation')) {
101 101
                     net_nehmer_comments_viewer::add_head_elements();
102 102
                 }
Please login to merge, or discard this patch.
lib/org/openpsa/mail/exec/test-html.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.
web/rootfile.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
     include dirname(__DIR__) . '/config-default.inc.php';
24 24
 }
25 25
 
26
-if (! defined('MIDCOM_STATIC_URL')) {
26
+if (!defined('MIDCOM_STATIC_URL')) {
27 27
     define('MIDCOM_STATIC_URL', '/midcom-static');
28 28
 }
29 29
 
Please login to merge, or discard this patch.
lib/org/openpsa/invoices/billing/data.php 3 patches
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -77,7 +77,8 @@  discard block
 block discarded – undo
77 77
             // if the property useContactAddress is set
78 78
             $billing_data[0]->set_address();
79 79
             return $billing_data[0];
80
-        } catch (midcom_error $e) {
80
+        }
81
+        catch (midcom_error $e) {
81 82
             $e->log();
82 83
             return false;
83 84
         }
@@ -122,10 +123,12 @@  discard block
 block discarded – undo
122 123
     {
123 124
         try {
124 125
             return new org_openpsa_contacts_person_dba($this->linkGuid);
125
-        } catch (midcom_error $e) {
126
+        }
127
+        catch (midcom_error $e) {
126 128
             try {
127 129
                 return new org_openpsa_contacts_group_dba($this->linkGuid);
128
-            } catch (midcom_error $e) {
130
+            }
131
+            catch (midcom_error $e) {
129 132
                 debug_add("Failed to load contact with GUID: " . $this->linkGuid . " - last error:" . $e->getMessage(), MIDCOM_LOG_ERROR);
130 133
                 return false;
131 134
             }
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
     public static function get_by_object(org_openpsa_invoices_interfaces_customer $object)
42 42
     {
43 43
         if (   !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer))
44
-               // check if the customerContact is set and has invoice_data
44
+                // check if the customerContact is set and has invoice_data
45 45
             && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) {
46 46
             $bd = new org_openpsa_invoices_billing_data_dba();
47 47
             $due = midcom_baseclasses_components_configuration::get('org.openpsa.invoices', 'config')->get('default_due_days');
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
      */
41 41
     public static function get_by_object(org_openpsa_invoices_interfaces_customer $object)
42 42
     {
43
-        if (   !($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer))
43
+        if (!($bd = self::get_billing_data(org_openpsa_contacts_group_dba::class, $object->customer))
44 44
                // check if the customerContact is set and has invoice_data
45 45
             && !($bd = self::get_billing_data(org_openpsa_contacts_person_dba::class, $object->customerContact))) {
46 46
             $bd = new org_openpsa_invoices_billing_data_dba();
Please login to merge, or discard this patch.
lib/org/openpsa/invoices/handler/invoice/action.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,8 @@
 block discarded – undo
48 48
         try {
49 49
             $pdf_helper->render_and_attach();
50 50
             return $this->reply(true, $this->_l10n->get('pdf created'));
51
-        } catch (midcom_error $e) {
51
+        }
52
+        catch (midcom_error $e) {
52 53
             return $this->reply(false, $this->_l10n->get('pdf creation failed') . ': ' . $e->getMessage());
53 54
         }
54 55
     }
Please login to merge, or discard this patch.