flack / openpsa

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

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,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);
             throw new midcom_error('invalid merge mode');
@@ -87,9 +87,9 @@ 
                         if (!empty($conf['duplicate_check'])) {
                             $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;
                                 }
@@ -98,7 +98,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());
                 }
@@ -147,7 +147,7 @@ 
         }
 
         foreach ($results as $result) {
-            if (   $result->$field === $object->$field
+            if ($result->$field === $object->$field
                 && $result->id !== $object->id) {
                 return $result;
             }
@@ -165,7 +165,7 @@ 
         $changed = false;
         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/contacts/group.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 
     public function __set($name, $value)
     {
-        if (   $name == 'homepage'
+        if ($name == 'homepage'
             && !empty($value)
             && $value != $this->homepage) {
             $this->_register_prober = true;
@@ -77,7 +77,7 @@ 
 
     public function __get($property)
     {
-        if (   $property == 'invoice_label'
+        if ($property == 'invoice_label'
             || $property == 'postal_label') {
             if (!isset($this->_address_extras[$property])) {
                 $this->_get_address_extra($property);

lib/org/openpsa/contacts/viewer.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
     {
         $my_company_guid = $this->_config->get('owner_organization');
 
-        if (   empty($my_company_guid)
+        if (empty($my_company_guid)
             || !mgd_is_guid($my_company_guid)) {
             if (midcom::get()->auth->admin) {
                 midcom::get()->uimessages->add(

lib/org/openpsa/contacts/handler/group/create.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
     {
         $this->_group = new org_openpsa_contacts_group_dba();
 
-        if (   $this->_type == 'organization'
+        if ($this->_type == 'organization'
             && $this->_parent_group) {
             $this->_group->owner = (int) $this->_parent_group->id;
         } else {

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

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         }
         $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(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),

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

Spacing +5 added lines, -5 removed lines

@@ -80,7 +80,7 @@ 
 
         // Handle automatic wildcards
         $auto_wildcards = $this->_config->get('auto_wildcards');
-        if (   $auto_wildcards
+        if ($auto_wildcards
             && strpos($this->_query_string_processed, '%') === false) {
             switch ($auto_wildcards) {
                 case 'both':
@@ -127,7 +127,7 @@ 
      */
     public function _show_search_type($handler_id, array &$data)
     {
-        if (   $this->_view == 'foaf'
+        if ($this->_view == 'foaf'
             && sizeof($this->_persons) > 0) {
             midcom_show_style('foaf-header');
             foreach ($this->_persons as $person) {
@@ -159,11 +159,11 @@ 
             return $this->_prepare_json_reply();
         }
 
-        if (   count($this->_groups) == 1
+        if (count($this->_groups) == 1
             && count($this->_persons) == 0) {
             return new midcom_response_relocate('group/' . $this->_groups[0]->guid . '/');
         }
-        if (   count($this->_groups) == 0
+        if (count($this->_groups) == 0
             && count($this->_persons) == 1) {
             return new midcom_response_relocate('person/' . $this->_persons[0]->guid . '/');
         }
@@ -238,7 +238,7 @@ 
 
         midcom_show_style('search-header');
 
-        if (   count($this->_groups) == 0
+        if (count($this->_groups) == 0
             && count($this->_persons) == 0
             && $this->_query_string) {
             //No results at all (from any of the queries)

lib/org/openpsa/contacts/person.php

Spacing +2 added lines, -2 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');
         }
@@ -31,7 +31,7 @@ 
 
     public function __set($name, $value)
     {
-        if (   $name == 'homepage'
+        if ($name == 'homepage'
             && !empty($value)
             && $value != $this->homepage) {
             $this->_url_changed = true;

lib/org/openpsa/qbpager/main.php

Spacing +7 added lines, -7 removed lines

@@ -61,16 +61,16 @@ 
     private function _check_page_vars()
     {
         $page_var = $this->_prefix . 'page';
-        $results_var =  $this->_prefix . 'results';
+        $results_var = $this->_prefix . 'results';
         if (!empty($_REQUEST[$page_var])) {
             debug_add("{$page_var} has value: {$_REQUEST[$page_var]}");
-            $this->_current_page = (int)$_REQUEST[$page_var];
+            $this->_current_page = (int) $_REQUEST[$page_var];
         }
         if (!empty($_REQUEST[$results_var])) {
             debug_add("{$results_var} has value: {$_REQUEST[$results_var]}");
-            $this->results_per_page = (int)$_REQUEST[$results_var];
+            $this->results_per_page = (int) $_REQUEST[$results_var];
         }
-        $this->_offset = ($this->_current_page-1)*$this->results_per_page;
+        $this->_offset = ($this->_current_page - 1) * $this->results_per_page;
         if ($this->_offset < 0) {
             $this->_offset = 0;
         }
@@ -292,7 +292,7 @@ 
         return $this->_midcom_qb->add_constraint($param, $op, $val);
     }
 
-    public function add_order($param, $sort='ASC')
+    public function add_order($param, $sort = 'ASC')
     {
         if (!$this->_sanity_check()) {
             return false;
@@ -329,7 +329,7 @@ 
         if (!$this->_sanity_check()) {
             return false;
         }
-        if (   !$this->count
+        if (!$this->count
             || $this->_count_mode != 'count') {
             $this->count = $this->_midcom_qb_count->count();
         }
@@ -342,7 +342,7 @@ 
         if (!$this->_sanity_check()) {
             return false;
         }
-        if (   !$this->count
+        if (!$this->count
             || $this->_count_mode != 'count_unchecked') {
             $this->count = $this->_midcom_qb_count->count_unchecked();
         }

lib/org/openpsa/user/widget/password.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
         $elements = array();
         $attributes = array_merge($attributes, array('class' => 'shorttext', 'id' => $this->name . '_input'));
 
-        $menu ='<label><input type="radio" name="org_openpsa_user_person_account_password_switch" value="0" checked="checked"/> ' . $this->_l10n->get("generate_password") . '
+        $menu = '<label><input type="radio" name="org_openpsa_user_person_account_password_switch" value="0" checked="checked"/> ' . $this->_l10n->get("generate_password") . '
             </label>
             <label>
                 <input type="radio" name="org_openpsa_user_person_account_password_switch" value="1"/> ' . $this->_l10n->get("own_password") . '