Completed
Branch master (4f76a2)
by Andreas
22:32
created
lib/org/openpsa/calendar/event/resource.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,8 @@
 block discarded – undo
42 42
         }
43 43
         try {
44 44
             $resource = org_openpsa_calendar_resource_dba::get_cached($this->resource);
45
-        } catch (midcom_error $e) {
45
+        }
46
+        catch (midcom_error $e) {
46 47
             debug_add("Cannot fetch resource #{$this->resource} returning false", MIDCOM_LOG_INFO);
47 48
             return false;
48 49
         }
Please login to merge, or discard this patch.
lib/org/openpsa/invoices/invoice/item.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -66,7 +66,8 @@  discard block
 block discarded – undo
66 66
             try {
67 67
                 $task = org_openpsa_projects_task_dba::get_cached($this->task);
68 68
                 $url = $projects_url . 'task/' . $task->guid . '/';
69
-            } catch (midcom_error $e) {
69
+            }
70
+            catch (midcom_error $e) {
70 71
             }
71 72
         }
72 73
         if (   $url == ''
@@ -74,7 +75,8 @@  discard block
 block discarded – undo
74 75
             try {
75 76
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($this->deliverable);
76 77
                 $url = $sales_url . 'deliverable/' . $deliverable->guid . '/';
77
-            } catch (midcom_error $e) {
78
+            }
79
+            catch (midcom_error $e) {
78 80
             }
79 81
         }
80 82
         if ($url != '') {
@@ -96,7 +98,8 @@  discard block
 block discarded – undo
96 98
                     $deliverable = new org_openpsa_sales_salesproject_deliverable_dba($this->deliverable);
97 99
                     self::update_deliverable($deliverable);
98 100
                 }
99
-            } catch (midcom_error $e) {
101
+            }
102
+            catch (midcom_error $e) {
100 103
                 $e->log();
101 104
             }
102 105
         }
Please login to merge, or discard this patch.
lib/org/openpsa/mail/backend/bouncer.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,8 @@
 block discarded – undo
23 23
         foreach ($this->_try_backends as $backend) {
24 24
             try {
25 25
                 $this->_backend = org_openpsa_mail_backend::get($backend, $params);
26
-            } catch (midcom_error $e) {
26
+            }
27
+            catch (midcom_error $e) {
27 28
                 debug_add('Failed to load backend ' . $backend . ', message:' . $e->getMessage());
28 29
             }
29 30
         }
Please login to merge, or discard this patch.
lib/org/openpsa/mail/backend.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,7 +42,8 @@  discard block
 block discarded – undo
42 42
                     $object = self::_load_backend($backend, $params);
43 43
                     debug_add('Using backend ' . $backend);
44 44
                     return $object;
45
-                } catch (midcom_error $e) {
45
+                }
46
+                catch (midcom_error $e) {
46 47
                     debug_add('Failed to load backend ' . $backend . ', message:' . $e->getMessage());
47 48
                 }
48 49
             }
@@ -67,7 +68,8 @@  discard block
 block discarded – undo
67 68
             $ret = $this->mail($message);
68 69
             $this->error = false;
69 70
             return $ret;
70
-        } catch (Exception $e) {
71
+        }
72
+        catch (Exception $e) {
71 73
             $this->error = $e->getMessage();
72 74
             return false;
73 75
         }
Please login to merge, or discard this patch.
lib/org/openpsa/slideshow/image.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,7 +41,8 @@  discard block
 block discarded – undo
41 41
 
42 42
         try {
43 43
             $folder = midcom_db_topic::get_cached($this->topic);
44
-        } catch (midcom_error $e) {
44
+        }
45
+        catch (midcom_error $e) {
45 46
             $e->log();
46 47
         }
47 48
         $folder->delete_attachment(self::FOLDER_THUMBNAIL);
@@ -51,7 +52,8 @@  discard block
 block discarded – undo
51 52
     {
52 53
         try {
53 54
             return new midcom_db_attachment($this->$type);
54
-        } catch (midcom_error $e) {
55
+        }
56
+        catch (midcom_error $e) {
55 57
             $e->log();
56 58
             return false;
57 59
         }
Please login to merge, or discard this patch.
lib/org/openpsa/contacts/cron/duplicates/clean.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,8 @@
 block discarded – undo
35 35
                 try {
36 36
                     midcom::get()->dbfactory->get_object_by_guid($param->name);
37 37
                     $tried[$param->name] = true;
38
-                } catch (midcom_error $e) {
38
+                }
39
+                catch (midcom_error $e) {
39 40
                     $tried[$param->name] = false;
40 41
                 }
41 42
             }
Please login to merge, or discard this patch.
lib/org/openpsa/user/midcom/interfaces.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,8 @@  discard block
 block discarded – undo
25 25
         midcom::get()->auth->request_sudo($this->_component);
26 26
         try {
27 27
             $person = new midcom_db_person($args['guid']);
28
-        } catch (midcom_error $e) {
28
+        }
29
+        catch (midcom_error $e) {
29 30
             $handler->print_error('Person with guid #' . $args['guid'] . ' does not exist');
30 31
             midcom::get()->auth->drop_sudo();
31 32
             return false;
@@ -33,7 +34,8 @@  discard block
 block discarded – undo
33 34
         $accounthelper = new org_openpsa_user_accounthelper($person);
34 35
         try {
35 36
             $accounthelper->reopen_account();
36
-        } catch (midcom_error $e) {
37
+        }
38
+        catch (midcom_error $e) {
37 39
             $handler->print_error($e->getMessage());
38 40
             midcom::get()->auth->drop_sudo();
39 41
             return false;
Please login to merge, or discard this patch.
lib/midcom/db/member.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,7 +23,8 @@  discard block
 block discarded – undo
23 23
         try {
24 24
             $person = new midcom_db_person($this->uid);
25 25
             $grp = new midcom_db_group($this->gid);
26
-        } catch (midcom_error $e) {
26
+        }
27
+        catch (midcom_error $e) {
27 28
             $e->log();
28 29
             return 'Invalid membership record';
29 30
         }
@@ -40,7 +41,8 @@  discard block
 block discarded – undo
40 41
         }
41 42
         try {
42 43
             $person = new midcom_db_person($this->uid);
43
-        } catch (midcom_error $e) {
44
+        }
45
+        catch (midcom_error $e) {
44 46
             return;
45 47
         }
46 48
         midcom::get()->cache->invalidate($person->guid);
Please login to merge, or discard this patch.
lib/midcom/helper/toolbar/node.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,8 @@
 block discarded – undo
88 88
                         $style = midcom_db_style::get_cached($style_id);
89 89
                         $styleeditor_url = midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$style->guid}/";
90 90
                         $enabled = true;
91
-                    } catch (midcom_error $e) {
91
+                    }
92
+                    catch (midcom_error $e) {
92 93
                         $e->log();
93 94
                     }
94 95
                 }
Please login to merge, or discard this patch.