flack / openpsa

src/midcom/datamanager/indexer/document.php

Spacing +3 added lines, -3 removed lines

@@ -137,7 +137,7 @@ 
             $this->content .= "{$this->abstract}\n";
         }
 
-        if (! $this->title) {
+        if (!$this->title) {
             $this->title = $this->document_url;
         }
     }
@@ -178,7 +178,7 @@ 
                     if (!empty($field->vars['value'])) {
                         //only index the first attachment for now
                         $attachment = array_shift($field->vars['value']);
-                        if (   !$attachment instanceof \midcom_db_attachment
+                        if (!$attachment instanceof \midcom_db_attachment
                             && !empty($attachment['object'])) {
                             //This is the form edit case
                             //@todo: In create case, nothing is found currently
@@ -262,7 +262,7 @@ 
      */
     private function resolve_auto_method($name)
     {
-        if (   $name == 'abstract'
+        if ($name == 'abstract'
             || $name == 'title'
             || $name == 'author') {
             return $name;

lib/org/openpsa/directmarketing/handler/logger.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
         $qb = org_openpsa_directmarketing_campaign_messagereceipt_dba::new_query_builder();
         $qb->add_constraint('token', '=', $token);
         $qb->add_constraint('orgOpenpsaObtype', '=', $type);
-        $ret =  $qb->execute();
+        $ret = $qb->execute();
         debug_print_r("_qb_token_receipts({$token}) returned", $ret);
         if (empty($ret)) {
             midcom::get()->auth->drop_sudo();

lib/org/openpsa/directmarketing/handler/subscriber.php

Braces +4 added lines, -2 removed lines

@@ -34,7 +34,8 @@ 
             // Add person to campaign
             try {
                 $campaign = new org_openpsa_directmarketing_campaign_dba($_POST['add_to_campaign']);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 // FIXME: More informative error message
                 $this->notify('Failed adding person %s to campaign %s', $_POST['add_to_campaign'], 'error');
                 return;
@@ -87,7 +88,8 @@ 
             try {
                 $campaigns[$membership->campaign] = new org_openpsa_directmarketing_campaign_dba($membership->campaign);
                 $campaign_membership_map[$membership->campaign] = $membership;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add('Failed to load campaign ' . $membership->campaign . ', reason: ' . $e->getMessage());
             }
         }

lib/org/openpsa/sales/viewer.php

Braces +4 added lines, -2 removed lines

@@ -61,7 +61,8 @@ 
                     //check if related at_entry exists
                     try {
                         $notification_entry = new midcom_services_at_entry_dba($entry);
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         //relatedto links to a non-existing at_entry - so create a new one an link to it
                         $notification_entry = new midcom_services_at_entry_dba();
                         $notification_entry->create();
@@ -83,7 +84,8 @@ 
                     $notification_entry = new midcom_services_at_entry_dba($mc_entry->get_subkey($key, 'fromGuid'));
                     //check if related at_entry exists & delete it
                     $notification_entry->delete();
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                 }
             }

lib/org/openpsa/invoices/handler/projects.php

Braces +6 added lines, -3 removed lines

@@ -52,7 +52,8 @@ 
             try {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($task->agreement);
                 $item->deliverable = $deliverable->id;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
             $item->invoice = $invoice->id;
@@ -144,7 +145,8 @@ 
                 $customer = org_openpsa_contacts_group_dba::get_cached($customer_id);
                 $data['customer_label'] = $customer->official;
                 $data['disabled'] = '';
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $data['customer_label'] = $this->_l10n->get('no customer');
                 $data['disabled'] = ' disabled="disabled"';
             }
@@ -167,7 +169,8 @@ 
                     } else {
                         $data['invoiceable_units'] = $task->plannedHours;
                     }
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                     if ($this->_config->get('default_hourly_price')) {
                         $data['default_price'] = $this->_config->get('default_hourly_price');

lib/org/openpsa/relatedto/handler/relatedto.php

Braces +6 added lines, -3 removed lines

@@ -165,7 +165,8 @@ 
             );
             try {
                 $to_arr['other_obj'] = midcom::get()->dbfactory->get_object_by_guid($mc->get_subkey($guid, $object_prefix . 'Guid'));
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 continue;
             }
 
@@ -496,7 +497,8 @@ 
                 if (!($this->_object instanceof org_openpsa_relatedto_dba)) {
                     $response->status = "method '{$this->_mode}' requires guid of a link object as an argument";
                 }
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $response->status = "method '{$this->_mode}' requires guid of a link object as an argument";
             }
         }
@@ -533,7 +535,8 @@ 
             $relation = new org_openpsa_relatedto_dba($args[0]);
             $response->result = $relation->delete();
             $response->status = 'Last message: ' . midcom_connection::get_error_string();
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $response->result = false;
             $response->status = "Object '{$args[0]}' could not be loaded, error:" . $e->getMessage();
         }

Spacing +6 added lines, -6 removed lines

@@ -228,7 +228,7 @@ 
     private function _render_line(array $link, &$other_obj)
     {
         $this->_request_data['link'] = $link;
-        $this->_request_data['other_obj'] =& $other_obj;
+        $this->_request_data['other_obj'] = & $other_obj;
 
         $ref = midcom_helper_reflector::get($link['class']);
 
@@ -316,7 +316,7 @@ 
             //Calendar node found, render a better view
             $this->_request_data['raw_url'] = $url . 'event/raw/' . $other_obj->guid . '/';
             $workflow = $this->get_workflow('viewer');
-            $title = '<a href="' . $url . 'event/' . $other_obj->guid .  '/" ' . $workflow->render_attributes() . '>' . $title . "</a>\n";
+            $title = '<a href="' . $url . 'event/' . $other_obj->guid . '/" ' . $workflow->render_attributes() . '>' . $title . "</a>\n";
         }
 
         $this->_request_data['title'] = $title;
@@ -340,7 +340,7 @@ 
         $title = $other_obj->title;
 
         if ($url = $this->get_node_url('org.openpsa.projects')) {
-            $title = '<a href="' . $url . $type . '/' . $other_obj->guid  . '/" target="task_' . $other_obj->guid . '">' . $title . "</a>\n";
+            $title = '<a href="' . $url . $type . '/' . $other_obj->guid . '/" target="task_' . $other_obj->guid . '">' . $title . "</a>\n";
         }
         $this->_request_data['title'] = $title;
         $this->_request_data['type'] = $type;
@@ -358,7 +358,7 @@ 
         $title = $other_obj->title;
 
         if ($url = $this->get_node_url('org.openpsa.sales')) {
-            $title = '<a href="' . $url . 'salesproject/' . $other_obj->guid  . '/" target="salesproject_' . $other_obj->guid . '">' . $title . "</a>\n";
+            $title = '<a href="' . $url . 'salesproject/' . $other_obj->guid . '/" target="salesproject_' . $other_obj->guid . '">' . $title . "</a>\n";
         }
 
         $this->_request_data['title'] = $title;
@@ -376,7 +376,7 @@ 
         $title = $this->_i18n->get_string('invoice', 'org.openpsa.invoices') . ' ' . $other_obj->get_label();
 
         if ($url = $this->get_node_url('org.openpsa.invoices')) {
-            $title = '<a href="' . $url . 'invoice/' . $other_obj->guid  . '/" target="invoice_' . $other_obj->guid . '">' . $title . "</a>\n";
+            $title = '<a href="' . $url . 'invoice/' . $other_obj->guid . '/" target="invoice_' . $other_obj->guid . '">' . $title . "</a>\n";
         }
         $this->_request_data['title'] = $title;
 
@@ -422,7 +422,7 @@ 
     {
         echo "<ul class=\"relatedto_toolbar\" data-link-guid=\"{$link['guid']}\" data-other-guid=\"{$other_obj->guid}\">\n";
 
-        if (   $link['component'] == 'net.nemein.wiki'
+        if ($link['component'] == 'net.nemein.wiki'
             || $link['component'] == 'org.openpsa.calendar') {
             echo "<li><input type=\"button\" class=\"button info\" value=\"" . midcom::get()->i18n->get_string('details', 'org.openpsa.relatedto') . "\" /></li>\n";
         }

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');
                 }

Spacing +10 added lines, -10 removed lines

@@ -43,7 +43,7 @@ 
 
     private function load_next()
     {
-        $i =& $this->_request_data['loop_i'];
+        $i = & $this->_request_data['loop_i'];
         while ($i < 100) {
             debug_add("Loop iteration {$i}");
             $qb = new midgard_query_builder('midgard_parameter');
@@ -71,7 +71,7 @@ 
                 continue;
             }
             // Make sure we actually have enough rights to do this
-            if (   !$person1->can_do('midgard:update')
+            if (!$person1->can_do('midgard:update')
                 || !$person1->can_do('midgard:delete')
                 || !$person2->can_do('midgard:update')
                 || !$person2->can_do('midgard:delete')) {
@@ -80,14 +80,14 @@ 
                 continue;
             }
             // Extra sanity check (in case of semi-successful not-duplicate mark)
-            if (   $person1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person2->guid)
+            if ($person1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person2->guid)
                 || $person2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person1->guid)) {
                 debug_add("It seems these two (#{$person1->id} and #{$person2->id}) have also marked as not duplicates, some cleanup might be a good thing", MIDCOM_LOG_WARN);
                 $i++;
                 continue;
             }
 
-            $this->_request_data['probability'] = (float)$param->value;
+            $this->_request_data['probability'] = (float) $param->value;
             $this->_request_data['person1'] = $person1;
             $this->_request_data['person2'] = $person2;
             break;
@@ -96,7 +96,7 @@ 
 
     private function process_submit()
     {
-        if (   !empty($_POST['org_openpsa_contacts_handler_duplicates_person_keep'])
+        if (!empty($_POST['org_openpsa_contacts_handler_duplicates_person_keep'])
             && !empty($_POST['org_openpsa_contacts_handler_duplicates_person_options'])
             && count($_POST['org_openpsa_contacts_handler_duplicates_person_options']) == 2) {
             $option1 = new org_openpsa_contacts_person_dba($_POST['org_openpsa_contacts_handler_duplicates_person_options'][1]);
@@ -105,7 +105,7 @@ 
             if ($keep == 'both') {
                 $option1->require_do('midgard:update');
                 $option2->require_do('midgard:update');
-                if (   $option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
+                if ($option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
                     && $option2->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option1->guid, time())) {
                     // Clear the possible duplicate parameters
                     $option1->delete_parameter('org.openpsa.contacts.duplicates:possible_duplicate', $option2->guid);
@@ -123,11 +123,11 @@ 
                 }
             } else {
                 if ($keep == $option1->guid) {
-                    $person1 =& $option1;
-                    $person2 =& $option2;
+                    $person1 = & $option1;
+                    $person2 = & $option2;
                 } elseif ($keep == $option2->guid) {
-                    $person1 =& $option2;
-                    $person2 =& $option1;
+                    $person1 = & $option2;
+                    $person2 = & $option1;
                 } else {
                     throw new midcom_error('Something weird happened (basically we got bogus data)');
                 }

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;

Spacing +5 added lines, -5 removed lines

@@ -125,7 +125,7 @@ 
         }
         // TODO: Shared tasks need a separate check (different member object)
 
-        if (   !empty($this->busy_members)
+        if (!empty($this->busy_members)
             || !empty($this->busy_resources)) {
             //Unresolved conflicts (note return value is for conflicts not lack of them)
             midcom::get()->auth->drop_sudo();
@@ -138,7 +138,7 @@ 
             //These events have been robbed of (some of) their resources
             $creator = midcom_db_person::get_cached($event->metadata->creator);
             $other_participants = array_diff_key($event->participants, array($creator->id => true));
-            if (   count($other_participants) == 0
+            if (count($other_participants) == 0
                 && count($event->resources) == 0) {
                 /* If modified event has no-one or only creator as participant and no resources
                    then delete it (as it's unlikely the stub event is useful anymore) */
@@ -189,7 +189,7 @@ 
         }
 
         if (array_key_exists($member->event, $modified_events)) {
-            $event =& $modified_events[$member->event];
+            $event = & $modified_events[$member->event];
             $set_as_modified = false;
         } else {
             try {
@@ -203,7 +203,7 @@ 
         }
         debug_add("overlap found in event {$event->title} (#{$event->id})");
 
-        if (   $event->tentative
+        if ($event->tentative
             && $rob_tentative) {
             debug_add('event is tentative, robbing resources');
             $event->resources = array_diff_key($event->resources, $this->_event->resources);
@@ -230,7 +230,7 @@ 
         }
         debug_add("overlap found in event {$event->title} (#{$event->id})");
 
-        if (   $event->tentative
+        if ($event->tentative
             && $rob_tentative) {
             debug_add('event is tentative, robbing participants');
             $event->participants = array_diff_key($event->participants, $this->_event->participants);

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();
         }

Spacing +10 added lines, -10 removed lines

@@ -305,7 +305,7 @@ 
                 continue;
             }
             $images_identifier = $info[0];
-            if (   !empty($this->attachments_info[$blobs_identifier]['object'])
+            if (!empty($this->attachments_info[$blobs_identifier]['object'])
                 && is_object($this->attachments_info[$blobs_identifier]['object'])) {
                 $this->titles[$images_identifier] = $this->attachments_info[$blobs_identifier]['object']->title;
             }
@@ -363,7 +363,7 @@ 
                     }
                     if (empty($main['object']->guid)) {
                         //Panic, broken identifier
-                        debug_add("Identifier '{$identifier}' does not have a valid object behind it",  MIDCOM_LOG_ERROR);
+                        debug_add("Identifier '{$identifier}' does not have a valid object behind it", MIDCOM_LOG_ERROR);
                         continue;
                     }
 
@@ -465,7 +465,7 @@ 
             debug_print_r('$this->attachments_info', $this->attachments_info);
             return;
         }
-        $info =& $this->attachments_info[$identifier];
+        $info = & $this->attachments_info[$identifier];
         $this->_info_heuristics($info, $identifier);
         $attachment->set_parameter('midcom.helper.datamanager2.type.images', 'images_identifier', $info['images_identifier']);
         // This would be the name of the 'derived_images' key.
@@ -507,7 +507,7 @@ 
 
         $this->attachments_info[$identifier]['images_identifier'] = $images_identifier;
         $this->attachments_info[$identifier]['images_name'] = $images_name;
-        $this->images[$images_identifier][$images_name] =& $this->attachments_info[$identifier];
+        $this->images[$images_identifier][$images_name] = & $this->attachments_info[$identifier];
     }
 
     /**
@@ -533,16 +533,16 @@ 
     protected function _sort_images_callback($a, $b)
     {
         // safety against broken images
-        if (   !empty($a['main']['object'])
+        if (!empty($a['main']['object'])
             && !empty($b['main']['object'])) {
             $a_obj = $a['main']['object'];
             $b_obj = $b['main']['object'];
         } else {
             // Try to read the sort values from some other key
-            if (   is_array($a)
+            if (is_array($a)
                 && is_array($b)) {
                 foreach ($a as $key => $data) {
-                    if (   !empty($data['object'])
+                    if (!empty($data['object'])
                         && !empty($b[$key]['object'])) {
                         $a_obj = $data['object'];
                         $b_obj = $b[$key]['object'];
@@ -550,7 +550,7 @@ 
                     }
                 }
             }
-            if (   empty($a_obj)
+            if (empty($a_obj)
                 && empty($b_obj)) {
                 return 0;
             }
@@ -653,7 +653,7 @@ 
     private function _batch_handler_cleanup($tmp_dir, $new_name)
     {
         debug_add("called with: '{$tmp_dir}', '{$new_name}'");
-        if (   !empty($tmp_dir)
+        if (!empty($tmp_dir)
             && $tmp_dir !== '/'
             /* TODO: better tmp dir matching */
             && preg_match('|^/tmp/|', $tmp_dir)) {
@@ -661,7 +661,7 @@ 
             debug_add("executing '{$cmd}'");
             exec($cmd, $output, $ret);
         }
-        if (   empty($new_name)
+        if (empty($new_name)
             /* TODO: better tmp dir matching */
             || !preg_match('|^/tmp/|', $new_name)) {
             return;