flack / openpsa

lib/org/openpsa/contacts/group.php

Spacing +4 added lines, -6 removed lines

@@ -14,8 +14,7 @@ 
     public $__midcom_class_name__ = __CLASS__;
     public $__mgdschema_class_name__ = 'org_openpsa_organization';
 
-    public $autodelete_dependents = array
-    (
+    public $autodelete_dependents = array(
         'org_openpsa_contacts_member_dba' => 'gid'
     );
 
@@ -32,7 +31,7 @@ 
 
     public function __set($name, $value)
     {
-        if (   $name == 'homepage'
+        if ($name == 'homepage'
             && !empty($value)
             && $value != $this->homepage)
         {
@@ -83,7 +82,7 @@ 
 
     public function __get($property)
     {
-        if (   $property == 'invoice_label'
+        if ($property == 'invoice_label'
             || $property == 'postal_label')
         {
             if (!isset($this->_address_extras[$property]))
@@ -124,8 +123,7 @@ 
     {
         if ($this->_register_prober)
         {
-            $args = array
-            (
+            $args = array(
                 'group' => $this->guid,
             );
             midcom_services_at_interface::register(time() + 60, 'org.openpsa.contacts', 'check_url', $args);

lib/org/openpsa/contacts/duplicates/check.php

Spacing +12 added lines, -16 removed lines

@@ -48,8 +48,7 @@ 
         //Search for all potential duplicates (more detailed checking is done later)
         $check_persons = $this->get_person_candidates($person);
 
-        $person = $this->normalize_fields(array
-        (
+        $person = $this->normalize_fields(array(
             'firstname' => $person->firstname,
             'lastname' => $person->lastname,
             'email' => $person->email,
@@ -122,8 +121,7 @@ 
      */
     function p_duplicate_person(array $person1, array $person2)
     {
-        $ret = array
-        (
+        $ret = array(
             'p' => 0,
             'email_match' => false,
             'handphone_match' => false,
@@ -144,7 +142,7 @@ 
             // if user's lastname is part of the email address, check to see if the difference is only in the domain part
             $email1 = preg_replace('/@.+/', '', $person1['email']);
             $email2 = preg_replace('/@.+/', '', $person2['email']);
-            if (   strpos($email1, $person1['lastname']) !== false
+            if (strpos($email1, $person1['lastname']) !== false
                 && $email1 == $email2)
             {
                 $ret['email_match'] = true;
@@ -203,7 +201,7 @@ 
 
     private function match($property, array $data1, array $data2)
     {
-        if (   !empty($data1[$property])
+        if (!empty($data1[$property])
             && $data1[$property] == $data2[$property])
         {
             return true;
@@ -243,8 +241,7 @@ 
 
         $check_groups = $this->get_group_candidates($group);
 
-        $group = $this->normalize_fields(array
-        (
+        $group = $this->normalize_fields(array(
             'official' => $group->official,
             'street' => $group->street,
             'phone' => $group->phone,
@@ -303,8 +300,7 @@ 
      */
     function p_duplicate_group(array $group1, array $group2)
     {
-        $ret = array
-        (
+        $ret = array(
             'p' => 0,
             'homepage_match' => false,
             'phone_match' => false,
@@ -370,7 +366,7 @@ 
         $persons = $this->get_person_candidates();
 
         $params = array();
-        $params['objects'] =& $persons;
+        $params['objects'] = & $persons;
         $params['mode'] = 'person';
 
         array_walk($persons, array($this, 'check_all_arraywalk'), $params);
@@ -442,7 +438,7 @@ 
                 continue;
             }
 
-            if (   $obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid)
+            if ($obj1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj2->guid)
                 || $obj2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $obj1->guid))
             {
                 // Not-duplicate parameter found, returning zero probability
@@ -472,7 +468,7 @@ 
 
         $groups = $this->get_group_candidates();
         $params = array();
-        $params['objects'] =& $groups;
+        $params['objects'] = & $groups;
         $params['mode'] = 'group';
         array_walk($groups, array($this, 'check_all_arraywalk'), $params);
 
@@ -517,7 +513,7 @@ 
                 }
             }
         }
-        debug_add("Done on " . time() . ", took: " . (time() - $time_start) .  " seconds");
+        debug_add("Done on " . time() . ", took: " . (time() - $time_start) . " seconds");
         if ($output)
         {
             echo "INFO: DONE with persons. Elapsed time " . (time() - $time_start) . " seconds<br/>\n";
@@ -557,10 +553,10 @@ 
             }
         }
 
-        debug_add("Done on " . time() . ", took: " . (time()-$time_start) .  " seconds");
+        debug_add("Done on " . time() . ", took: " . (time() - $time_start) . " seconds");
         if ($output)
         {
-            echo "INFO: DONE with groups. Elapsed time: " . (time()-$time_start) ." seconds<br/>\n";
+            echo "INFO: DONE with groups. Elapsed time: " . (time() - $time_start) . " seconds<br/>\n";
             flush();
         }
     }

lib/org/openpsa/contacts/duplicates/merge.php

Spacing +7 added lines, -8 removed lines

@@ -46,7 +46,7 @@ 
      */
     public function merge($obj1, $obj2, $merge_mode)
     {
-        if (   $merge_mode !== 'all'
+        if ($merge_mode !== 'all'
             && $merge_mode !== 'future')
         {
             debug_add("invalid mode {$merge_mode}", MIDCOM_LOG_ERROR);
@@ -97,10 +97,10 @@ 
                         {
                             $dup = $this->check_duplicate($results, $result, $conf['duplicate_check']);
 
-                            if (   is_object($dup)
+                            if (is_object($dup)
                                 || $dup === false)
                             {
-                                if (   !is_object($dup)
+                                if (!is_object($dup)
                                     || !array_key_exists($dup->id, $todelete))
                                 {
                                     $todelete[$result->id] = $result;
@@ -111,7 +111,7 @@ 
                         }
                     }
                 }
-                if (   $needs_update
+                if ($needs_update
                     && !$result->update())
                 {
                     throw new midcom_error("Failed to update {$classname} #{$result->id}, errstr: " . midcom_connection::get_error_string());
@@ -170,7 +170,7 @@ 
 
         foreach ($results as $result)
         {
-            if (   $result->$field === $object->$field
+            if ($result->$field === $object->$field
                 && $result->id !== $object->id)
             {
                 return $result;
@@ -182,8 +182,7 @@ 
     private function merge_persons($person1, $person2)
     {
         // Copy fields missing from person1 and present in person2 over
-        $skip_properties = array
-        (
+        $skip_properties = array(
             'id' => true,
             'guid' => true,
         );
@@ -191,7 +190,7 @@ 
         foreach ($person2 as $property => $value)
         {
             // Copy only simple properties not marked to be skipped missing from person1
-            if (   empty($person2->$property)
+            if (empty($person2->$property)
                 || !empty($person1->$property)
                 || isset($skip_properties[$property])
                 || !is_scalar($value))

lib/org/openpsa/calendar/viewer.php

Spacing +2 added lines, -4 removed lines

@@ -74,10 +74,8 @@
      */
     public function get_calendar_options()
     {
-        $options = array
-        (
-            'businessHours' => array
-            (
+        $options = array(
+            'businessHours' => array(
                 'start' => $this->_config->get('day_start_time') . ':00',
                 'end' => $this->_config->get('day_end_time') . ':00',
                 'dow' => array(1, 2, 3, 4, 5)

lib/org/openpsa/calendar/event.php

Spacing +6 added lines, -6 removed lines

@@ -166,7 +166,7 @@ 
         }
 
         //Check up
-        if (   !$this->up
+        if (!$this->up
             && $this->title != '__org_openpsa_calendar')
         {
             $root_event = org_openpsa_calendar_interface::find_root_event();
@@ -202,9 +202,9 @@ 
     private function _check_timerange()
     {
         //Force types
-        $this->start = (int)$this->start;
-        $this->end = (int)$this->end;
-        if (   !$this->start
+        $this->start = (int) $this->start;
+        $this->end = (int) $this->end;
+        if (!$this->start
             || !$this->end)
         {
             debug_add('Event must have start and end timestamps');
@@ -216,7 +216,7 @@ 
          * Force start and end seconds to 1 and 0 respectively
          * (to avoid stupid one second overlaps)
          */
-        $this->start = mktime(  date('G', $this->start),
+        $this->start = mktime(date('G', $this->start),
                                 date('i', $this->start),
                                 1,
                                 date('n', $this->start),
@@ -325,7 +325,7 @@ 
      */
     private function _suspects_classes_present()
     {
-        return (   class_exists('org_openpsa_relatedto_dba')
+        return (class_exists('org_openpsa_relatedto_dba')
                 && class_exists('org_openpsa_relatedto_suspect'));
     }
 

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

Spacing +11 added lines, -14 removed lines

@@ -73,7 +73,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
@@ -119,7 +119,7 @@ 
                 return false;
         }
 
-        if (   $type == 'cancel'
+        if ($type == 'cancel'
             || $type == 'remove')
         {
             // TODO: Create iCal export with correct delete commands
@@ -129,10 +129,8 @@ 
             $generator = midcom::get()->serviceloader->load('midcom_core_service_urlgenerator');
             $encoder = new org_openpsa_calendar_vcal;
             $encoder->add_event($event);
-            $message['attachments'] = array
-            (
-                array
-                (
+            $message['attachments'] = array(
+                array(
                     'name' => $generator->from_string(sprintf('%s on %s', $event->title, date('Ymd_Hi', $event->start))) . '.ics',
                     'mimetype' => 'text/calendar',
                     'content' => (string) $encoder,
@@ -208,7 +206,7 @@ 
         {
             $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;
@@ -227,13 +225,13 @@ 
             $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
@@ -271,8 +269,8 @@ 
             {
                 $last_end_time = $workday_starts_ts;
             }
-            if (   $last_end_time < $workday_ends_ts
-                && (($workday_ends_ts- $last_end_time) >= $amount))
+            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);
             }
@@ -283,8 +281,7 @@ 
 
     private static function _create_slot($start, $end, $previous, $next = false)
     {
-        return array
-        (
+        return array(
             'start' => $start,
             'end' => $end,
             'previous' => $previous,

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',

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

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;