flack / openpsa

lib/org/openpsa/contacts/handler/duplicates/person.php

Braces +4 added lines, -2 removed lines

@@ -66,7 +66,8 @@ 
             try {
                 $person1 = new org_openpsa_contacts_person_dba($param->parentguid);
                 $person2 = new org_openpsa_contacts_person_dba($param->name);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $i++;
                 continue;
             }
@@ -137,7 +138,8 @@ 
                 try {
                     $merger = new org_openpsa_contacts_duplicates_merge('person', $this->_config);
                     $merger->merge_delete($person1, $person2);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     // TODO: Localize
                     midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.contacts'), 'Merge failed, errstr: ' . $e->getMessage(), 'error');
                 }

lib/org/openpsa/documents/elFinderVolumeOpenpsa.php

Braces +10 added lines, -5 removed lines

@@ -82,7 +82,8 @@ 
         $file = $this->stat($test);
         $this->clearcache();
 
-        if ($file && $file['name'] === $name) { // file exists and check filename for item ID based filesystem
+        if ($file && $file['name'] === $name) {
+// file exists and check filename for item ID based filesystem
             // check POST data `overwrite` for 3rd party uploader
             $overwrite = isset($_POST['overwrite'])? (bool)$_POST['overwrite'] : $this->options['uploadOverwrite'];
             if ($overwrite) {
@@ -135,11 +136,13 @@ 
     {
         try {
             return org_openpsa_documents_document_dba::get_cached($path);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             try {
                 return org_openpsa_documents_directory::get_cached($path);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -275,7 +278,8 @@ 
         $object = midcom::get()->dbfactory->get_object_by_guid($path);
         try {
             $parentdir = org_openpsa_documents_directory::get_cached($parent);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }
@@ -571,7 +575,8 @@ 
         try {
             $doc = new org_openpsa_documents_document_dba($path);
             return $doc->delete();
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return false;
         }
     }

lib/org/openpsa/expenses/handler/index.php

Braces +6 added lines, -3 removed lines

@@ -32,7 +32,8 @@ 
         }
         try {
             $date = new DateTime($requested_time);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             return false;
         }
         $offset = $date->format('N') - 1;
@@ -119,7 +120,8 @@ 
         foreach ($hours as $guid => $row) {
             try {
                 $task = org_openpsa_projects_task_dba::get_cached($row['task']);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 // Task couldn't be loaded, probably because of ACL
                 continue;
             }
@@ -132,7 +134,8 @@ 
                     $person_object = org_openpsa_contacts_person_dba::get_cached($row['person']);
                     $person_label = $this->_get_list_link($person_object->name, null, null, $row['person']);
                     $person_name = $person_object->name;
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $person_label = $this->_l10n->get('no person');
                     $person_name = '';
                 }

lib/org/openpsa/calendar/conflictmanager.php

Braces +4 added lines, -2 removed lines

@@ -196,7 +196,8 @@ 
             try {
                 $event = new org_openpsa_calendar_event_dba($member->event);
                 $set_as_modified = true;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("event_resource #{$member->id} links ot bogus event #{$member->event}, skipping and removing", MIDCOM_LOG_WARN);
                 $member->delete();
                 return;
@@ -224,7 +225,8 @@ 
 
         try {
             $event = new org_openpsa_calendar_event_dba($member->eid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add("eventmember #{$member->id} links to bogus event #{$member->eid}, skipping and removing", MIDCOM_LOG_WARN);
             $member->delete();
             return;

lib/midcom/helper/imagefilter.php

Braces +4 added lines, -2 removed lines

@@ -380,7 +380,8 @@ 
         try {
             $cmd = midcom::get()->config->get('utility_imagemagick_base') . "identify " . escapeshellarg($filename);
             $this->_run_command($cmd);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return false;
         }
         return true;
@@ -406,7 +407,8 @@ 
                 debug_add("EXIF information missing or without orientation tag. Skipping.", MIDCOM_LOG_INFO);
                 return;
             }
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Could not read EXIF data: " . $e->getMessage() . ", skipping.", MIDCOM_LOG_WARN);
             return;
         }

lib/midcom/helper/_dbfactory.php

Braces +8 added lines, -4 removed lines

@@ -44,7 +44,8 @@ 
     {
         try {
             $tmp = midgard_object_class::get_object_by_guid($guid);
-        } catch (midgard_error_exception $e) {
+        }
+        catch (midgard_error_exception $e) {
             debug_add('Loading object by GUID ' . $guid . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_INFO);
 
             throw new midcom_error_midgard($e, $guid);
@@ -274,7 +275,8 @@ 
                 $parent_data = array(
                     $parent->__midcom_class_name__ => $parent_guid
                 );
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $parent_data = array(
                     '' => null
                 );
@@ -288,7 +290,8 @@ 
 
         try {
             return $this->get_cached($classname, $parent_guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return null;
         }
     }
@@ -347,7 +350,8 @@ 
                 if ($the_object === null) {
                     try {
                         $the_object = $this->get_object_by_guid($object_guid);
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         return array('' => null);
                     }
                 }

lib/midcom/helper/datamanager2/type/images.php

Braces +2 added lines, -1 removed lines

@@ -737,7 +737,8 @@
             $iterator = new RecursiveIteratorIterator($dir);
             // ignore backup files
             return new RegexIterator($iterator, '/[^~]$/i');
-        } catch (UnexpectedValueException $e) {
+        }
+        catch (UnexpectedValueException $e) {
             debug_add("failed to create iterator:" . $e->getMessage(), MIDCOM_LOG_ERROR);
             return array();
         }

lib/midcom/helper/datamanager2/type/image.php

Braces +6 added lines, -3 removed lines

@@ -364,7 +364,8 @@ 
         $filter = new midcom_helper_imagefilter($this->attachments[$identifier]);
         try {
             $filter->process_chain($filterchain);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             midcom::get()->uimessages->add('midcom.helper.imagefilter', $e->getMessage(), 'error');
             $e->log();
             return false;
@@ -529,7 +530,8 @@ 
             if ($filter_chain) {
                 try {
                     $this->_filter->process_chain($filter_chain);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     midcom::get()->uimessages->add('midcom.helper.imagefilter', $e->getMessage(), 'error');
                     $e->log();
                     return false;
@@ -620,7 +622,8 @@ 
 
         try {
             $this->_filter->convert($conversion);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }

lib/midcom/helper/reflector/main.php

Braces +4 added lines, -2 removed lines

@@ -240,7 +240,8 @@ 
             // Not a MidCOM DBA object
             try {
                 $obj = midcom::get()->dbfactory->convert_midgard_to_midcom($object);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return false;
             }
         } else {
@@ -705,7 +706,8 @@ 
         }
         try {
             self::$_cache['name'][$key] = self::get($object)->get_name_property_nonstatic($object);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add('Could not get reflector instance for class ' . $key . ': ' . $e->getMessage(), MIDCOM_LOG_ERROR);
             self::$_cache['name'][$key] = null;
         }