flack / openpsa

src/midcom/datamanager/storage/mnrelation.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
         $qb = midcom::get()->dbfactory->new_query_builder($this->config['type_config']['mapping_class_name']);
         $qb->add_constraint($this->config['type_config']['master_fieldname'], '=', $this->get_master_foreign_key());
 
-        if (   $this->config['type_config']['sortable']
+        if ($this->config['type_config']['sortable']
             && preg_match('/^(ASC|DESC)/i', $this->config['type_config']['sortable_sort_order'], $regs)) {
             $order = strtoupper($regs[1]);
             $qb->add_order('metadata.score', $order);

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/invoices/handler/list.php

Braces +6 added lines, -3 removed lines

@@ -104,7 +104,8 @@ 
                 $customer = org_openpsa_contacts_group_dba::get_cached($invoice->customer);
                 $entry['customer'] = "<a href=\"{$this->_request_data['invoices_url']}list/customer/all/{$customer->guid}/\">" . $customer->get_label() . "</a>";
                 $entry['index_customer'] = $customer->get_label();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $entry['customer'] = '';
                 $entry['index_customer'] = '';
             }
@@ -115,7 +116,8 @@ 
                 $contact = org_openpsa_contacts_person_dba::get_cached($invoice->customerContact);
                 $entry['contact'] = "<a href=\"{$this->_request_data['invoices_url']}list/customer/all/{$contact->guid}/\">" . $contact->get_label() . "</a>";
                 $entry['index_contact'] = $contact->get_label();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $entry['contact'] = '';
                 $entry['index_contact'] = '';
             }
@@ -290,7 +292,8 @@ 
     {
         try {
             $this->_customer = new org_openpsa_contacts_group_dba($args[0]);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $this->_customer = new org_openpsa_contacts_person_dba($args[0]);
         }
         $data['customer'] = $this->_customer;

Spacing +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
     {
         $this->prepare_toolbar(false);
 
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config')) {
             $workflow = $this->get_workflow('datamanager');
             $this->_node_toolbar->add_item($workflow->get_button('config/', [

lib/org/openpsa/invoices/handler/invoice/items.php

Braces +4 added lines, -2 removed lines

@@ -38,13 +38,15 @@
             try {
                 $deliverable = org_openpsa_sales_salesproject_deliverable_dba::get_cached($item->deliverable);
                 $entry['deliverable'] = $deliverable->title;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $entry['deliverable'] = '';
             }
             try {
                 $task = org_openpsa_projects_task_dba::get_cached($item->task);
                 $entry['task'] = $task->title;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $entry['task'] = '';
             }
 

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 
     private function _verify_post_data()
     {
-        if (   empty($_POST['oper'])
+        if (empty($_POST['oper'])
             || !isset($_POST['id'])
             || !isset($_POST['description'])
             || !isset($_POST['price'])

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/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;
         }
     }

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
         // elfinder tmp detection doesn't work on OS X
         $this->tmpPath = midcom::get()->config->get('midcom_tempdir');
         // elfinder calls exit(), so we need to make sure we write caches
-        register_shutdown_function(function () {
+        register_shutdown_function(function() {
             midcom::get()->finish();
         });
     }
@@ -43,7 +43,7 @@ 
         }
 
         if (($dir = $this->dir($dst)) == false) {
-            return $this->setError(elFinder::ERROR_TRGDIR_NOT_FOUND, '#'.$dst);
+            return $this->setError(elFinder::ERROR_TRGDIR_NOT_FOUND, '#' . $dst);
         }
 
         if (!$dir['write']) {
@@ -84,7 +84,7 @@ 
 
         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'];
+            $overwrite = isset($_POST['overwrite']) ? (bool) $_POST['overwrite'] : $this->options['uploadOverwrite'];
             if ($overwrite) {
                 if (!$file['write']) {
                     return $this->setError(elFinder::ERROR_PERM_DENIED);
@@ -250,7 +250,7 @@ 
         $output = [$object->get_label()];
 
         $parent = $object->get_parent();
-        while (   $parent
+        while ($parent
                && $parent->component == 'org.openpsa.documents') {
             $output[] = $parent->extra;
             $parent = $parent->get_parent();
@@ -347,12 +347,12 @@ 
             $data['mime'] = 'directory';
         }
 
-        if (   $owner
+        if ($owner
             && $group = midcom::get()->auth->get_assignee($owner)) {
             $data['group'] = $group->name;
         }
 
-        if (   $this->root !== $path
+        if ($this->root !== $path
             && $parent = $object->get_parent()) {
             $data['phash'] = $this->encode($parent->guid);
         }
@@ -411,7 +411,7 @@ 
      * @param  string $mode open mode
      * @return resource|false
      */
-    protected function _fopen($path, $mode="rb")
+    protected function _fopen($path, $mode = "rb")
     {
         $document = org_openpsa_documents_document_dba::get_cached($path);
         $attachments = org_openpsa_helpers::get_dm2_attachments($document, 'document');
@@ -429,7 +429,7 @@ 
      * @param  string    $path  file path
      * @return bool
      */
-    protected function _fclose($fp, $path='')
+    protected function _fclose($fp, $path = '')
     {
         fclose($fp);
         return true;
@@ -613,7 +613,7 @@ 
     {
         $filename = midcom_db_attachment::safe_filename($name, true);
         $att = $doc->create_attachment($filename, $name, $mimetype);
-        if (   !$att
+        if (!$att
             || !$att->copy_from_handle($fp)) {
             return false;
         }

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, [$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);