flack / openpsa

lib/net/nehmer/comments/comment.php

Spacing +7 added lines, -7 removed lines

@@ -181,7 +181,7 @@ 
         }
 
         // Set the status
-        if (   $this->can_do('net.nehmer.comments:moderation')
+        if ($this->can_do('net.nehmer.comments:moderation')
             && !$this->_sudo_requested) {
             $this->status = net_nehmer_comments_comment::ABUSE;
         } else {
@@ -205,7 +205,7 @@ 
             return false;
         }
         // Set the status
-        if (   !$this->can_do('net.nehmer.comments:moderation')
+        if (!$this->can_do('net.nehmer.comments:moderation')
             || $this->_sudo_requested) {
             return false;
         }
@@ -229,7 +229,7 @@ 
         }
 
         // Set the status
-        if (   !$this->can_do('net.nehmer.comments:moderation')
+        if (!$this->can_do('net.nehmer.comments:moderation')
             || $this->_sudo_requested) {
             return false;
         }
@@ -248,7 +248,7 @@ 
      */
     public function report_not_abuse()
     {
-        if (   !$this->can_do('net.nehmer.comments:moderation')
+        if (!$this->can_do('net.nehmer.comments:moderation')
             || $this->_sudo_requested) {
             return false;
         }
@@ -351,8 +351,8 @@ 
     {
         $config = midcom_baseclasses_components_configuration::get('net.nehmer.comments', 'config');
 
-        if (   $config->get('ratings_enable')
-            && (    $config->get('ratings_cache_to_object')
+        if ($config->get('ratings_enable')
+            && ($config->get('ratings_cache_to_object')
                  || $config->get('comment_count_cache_to_object'))) {
             // Handle ratings
             $comments = net_nehmer_comments_comment::list_by_objectguid($this->objectguid);
@@ -413,7 +413,7 @@ 
             return false;
         }
 
-        if (   empty($this->title)
+        if (empty($this->title)
             && empty($this->content)) {
             // No need to send notifications about empty rating entries
             return false;

Braces +2 added lines, -1 removed lines

@@ -408,7 +408,8 @@
         //Get the parent object
         try {
             $parent = midcom::get()->dbfactory->get_object_by_guid($this->objectguid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }

lib/net/nemein/tag/handler.php

Spacing +5 added lines, -5 removed lines

@@ -68,7 +68,7 @@ 
         $tagstring = self::resolve_tagname($tagname);
         $tag = net_nemein_tag_tag_dba::get_by_tag($tagstring);
         if (!$tag) {
-            $tag =  new net_nemein_tag_tag_dba();
+            $tag = new net_nemein_tag_tag_dba();
             $tag->tag = $tagstring;
             $tag->url = $url;
             if (!$tag->create()) {
@@ -77,7 +77,7 @@ 
                 return;
             }
         }
-        $link =  new net_nemein_tag_link_dba();
+        $link = new net_nemein_tag_link_dba();
         $link->tag = $tag->id;
         $link->context = self::resolve_context($tagname);
         $link->value = self::resolve_value($tagname);
@@ -189,7 +189,7 @@ 
      */
     public function copy_tags($from, $to, $component = null)
     {
-        if (   !is_object($from)
+        if (!is_object($from)
             || !is_object($to)) {
             return false;
         }
@@ -493,7 +493,7 @@ 
         $quote_open = false;
         for ($i = 0; $i < (strlen($tags_string) + 1); $i++) {
             $char = substr($tags_string, $i, 1);
-            if (   (   $char == ' '
+            if (($char == ' '
                     && !$quote_open)
                 || $i == strlen($tags_string)) {
                 $tags[] = $current_tag;
@@ -504,7 +504,7 @@ 
                 $quote_open = false;
                 continue;
             }
-            if (   $char === '"'
+            if ($char === '"'
                 || $char === "'") {
                 $quote_open = $char;
                 continue;

Braces +6 added lines, -3 removed lines

@@ -384,7 +384,8 @@ 
                 $value = $link->value;
 
                 $tags[$key] = $value;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -443,7 +444,8 @@ 
             try {
                 $tag = net_nemein_tag_tag_dba::get_cached($link->tag);
                 $link_object_map[$link->fromGuid][$tag->tag] = $link;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -472,7 +474,8 @@ 
                     $tmpobject = midcom::get()->dbfactory->convert_midgard_to_midcom($tmpobject);
                 }
                 $return[] = $tmpobject;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

lib/org/openpsa/calendar/event/member.php

Spacing +7 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
             $event = new org_openpsa_calendar_event_dba($this->eid);
         }
 
-        if (    $recipient->id == midcom_connection::get_user()
+        if ($recipient->id == midcom_connection::get_user()
              && !$event->send_notify_me) {
             //Do not send notification to current user
             debug_add('event->send_notify_me is false and recipient is current user, aborting notify');
@@ -111,7 +111,7 @@ 
                 return false;
         }
 
-        if (   $type == 'cancel'
+        if ($type == 'cancel'
             || $type == 'remove') {
             // TODO: Create iCal export with correct delete commands
         } else {
@@ -185,7 +185,7 @@ 
         while ($stamp <= $end) {
             $ymd = date('Ymd', $stamp);
             debug_add("making sure date {$ymd} has at least one event");
-            $stamp = mktime(0, 0, 1, date('m', $stamp), date('d', $stamp)+1, date('Y', $stamp));
+            $stamp = mktime(0, 0, 1, date('m', $stamp), date('d', $stamp) + 1, date('Y', $stamp));
             if (array_key_exists($ymd, $events_by_date)) {
                 continue;
             }
@@ -202,12 +202,12 @@ 
             $workday_starts = 8;
             $workday_ends = 16;
 
-            $workday_starts_ts = mktime($workday_starts, 0, 0, (int)$ymd_matches[2], (int)$ymd_matches[3], (int)$ymd_matches[1]);
-            $workday_ends_ts = mktime($workday_ends, 0, 0, (int)$ymd_matches[2], (int)$ymd_matches[3], (int)$ymd_matches[1]);
+            $workday_starts_ts = mktime($workday_starts, 0, 0, (int) $ymd_matches[2], (int) $ymd_matches[3], (int) $ymd_matches[1]);
+            $workday_ends_ts = mktime($workday_ends, 0, 0, (int) $ymd_matches[2], (int) $ymd_matches[3], (int) $ymd_matches[1]);
             $last_end_time = false;
             $last_event = false;
             foreach ($events as $event) {
-                if (   $event->end <= $workday_starts_ts
+                if ($event->end <= $workday_starts_ts
                     || $event->start >= $workday_ends_ts) {
                     // We need not to consider this event, it is outside the defined workday
                     continue;
@@ -238,7 +238,7 @@ 
             if ($last_end_time === false) {
                 $last_end_time = $workday_starts_ts;
             }
-            if (   $last_end_time < $workday_ends_ts
+            if ($last_end_time < $workday_ends_ts
                 && (($workday_ends_ts - $last_end_time) >= $amount)) {
                 $slots[] = self::_create_slot($last_end_time, $workday_ends_ts, $last_event);
             }

Braces +2 added lines, -1 removed lines

@@ -152,7 +152,8 @@
                 debug_add('person #' . $person->id . 'has no email address, aborting');
                 return false;
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return false;
         }
 

lib/org/openpsa/documents/midcom/interfaces.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object)
     {
-        if (   $object instanceof org_openpsa_documents_document_dba
+        if ($object instanceof org_openpsa_documents_document_dba
             && $object->topic == $topic->id) {
             return "document/{$object->guid}/";
         }

lib/org/openpsa/products/product.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
             $qb->add_constraint('id', '<>', $this->id);
         }
         // Make sure the product is in the same product group
-        $qb->add_constraint('productGroup', '=', (int)$this->productGroup);
+        $qb->add_constraint('productGroup', '=', (int) $this->productGroup);
 
         return ($qb->count() == 0);
     }

lib/org/openpsa/projects/workflow.php

Spacing +2 added lines, -2 removed lines

@@ -170,7 +170,7 @@ 
     {
         debug_add("task->start() called with user #" . midcom_connection::get_user());
         //PONDER: Check actual status objects for more accurate logic ?
-        if (   $task->status >= org_openpsa_projects_task_status_dba::STARTED
+        if ($task->status >= org_openpsa_projects_task_status_dba::STARTED
             && $task->status <= org_openpsa_projects_task_status_dba::APPROVED) {
             //We already have started status
             debug_add('Task has already been started');
@@ -382,7 +382,7 @@ 
 
     private static function is_manager($task)
     {
-        return (   $task->manager == 0
+        return ($task->manager == 0
                 || midcom_connection::get_user() == $task->manager);
     }
 }

Braces +2 added lines, -1 removed lines

@@ -356,7 +356,8 @@
                 // The agreement allows invoicing only approved hours, therefore don't mark unapproved
                 $qb->add_constraint('metadata.isapproved', '=', true);
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
 

lib/org/openpsa/projects/task.php

Spacing +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
     public function _on_updated()
     {
         // Sync the object's ACL properties into MidCOM ACL system
-        if (   !$this->_skip_acl_refresh) {
+        if (!$this->_skip_acl_refresh) {
             if ($this->orgOpenpsaAccesstype && $this->orgOpenpsaOwnerWg) {
                 debug_add("Synchronizing task ACLs to MidCOM");
                 $sync = new org_openpsa_core_acl_synchronizer();
@@ -326,7 +326,7 @@ 
 
             if ($report_data['invoice']) {
                 $hours['invoiced'] += $report_hours;
-            } elseif (   $report_data['invoiceable']
+            } elseif ($report_data['invoiceable']
                       && ($report_data['isapproved'] || !$invoice_approved_only)) {
                 $hours['invoiceable'] += $report_hours;
             }

Braces +6 added lines, -3 removed lines

@@ -240,7 +240,8 @@ 
                     $salesproject = org_openpsa_sales_salesproject_dba::get_cached($agreement->salesproject);
                     $this->customer = $salesproject->customer;
                 }
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         } else {
             // No agreement, we can't be invoiceable
@@ -286,7 +287,8 @@ 
         try {
             $agreement = new org_openpsa_sales_salesproject_deliverable_dba($this->get_agreement());
             $agreement->update_units($this->id, $hours);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
         }
 
         if ($update) {
@@ -313,7 +315,8 @@ 
         try {
             $agreement = new org_openpsa_sales_salesproject_deliverable_dba($this->get_agreement());
             $invoice_approved_only = $agreement->invoiceApprovedOnly;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $invoice_approved_only = false;
         }
 

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

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

Braces +6 added lines, -3 removed lines

@@ -148,7 +148,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;
             }
 
@@ -455,7 +456,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";
             }
         }
@@ -492,7 +494,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();
         }

lib/org/openpsa/invoices/invoice/pdf.php

Spacing +2 added lines, -2 removed lines

@@ -87,7 +87,7 @@ 
         $filename = $generator->from_string($this->invoice->get_label()) . '.pdf';
 
         // tmp filename
-        $tmp_file = midcom::get()->config->get('midcom_tempdir') . "/". $filename;
+        $tmp_file = midcom::get()->config->get('midcom_tempdir') . "/" . $filename;
 
         // render pdf to tmp filename
         $pdf_builder->render($tmp_file);
@@ -100,7 +100,7 @@ 
             $attachment->update();
         } else {
             $attachment = $this->invoice->create_attachment($filename, $this->invoice->get_label(), "application/pdf");
-            if (   !$attachment
+            if (!$attachment
                 || !$this->invoice->set_parameter("midcom.helper.datamanager2.type.blobs", "guids_pdf_file", $attachment->guid . ":" . $attachment->guid)) {
                 throw new midcom_error("Failed to create invoice attachment for pdf");
             }