flack / openpsa

lib/org/openpsa/calendar/vcal.php

Spacing +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
                 // Attendee must have email address of valid format, these must also be unique.
                 $person->email = preg_replace('/[^0-9_\x61-\x7a]/i', '_', strtolower($person->name)) . '_is_not@openpsa2.org';
             }
-            $parameters = array
-            (
+            $parameters = array(
                 'ROLE' => 'REQ-PARTICIPANT',
                 'CUTYPE' => 'INDIVIDUAL',
                 'PARTSTAT' => 'ACCEPTED',

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
             {
                 throw new midcom_error(midcom_connection::get_error_string());
             }
-        }
-        else
+        } else
         {
             $nodes = $object_qb->execute();
             $node = $nodes[0];

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

Spacing +14 added lines, -27 removed lines

@@ -49,30 +49,25 @@ 
         $buttons = array();
         if ($this->_root_event->can_do('midgard:create'))
         {
-            $buttons[] = $workflow->get_button('#', array
-            (
+            $buttons[] = $workflow->get_button('#', array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create event'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_new-event.png',
-                MIDCOM_TOOLBAR_OPTIONS  => array
-                (
+                MIDCOM_TOOLBAR_OPTIONS  => array(
                     'id' => 'openpsa_calendar_add_event',
                 )
             ));
         }
-        $buttons[] = array
-        (
+        $buttons[] = array(
             MIDCOM_TOOLBAR_URL => "filters/?org_openpsa_calendar_returnurl=" . midcom_connection::get_url('uri'),
             MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('choose calendars'),
             MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/preferences-desktop.png',
         );
 
-        $buttons[] = array
-        (
+        $buttons[] = array(
             MIDCOM_TOOLBAR_URL => '#',
             MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('go to'),
             MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_jump-to.png',
-            MIDCOM_TOOLBAR_OPTIONS  => array
-            (
+            MIDCOM_TOOLBAR_OPTIONS  => array(
                 'rel' => 'directlink',
                 'id' => 'date-navigation',
             )
@@ -164,8 +159,7 @@ 
             {
                 if ($holiday = $util->getHoliday($country, $from, $region))
                 {
-                    $events[] = array
-                    (
+                    $events[] = array(
                         'title' => $holiday->getName(),
                         'start' => $from->format('Y-m-d'),
                         'className' => array(),
@@ -220,8 +214,7 @@ 
                         $label = $user->name;
                     }
 
-                    $events[$event->guid] = array
-                    (
+                    $events[$event->guid] = array(
                         'id' => $event->guid,
                         'title' => $label,
                         'location' => $event->location,
@@ -275,10 +268,8 @@ 
         // Add toolbar items
         if ($this->_request_data['view'] == 'default')
         {
-            $buttons = array
-            (
-                array
-                (
+            $buttons = array(
+                array(
                     MIDCOM_TOOLBAR_URL => 'event/edit/' . $this->_request_data['event']->guid . '/',
                     MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('edit'),
                     MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/edit.png',
@@ -291,13 +282,11 @@ 
                 $workflow = $this->get_workflow('delete', array('object' => $data['event']));
                 $buttons[] = $workflow->get_button("event/delete/{$data['event']->guid}/");
             }
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => 'javascript:window.print()',
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('print'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/printer.png',
-                MIDCOM_TOOLBAR_OPTIONS  => array
-                (
+                MIDCOM_TOOLBAR_OPTIONS  => array(
                     'rel' => 'directlink',
                 )
             );
@@ -308,10 +297,8 @@ 
             {
                 $user = midcom::get()->auth->user->get_storage();
                 $date = $this->_l10n->get_formatter()->date();
-                $relatedto_button_settings = array
-                (
-                    'wikinote'      => array
-                    (
+                $relatedto_button_settings = array(
+                    'wikinote'      => array(
                         'component' => 'net.nemein.wiki',
                         'node'  => false,
                         'wikiword'  => str_replace('/', '-', sprintf($this->_l10n->get($this->_config->get('wiki_title_skeleton')), $data['event']->title, $date, $user->name)),
@@ -333,7 +320,7 @@ 
 
         if (!$this->_request_data['event']->can_do('org.openpsa.calendar:read'))
         {
-            $stat =    $this->_datamanager->set_schema('private')
+            $stat = $this->_datamanager->set_schema('private')
                     && $this->_datamanager->set_storage($this->_request_data['event']);
         }
         else

Braces +3 added lines, -6 removed lines

@@ -141,8 +141,7 @@ 
                 if ($mimetype[0] === 'text')
                 {
                     $this->process_mime_plaintext();
-                }
-                else
+                } else
                 {
                     $this->process_mime_binary();
                 }
@@ -153,8 +152,7 @@ 
         {
             $this->title =  "{$this->attachment->title} ({$this->attachment->name})";
             $this->content .= "\n{$this->attachment->title}\n{$this->attachment->name}";
-        }
-        else
+        } else
         {
             $this->title =  $this->attachment->name;
             $this->content .= "\n{$this->attachment->name}";
@@ -163,8 +161,7 @@ 
         if (strlen($this->content) > 200)
         {
             $this->abstract = substr($this->content, 0, 200) . ' ...';
-        }
-        else
+        } else
         {
             $this->abstract = $this->content;
         }

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

@@ -23,8 +23,7 @@ 
         {
             $relatedto_arr = $session->get('relatedto2get_array');
             $session->remove('relatedto2get_array');
-        }
-        else
+        } else
         {
             $relatedto_arr = org_openpsa_relatedto_plugin::get2relatedto();
         }
@@ -35,8 +34,7 @@ 
             if (!$rel->id)
             {
                 $rel->create();
-            }
-            else
+            } else
             {
                 //In theory we should not ever hit this, but better to be sure.
                 $rel->update();

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

@@ -46,8 +46,7 @@ 
         {
             $local_filename = midcom_db_attachment::safe_filename($uploaded_file['name']);
             $local_file = $this->_get_file($local_filename, true);
-        }
-        else
+        } else
         {
             $local_file = $this->_file;
         }
@@ -89,8 +88,7 @@ 
             // We're creating a new file
             $local_filename = midcom_db_attachment::safe_filename($_POST['midgard_admin_asgard_filename']);
             $local_file = $this->_get_file($local_filename, true);
-        }
-        else
+        } else
         {
             $local_file = $this->_file;
         }

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

@@ -40,8 +40,7 @@ 
             $data['mode'] = 'customer';
             $data['list_title'] = sprintf($this->_l10n->get('salesprojects with %s'), $data['customer']->get_label());
             $this->add_breadcrumb("", $data['list_title']);
-        }
-        else
+        } else
         {
             $data['mode'] = $this->get_list_mode($args);
             $qb = $this->_add_state_constraint($data['mode'], $qb);
@@ -134,8 +133,7 @@ 
         {
             $this->_request_data['customer'] = new org_openpsa_contacts_group_dba($guid);
             $qb->add_constraint('customer', '=', $this->_request_data['customer']->id);
-        }
-        catch (midcom_error $e)
+        } catch (midcom_error $e)
         {
             $this->_request_data['customer'] = new org_openpsa_contacts_person_dba($guid);
             $qb->add_constraint('customerContact', '=', $this->_request_data['customer']->id);

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;