Passed
Pull Request — master (#204)
by
unknown
23:41
created
lib/org/openpsa/calendar/conflictmanager.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -195,7 +195,8 @@  discard block
 block discarded – undo
195 195
             try {
196 196
                 $event = new org_openpsa_calendar_event_dba($member->event);
197 197
                 $set_as_modified = true;
198
-            } catch (midcom_error $e) {
198
+            }
199
+            catch (midcom_error $e) {
199 200
                 debug_add("event_resource #{$member->id} links to bogus event #{$member->event}, skipping and removing", MIDCOM_LOG_WARN);
200 201
                 $member->delete();
201 202
                 return;
@@ -223,7 +224,8 @@  discard block
 block discarded – undo
223 224
 
224 225
         try {
225 226
             $event = new org_openpsa_calendar_event_dba($member->eid);
226
-        } catch (midcom_error $e) {
227
+        }
228
+        catch (midcom_error $e) {
227 229
             debug_add("eventmember #{$member->id} links to bogus event #{$member->eid}, skipping and removing", MIDCOM_LOG_WARN);
228 230
             $member->delete();
229 231
             return;
Please login to merge, or discard this patch.
src/midcom/datamanager/extension/subscriber/purifySubscriber.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,8 @@
 block discarded – undo
72 72
         $data = $event->getData();
73 73
         try {
74 74
             $data = $purifier->purify($data);
75
-        } catch (\Exception $e) {
75
+        }
76
+        catch (\Exception $e) {
76 77
             debug_add("HTML Purifier failed: " . $e->getMessage(), MIDCOM_LOG_WARN);
77 78
         }
78 79
         $event->setData($data);
Please login to merge, or discard this patch.
src/midcom/datamanager/extension/type/autocompleteType.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -132,7 +132,8 @@
 block discarded – undo
132 132
                 try {
133 133
                     $object = call_user_func([$options['widget_config']['class'], 'get_cached'], $identifier);
134 134
                     $preset[$identifier] = autocomplete_helper::create_item_label($object, $options['widget_config']['result_headers'], $options['widget_config']['titlefield']);
135
-                } catch (midcom_error $e) {
135
+                }
136
+                catch (midcom_error $e) {
136 137
                     $e->log();
137 138
                 }
138 139
             }
Please login to merge, or discard this patch.
lib/org/openpsa/documents/elFinderVolumeOpenpsa.php 1 patch
Braces   +10 added lines, -5 removed lines patch added patch discarded remove patch
@@ -85,7 +85,8 @@  discard block
 block discarded – undo
85 85
 
86 86
         $this->clearcache();
87 87
 
88
-        if ($file && $file['name'] === $name) { // file exists and check filename for item ID based filesystem
88
+        if ($file && $file['name'] === $name) {
89
+// file exists and check filename for item ID based filesystem
89 90
             if ($this->uploadOverwrite) {
90 91
                 if (!$file['write']) {
91 92
                     return $this->setError(elFinder::ERROR_PERM_DENIED);
@@ -142,11 +143,13 @@  discard block
 block discarded – undo
142 143
     {
143 144
         try {
144 145
             return org_openpsa_documents_document_dba::get_cached($path);
145
-        } catch (midcom_error $e) {
146
+        }
147
+        catch (midcom_error $e) {
146 148
             $e->log();
147 149
             try {
148 150
                 return org_openpsa_documents_directory::get_cached($path);
149
-            } catch (midcom_error $e) {
151
+            }
152
+            catch (midcom_error $e) {
150 153
                 $e->log();
151 154
             }
152 155
         }
@@ -282,7 +285,8 @@  discard block
 block discarded – undo
282 285
         $object = midcom::get()->dbfactory->get_object_by_guid($path);
283 286
         try {
284 287
             $parentdir = org_openpsa_documents_directory::get_cached($parent);
285
-        } catch (midcom_error $e) {
288
+        }
289
+        catch (midcom_error $e) {
286 290
             $e->log();
287 291
             return false;
288 292
         }
@@ -579,7 +583,8 @@  discard block
 block discarded – undo
579 583
         try {
580 584
             $doc = new org_openpsa_documents_document_dba($path);
581 585
             return $doc->delete();
582
-        } catch (midcom_error $e) {
586
+        }
587
+        catch (midcom_error $e) {
583 588
             return false;
584 589
         }
585 590
     }
Please login to merge, or discard this patch.
lib/net/nemein/wiki/wikipage.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -193,7 +193,8 @@
 block discarded – undo
193 193
 
194 194
         try {
195 195
             $diff_fields = $rcs_handler->get_diff($prev_version, $this_version);
196
-        } catch (midcom_error $e) {
196
+        }
197
+        catch (midcom_error $e) {
197 198
             $e->log();
198 199
             return '';
199 200
         }
Please login to merge, or discard this patch.
lib/org/openpsa/slideshow/handler/edit.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -134,7 +134,8 @@
 block discarded – undo
134 134
         try {
135 135
             $this->$function($request->request);
136 136
             $this->_response->success = true;
137
-        } catch (midcom_error $e) {
137
+        }
138
+        catch (midcom_error $e) {
138 139
             $this->_response->success = false;
139 140
             $this->_response->error = $e->getMessage();
140 141
         }
Please login to merge, or discard this patch.
lib/org/openpsa/projects/handler/task/crud.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,8 @@
 block discarded – undo
138 138
         try {
139 139
             $parent = new org_openpsa_projects_project($task->project);
140 140
             $options['success_url'] = $this->router->generate('project', ['guid' => $parent->guid]);
141
-        } catch (midcom_error $e) {
141
+        }
142
+        catch (midcom_error $e) {
142 143
             $e->log();
143 144
         }
144 145
 
Please login to merge, or discard this patch.
lib/org/openpsa/directmarketing/handler/subscriber.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,7 +36,8 @@  discard block
 block discarded – undo
36 36
             // Add person to campaign
37 37
             try {
38 38
                 $campaign = new org_openpsa_directmarketing_campaign_dba($add_to);
39
-            } catch (midcom_error $e) {
39
+            }
40
+            catch (midcom_error $e) {
40 41
                 // FIXME: More informative error message
41 42
                 $this->notify('Failed adding person %s to campaign %s', $add_to, 'error');
42 43
                 return;
@@ -86,7 +87,8 @@  discard block
 block discarded – undo
86 87
             try {
87 88
                 $campaigns[$membership->campaign] = new org_openpsa_directmarketing_campaign_dba($membership->campaign);
88 89
                 $campaign_membership_map[$membership->campaign] = $membership;
89
-            } catch (midcom_error $e) {
90
+            }
91
+            catch (midcom_error $e) {
90 92
                 debug_add('Failed to load campaign ' . $membership->campaign . ', reason: ' . $e->getMessage());
91 93
             }
92 94
         }
Please login to merge, or discard this patch.
lib/org/openpsa/directmarketing/handler/campaign/rules.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,8 @@
 block discarded – undo
105 105
         if ($request->request->has('midcom_helper_datamanager2_save')) {
106 106
             try {
107 107
                 $rules = $this->_load_rules();
108
-            } catch (midcom_error $e) {
108
+            }
109
+            catch (midcom_error $e) {
109 110
                 midcom::get()->uimessages->add('org.openpsa.directmarketing', $this->_l10n->get($e->getMessage()), 'error');
110 111
                 return;
111 112
             }
Please login to merge, or discard this patch.