flack / openpsa

lib/org/openpsa/calendar/handler/create.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
     /**
      * DM2 creation callback, binds to the current content topic.
      */
-    public function & dm2_create_callback (&$controller)
+    public function & dm2_create_callback(&$controller)
     {
         $this->_event = new org_openpsa_calendar_event_dba();
         $this->_event->up = $this->_root_event->id;

Braces +3 added lines, -6 removed lines

@@ -44,8 +44,7 @@ 
         {
             $person = $person->get_storage();
             $defaults['participants'][$person->id] = $person;
-        }
-        else if ($group = midcom::get()->auth->get_group($this->resource))
+        } else if ($group = midcom::get()->auth->get_group($this->resource))
         {
             foreach ($group->list_members() as $member)
             {
@@ -98,8 +97,7 @@ 
             if (!empty($_GET['end']))
             {
                 $this->_requested_end = strtotime($_GET['end']);
-            }
-            else
+            } else
             {
                 $this->_requested_end = $this->_requested_start + 3600;
             }
@@ -120,8 +118,7 @@ 
             $indexer = new org_openpsa_calendar_midcom_indexer($this->_topic);
             $indexer->index($data['controller']->datamanager);
             midcom::get()->head->add_jsonload('openpsa_calendar_widget.refresh_parent();');
-        }
-        else if (!empty($conflictmanager->busy_members))
+        } else if (!empty($conflictmanager->busy_members))
         {
             midcom::get()->uimessages->add($this->_l10n->get('event conflict'), $conflictmanager->get_message($this->_l10n->get_formatter()), 'warning');
         }

lib/org/openpsa/calendar/handler/admin.php

Braces +2 added lines, -4 removed lines

@@ -65,8 +65,7 @@ 
             $indexer = new org_openpsa_calendar_midcom_indexer($this->_topic);
             $indexer->index($data['controller']->datamanager);
             midcom::get()->head->add_jsonload('openpsa_calendar_widget.refresh_parent();');
-        }
-        else if (!empty($conflictmanager->busy_members))
+        } else if (!empty($conflictmanager->busy_members))
         {
             midcom::get()->uimessages->add($this->_l10n->get('event conflict'), $conflictmanager->get_message($this->_l10n->get_formatter()), 'warning');
         }
@@ -93,8 +92,7 @@ 
         if (empty($_POST['end']))
         {
             $end = $event->end + ($start - $event->start);
-        }
-        else
+        } else
         {
             $end = strtotime($_POST['end']);
         }

lib/org/openpsa/calendar/conflictmanager.php

Spacing +6 added lines, -6 removed lines

@@ -137,7 +137,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)
@@ -151,8 +151,8 @@ 
         {
             //These events have been robbed of (some of) their resources
             $creator = midcom_db_person::get_cached($event->metadata->creator);
-            if (   (   count($event->participants) == 0
-                    || (   count($event->participants) == 1
+            if ((count($event->participants) == 0
+                    || (count($event->participants) == 1
                         && array_key_exists($creator->id, $event->participants)))
                 &&  count($event->resources) == 0)
             {
@@ -220,7 +220,7 @@ 
 
         if (array_key_exists($member->event, $modified_events))
         {
-            $event =& $modified_events[$member->event];
+            $event = & $modified_events[$member->event];
             $set_as_modified = false;
         }
         else
@@ -239,7 +239,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');
@@ -295,7 +295,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');

Braces +6 added lines, -12 removed lines

@@ -161,8 +161,7 @@ 
                 debug_add("event {$event->title} (#{$event->id}) has been robbed of all of its resources, calling delete");
                 //TODO: take notifications and repeats into account
                 $event->delete();
-            }
-            else
+            } else
             {
                 //Otherwise just commit the changes
                 //TODO: take notifications and repeats into account
@@ -222,15 +221,13 @@ 
         {
             $event =& $modified_events[$member->event];
             $set_as_modified = false;
-        }
-        else
+        } else
         {
             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();
@@ -252,8 +249,7 @@ 
             {
                 $modified_events[$event->id] = $event;
             }
-        }
-        else
+        } else
         {
             debug_add('event is normal, flagging busy');
             //Non tentative event, flag busy resources
@@ -286,8 +282,7 @@ 
         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();
@@ -305,8 +300,7 @@ 
             //participants
             $event->participants = array_diff_key($event->participants, $this->_event->participants);
             $modified_events[$event->id] = $event;
-        }
-        else
+        } else
         {
             debug_add('event is normal, flagging busy');
             //Non tentative event, flag busy resources

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

Spacing +2 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
         $root_event = self::find_root_event();
 
         $qb = org_openpsa_calendar_event_dba::new_query_builder();
-        $qb->add_constraint('up', '=',  $root_event->id);
+        $qb->add_constraint('up', '=', $root_event->id);
         $schemadb = midcom_helper_datamanager2_schema::load_database($config->get('schemadb'));
 
         $indexer = new org_openpsa_calendar_midcom_indexer($topic, $indexer);
@@ -123,8 +123,7 @@ 
         }
 
         $workflow = new midcom\workflow\datamanager2;
-        return $workflow->get_button("new/" . $url, array
-        (
+        return $workflow->get_button("new/" . $url, array(
             MIDCOM_TOOLBAR_LABEL => midcom::get()->i18n->get_string('create event', 'org.openpsa.calendar'),
             MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_new-event.png',
         ));

Braces +2 added lines, -4 removed lines

@@ -63,8 +63,7 @@ 
         if (mgd_is_guid($root_guid))
         {
             $root_event = org_openpsa_calendar_event_dba::get_cached($root_guid);
-        }
-        else
+        } else
         {
             // Check for calendar event tree.
             $qb = org_openpsa_calendar_event_dba::new_query_builder();
@@ -74,8 +73,7 @@ 
             if (!empty($ret))
             {
                 $root_event = $ret[0];
-            }
-            else
+            } else
             {
                 debug_add("OpenPSA Calendar root event could not be found", MIDCOM_LOG_ERROR);
                 //Attempt to auto-initialize

lib/org/openpsa/slideshow/style/edit.php

Braces +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
         $original = new midcom_db_attachment($image->attachment);
         $original_url = midcom_db_attachment::get_url($original);
         $name = $original->name;
-    }
-    catch (midcom_error $e)
+    } catch (midcom_error $e)
     {
         $url = MIDCOM_STATIC_URL . '/stock-icons/mime/gnome-text-blank.png';
         $name = $data['l10n']->get('attachment missing');

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

Spacing +3 added lines, -6 removed lines

@@ -42,16 +42,13 @@
             $head->enable_jquery();
             $head->add_jsfile(MIDCOM_STATIC_URL . '/' . $this->_component . '/galleria/galleria-1.3.5.min.js');
         }
-        $buttons = array
-        (
-            array
-            (
+        $buttons = array(
+            array(
                 MIDCOM_TOOLBAR_URL => "edit/",
                 MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n_midcom->get('edit %s'), $this->_l10n->get('slideshow')),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/configuration.png',
             ),
-            array
-            (
+            array(
                 MIDCOM_TOOLBAR_URL => "recreate_folder_thumbnails/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('recreate subfolder thumbnails'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_refresh.png',

Braces +2 added lines, -4 removed lines

@@ -71,8 +71,7 @@ 
         if (sizeof($data['images']) > 0)
         {
             midcom_show_style('index');
-        }
-        else
+        } else
         {
             midcom_show_style('index-empty');
         }
@@ -117,8 +116,7 @@ 
         if (!empty($data['subfolders']))
         {
             midcom_show_style('index-subfolders');
-        }
-        else
+        } else
         {
             midcom_show_style('index-empty');
         }

lib/org/openpsa/slideshow/handler/edit.php

Indentation +4 added lines, -4 removed lines

@@ -281,10 +281,10 @@
                 break;
             case 'delete':
                  if (empty($_POST['guids']))
-                 {
-                     throw new midcom_error('Invalid request');
-                 }
-                 break;
+                    {
+                        throw new midcom_error('Invalid request');
+                    }
+                    break;
             default:
                 throw new midcom_error('Invalid request');
         }

Spacing +7 added lines, -11 removed lines

@@ -66,7 +66,7 @@ 
         $failed = 0;
         foreach ($images as $image)
         {
-            if (   !$image->generate_image('thumbnail', $this->_config->get('thumbnail_filter'))
+            if (!$image->generate_image('thumbnail', $this->_config->get('thumbnail_filter'))
                 || !$image->generate_image('image', $this->_config->get('image_filter')))
             {
                 $failed++;
@@ -102,8 +102,7 @@ 
         $data['images'] = $qb->execute();
 
         $head = midcom::get()->head;
-        $head->enable_jquery_ui(array
-        (
+        $head->enable_jquery_ui(array(
             'mouse', 'draggable', 'droppable', 'sortable',
             'progressbar', 'button', 'position', 'dialog',
             'effect', 'effect-pulsate'
@@ -113,16 +112,13 @@ 
         $head->add_jsfile(MIDCOM_STATIC_URL . '/' . $this->_component . '/edit.js');
         $head->add_stylesheet(MIDCOM_STATIC_URL . '/' . $this->_component . '/edit.css');
 
-        $buttons = array
-        (
-            array
-            (
+        $buttons = array(
+            array(
                 MIDCOM_TOOLBAR_URL => "",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('view'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/view.png',
             ),
-            array
-            (
+            array(
                 MIDCOM_TOOLBAR_URL => "recreate/",
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('recreate derived images'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_refresh.png',
@@ -272,7 +268,7 @@ 
                 }
                 //Fall-through
             case 'create':
-                if (   !isset($_POST['title'])
+                if (!isset($_POST['title'])
                     || !isset($_POST['description'])
                     || !isset($_POST['position']))
                 {
@@ -297,7 +293,7 @@ 
         $attachment->title = $_POST['title'];
         $attachment->mimetype = $file['type'];
         $attachment->parentguid = $image->guid;
-        if (   !$attachment->create()
+        if (!$attachment->create()
             || !$attachment->copy_from_file($file['tmp_name']))
         {
             throw new midcom_error('Failed to create attachment: ' . midcom_connection::get_error_string());

Braces +2 added lines, -4 removed lines

@@ -77,8 +77,7 @@ 
         {
             $message = sprintf($this->_l10n->get('generated derived images for %s entries'), $successful);
             $type = 'info';
-        }
-        else
+        } else
         {
             $message = sprintf($this->_l10n->get('generated derived images for %s entries, %s errors occurred'), $successful, $failed);
             $type = 'error';
@@ -161,8 +160,7 @@ 
         {
             $this->$function();
             $this->_response->success = true;
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $this->_response->success = false;
             $this->_response->error = $e->getMessage();

lib/org/openpsa/invoices/billing/data.php

Braces +3 added lines, -6 removed lines

@@ -58,8 +58,7 @@ 
         if ($contact = $this->get_contact())
         {
             $label .= $contact->get_label() . ')';
-        }
-        else
+        } else
         {
             $label .= $this->linkGuid . ')';
         }
@@ -76,14 +75,12 @@ 
         try
         {
             return new org_openpsa_contacts_person_dba($this->linkGuid);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             try
             {
                 return new org_openpsa_contacts_group_dba($this->linkGuid);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 debug_add("Failed to load contact with GUID: " . $this->linkGuid . " - last error:" . $e->getMessage(), MIDCOM_LOG_ERROR);
                 return false;

lib/org/openpsa/invoices/invoice.php

Spacing +5 added lines, -6 removed lines

@@ -16,8 +16,7 @@ 
     public $__midcom_class_name__ = __CLASS__;
     public $__mgdschema_class_name__ = 'org_openpsa_invoice';
 
-    public $autodelete_dependents = array
-    (
+    public $autodelete_dependents = array(
         'org_openpsa_invoices_invoice_item_dba' => 'invoice'
     );
 
@@ -146,7 +145,7 @@ 
 
     public function _on_deleting()
     {
-        if (! midcom::get()->auth->request_sudo('org.openpsa.invoices'))
+        if (!midcom::get()->auth->request_sudo('org.openpsa.invoices'))
         {
             debug_add('Failed to get SUDO privileges, skipping invoice hour deletion silently.', MIDCOM_LOG_ERROR);
             return false;
@@ -175,7 +174,7 @@ 
                 $task = new org_openpsa_projects_task_dba($id);
                 $task->update_cache();
             }
-            catch (midcom_error $e){}
+            catch (midcom_error $e) {}
         }
 
         $qb = self::new_query_builder();
@@ -304,11 +303,11 @@ 
             {
                 try
                 {
-                    $deliverable = new org_openpsa_sales_salesproject_deliverable_dba((int)$mc_task_agreement->get_subkey($key, 'agreement'));
+                    $deliverable = new org_openpsa_sales_salesproject_deliverable_dba((int) $mc_task_agreement->get_subkey($key, 'agreement'));
                     $invoice_item->pricePerUnit = $deliverable->pricePerUnit;
                     $invoice_item->deliverable = $deliverable->id;
                     //calculate price
-                    if (   $deliverable->invoiceByActualUnits
+                    if ($deliverable->invoiceByActualUnits
                         || $deliverable->plannedUnits == 0)
                     {
                         $invoice_item->units = $hours;

Braces +9 added lines, -18 removed lines

@@ -73,8 +73,7 @@ 
         try
         {
             $invoice_sender = new midcom_db_person($invoicer);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             return;
         }
@@ -174,8 +173,7 @@ 
             {
                 $task = new org_openpsa_projects_task_dba($id);
                 $task->update_cache();
-            }
-            catch (midcom_error $e){}
+            } catch (midcom_error $e){}
         }
 
         $qb = self::new_query_builder();
@@ -312,13 +310,11 @@ 
                         || $deliverable->plannedUnits == 0)
                     {
                         $invoice_item->units = $hours;
-                    }
-                    else
+                    } else
                     {
                         $invoice_item->units = $deliverable->plannedUnits;
                     }
-                }
-                catch (midcom_error $e)
+                } catch (midcom_error $e)
                 {
                     $e->log();
                     $invoice_item->units = $hours;
@@ -384,8 +380,7 @@ 
             // if the property useContactAddress is set
             $billing_data[0]->set_address();
             return $billing_data[0];
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $e->log();
         }
@@ -436,8 +431,7 @@ 
             try
             {
                 return org_openpsa_contacts_group_dba::get_cached($this->customer);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
             }
@@ -447,8 +441,7 @@ 
             try
             {
                 return org_openpsa_contacts_person_dba::get_cached($this->customerContact);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
             }
@@ -470,13 +463,11 @@ 
         if (count($invoice_items) == 1)
         {
             $invoice_item = $invoice_items[0];
-        }
-        else if (count($invoice_items) > 1)
+        } else if (count($invoice_items) > 1)
         {
             debug_add('More than one item found for task #' . $task_id . ', only returning the first', MIDCOM_LOG_INFO);
             $invoice_item = $invoice_items[0];
-        }
-        else
+        } else
         {
             $invoice_item = new org_openpsa_invoices_invoice_item_dba();
             $invoice_item->task = $task_id;