flack / openpsa

lib/org/openpsa/contacts/handler/frontpage.php

Spacing +6 added lines, -11 removed lines

@@ -27,8 +27,7 @@ 
         $buttons = array();
         if (midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_contacts_person_dba'))
         {
-            $buttons[] = $workflow->get_button('person/create/', array
-            (
+            $buttons[] = $workflow->get_button('person/create/', array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create person'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_person-new.png',
             ));
@@ -36,13 +35,11 @@ 
 
         if (midcom::get()->auth->can_user_do('midgard:create', null, 'org_openpsa_contacts_group_dba'))
         {
-            $buttons[] = $workflow->get_button("group/create/organization/", array
-            (
+            $buttons[] = $workflow->get_button("group/create/organization/", array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('create organization'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_people-new.png',
             ));
-            $buttons[] = $workflow->get_button("group/create/group/", array
-            (
+            $buttons[] = $workflow->get_button("group/create/group/", array(
                 MIDCOM_TOOLBAR_LABEL => sprintf($this->_l10n_midcom->get('create %s'), $this->_l10n->get('group')),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_people-new.png',
             ));
@@ -51,8 +48,7 @@ 
         $p_merger = new org_openpsa_contacts_duplicates_merge('person', $this->_config);
         if ($p_merger->merge_needed())
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => 'duplicates/person/',
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('merge persons'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/repair.png',
@@ -61,11 +57,10 @@ 
         }
         $this->_view_toolbar->add_items($buttons);
 
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config'))
         {
-            $this->_node_toolbar->add_item($workflow->get_button('config/', array
-            (
+            $this->_node_toolbar->add_item($workflow->get_button('config/', array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),
                 MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('component configuration helptext'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_folder-properties.png',

lib/org/openpsa/contacts/handler/duplicates/person.php

Spacing +10 added lines, -10 removed lines

@@ -45,7 +45,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}");
@@ -79,7 +79,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'))
@@ -89,7 +89,7 @@ 
                 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);
@@ -97,7 +97,7 @@ 
                 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;
@@ -106,7 +106,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)
         {
@@ -117,7 +117,7 @@ 
             {
                 $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
@@ -141,13 +141,13 @@ 
             {
                 if ($keep == $option1->guid)
                 {
-                    $person1 =& $option1;
-                    $person2 =& $option2;
+                    $person1 = & $option1;
+                    $person2 = & $option2;
                 }
                 else if ($keep == $option2->guid)
                 {
-                    $person1 =& $option2;
-                    $person2 =& $option1;
+                    $person1 = & $option2;
+                    $person2 = & $option1;
                 }
                 else
                 {

Braces +7 added lines, -14 removed lines

@@ -72,8 +72,7 @@ 
             {
                 $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;
@@ -126,8 +125,7 @@ 
 
                     // TODO: Localize
                     midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.contacts'), "Keeping both \"{$option1->name}\" and \"{$option2->name}\", they will not be marked as duplicates in the future", 'ok');
-                }
-                else
+                } else
                 {
                     $errstr = midcom_connection::get_error_string();
                     // Failed to set as not duplicate, clear parameter that might have been set (could have only been the first)
@@ -136,20 +134,17 @@ 
                     // TODO: Localize
                     midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.contacts'), "Failed to mark #{$option1->id} and # {$option2->id} as not duplicates, errstr: {$errstr}", 'error');
                 }
-            }
-            else
+            } else
             {
                 if ($keep == $option1->guid)
                 {
                     $person1 =& $option1;
                     $person2 =& $option2;
-                }
-                else if ($keep == $option2->guid)
+                } else if ($keep == $option2->guid)
                 {
                     $person1 =& $option2;
                     $person2 =& $option1;
-                }
-                else
+                } else
                 {
                     throw new midcom_error('Something weird happened (basically we got bogus data)');
                 }
@@ -160,8 +155,7 @@ 
                 {
                     $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');
@@ -182,8 +176,7 @@ 
         if (!$this->_request_data['notfound'])
         {
             midcom_show_style('show-duplicate-persons');
-        }
-        else
+        } else
         {
             midcom_show_style('show-duplicate-persons-notfound');
         }

lib/org/openpsa/contacts/person.php

Spacing +3 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 
     public function __construct($identifier = null)
     {
-        if (   midcom::get()->config->get('person_class') != 'midgard_person'
+        if (midcom::get()->config->get('person_class') != 'midgard_person'
             && midcom::get()->config->get('person_class') != 'openpsa_person')
         {
             $this->__mgdschema_class_name__ = midcom::get()->config->get('person_class');
@@ -32,7 +32,7 @@ 
 
     public function __set($name, $value)
     {
-        if (   $name == 'homepage'
+        if ($name == 'homepage'
             && !empty($value)
             && $value != $this->homepage)
         {
@@ -66,8 +66,7 @@ 
     {
         if ($this->_register_prober)
         {
-            $args = array
-            (
+            $args = array(
                 'person' => $this->guid,
             );
             midcom_services_at_interface::register(time() + 60, 'org.openpsa.contacts', 'check_url', $args);

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

Spacing +5 added lines, -5 removed lines

@@ -84,12 +84,12 @@ 
 
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object)
     {
-        if (   $object instanceof org_openpsa_contacts_group_dba
+        if ($object instanceof org_openpsa_contacts_group_dba
             || $object instanceof midcom_db_group)
         {
             return "group/{$object->guid}/";
         }
-        if (   $object instanceof org_openpsa_contacts_person_dba
+        if ($object instanceof org_openpsa_contacts_person_dba
             || $object instanceof midcom_db_person)
         {
             return "person/{$object->guid}/";
@@ -132,7 +132,7 @@ 
 
             if (count($items) > 0)
             {
-                if (   $items[0]->get_latitude()
+                if ($items[0]->get_latitude()
                     || $items[0]->get_longitude())
                 {
                     // This is a GeoRSS feed
@@ -143,7 +143,7 @@ 
 
         $hcards = @$hkit->getByURL('hcard', $url);
 
-        if (   is_array($hcards)
+        if (is_array($hcards)
             && count($hcards) > 0)
         {
             // We have found hCard data here
@@ -217,7 +217,7 @@ 
             {
                 $latitude = (float) $icbm_parts[0];
                 $longitude = (float) $icbm_parts[1];
-                if (   abs($latitude) < 90
+                if (abs($latitude) < 90
                     && abs($longitude) < 180)
                 {
                     $location = new org_routamc_positioning_location_dba();

Braces +5 added lines, -10 removed lines

@@ -59,8 +59,7 @@ 
             {
                 $root_groups[$name] = $group;
             }
-        }
-        else
+        } else
         {
             debug_add("OpenPSA Contacts root group could not be found", MIDCOM_LOG_WARN);
 
@@ -168,8 +167,7 @@ 
             try
             {
                 $person = new org_openpsa_contacts_person_dba($args['person']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $handler->print_error("Person {$args['person']} not found, error " . $e->getMessage());
                 return false;
@@ -180,15 +178,13 @@ 
                 return false;
             }
             return $this->_check_person_url($person);
-        }
-        else if (array_key_exists('group', $args))
+        } else if (array_key_exists('group', $args))
         {
             // Handling for groups
             try
             {
                 $group = new org_openpsa_contacts_group_dba($args['group']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $handler->print_error("Group {$args['group']} not found, error " . $e->getMessage());
                 return false;
@@ -255,8 +251,7 @@ 
         {
             // GeoRSS subscription is a good way to keep track of person's location
             $person->set_parameter('org.routamc.positioning:georss', 'georss_url', $data['georss_url']);
-        }
-        else if (array_key_exists('icbm', $data))
+        } else if (array_key_exists('icbm', $data))
         {
             // Instead of using the ICBM position data directly we can subscribe to it so we get modifications too
             $person->set_parameter('org.routamc.positioning:html', 'icbm_url', $person->homepage);

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);

Braces +1 added lines, -2 removed lines

@@ -246,8 +246,7 @@
             {
                 $result = array();
                 $size = 0;
-            }
-            else
+            } else
             {
                 $result = array_slice($result, $this->_offset);
                 $size = $size - $this->_offset;

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();
         }
     }

Braces +2 added lines, -4 removed lines

@@ -138,8 +138,7 @@ 
         {
             $ret['email_match'] = true;
             $ret['p'] += 1;
-        }
-        else if (!empty($person1['lastname']))
+        } else if (!empty($person1['lastname']))
         {
             // 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']);
@@ -435,8 +434,7 @@ 
             {
                 $obj1 = $class::get_cached($arr1['guid']);
                 $obj2 = $class::get_cached($arr2['guid']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
                 continue;

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'));
     }
 

Braces +3 added lines, -6 removed lines

@@ -310,8 +310,7 @@ 
             if ($linkdata['link']->create())
             {
                 debug_add("saved link to task #{$linkdata['other_obj']->id} (link id #{$linkdata['link']->id})", MIDCOM_LOG_INFO);
-            }
-            else
+            } else
             {
                 debug_add("could not save link to task #{$linkdata['other_obj']->id}, errstr" . midcom_connection::get_error_string(), MIDCOM_LOG_WARN);
             }
@@ -360,8 +359,7 @@ 
             if ($linkdata['link']->create())
             {
                 debug_add("saved sales link to {$linkdata['other_obj']->guid} (link id #{$linkdata['link']->id})", MIDCOM_LOG_INFO);
-            }
-            else
+            } else
             {
                 debug_add("could not save sales link to {$linkdata['other_obj']->guid}, errstr" . midcom_connection::get_error_string(), MIDCOM_LOG_WARN);
             }
@@ -420,8 +418,7 @@ 
         if ($this->orgOpenpsaAccesstype == org_openpsa_core_acl::ACCESS_PRIVATE)
         {
             $this->set_privilege('org.openpsa.calendar:read', 'EVERYONE', MIDCOM_PRIVILEGE_DENY);
-        }
-        else
+        } else
         {
             $this->set_privilege('org.openpsa.calendar:read', 'EVERYONE', MIDCOM_PRIVILEGE_ALLOW);
         }