flack / openpsa

lib/org/openpsa/mail/message.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
             if (is_string($value)) {
                 $this->_headers[$header] = trim($value);
             }
-            if (   strtolower($header) == 'from'
+            if (strtolower($header) == 'from'
                 || strtolower($header) == 'reply-to'
                 || strtolower($header) == 'to') {
                 $this->_headers[$header] = $this->_encode_address_field($value);

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

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
         $images = $qb->execute();
         $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++;
             }
@@ -244,7 +244,7 @@ 
                 }
                 //Fall-through
             case 'create':
-                if (   !isset($_POST['title'])
+                if (!isset($_POST['title'])
                     || !isset($_POST['description'])
                     || !isset($_POST['position'])) {
                     throw new midcom_error('Invalid request');
@@ -267,7 +267,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());
         }

lib/org/openpsa/slideshow/image.php

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
         $rows = $mc->get_rows(array('id', 'name', 'guid'), 'id');
 
         foreach ($images as $image) {
-            if (   !isset($rows[$image->attachment])
+            if (!isset($rows[$image->attachment])
                 || !isset($rows[$image->image])
                 || !isset($rows[$image->thumbnail])) {
                 continue;

lib/org/openpsa/core/acl/synchronizer.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 {
     public function write_acls(midcom_core_dbaobject $object, $owner_id, $accesstype)
     {
-        if (   empty($owner_id)
+        if (empty($owner_id)
             || empty($accesstype)) {
             return false;
         }
@@ -63,14 +63,14 @@ 
 
         if ($privileges) {
             foreach ($privileges as $privilege) {
-                if (   !empty($needed_privileges[$privilege->privilegename])
+                if (!empty($needed_privileges[$privilege->privilegename])
                     && $needed_privileges[$privilege->privilegename]['assignee'] == $privilege->assignee
                     && $needed_privileges[$privilege->privilegename]['value'] == $privilege->value) {
                     unset($needed_privileges[$privilege->privilegename]);
                     continue;
                 }
                 // Clear old ACLs applying to others than current user or selected owner group
-                if (   $privilege->assignee != midcom::get()->auth->user->id
+                if ($privilege->assignee != midcom::get()->auth->user->id
                     && $privilege->assignee != $owner_id) {
                     if (is_array($privilege->assignee)) {
                         $assignee_key = $privilege->assignee['identifier'];

lib/org/openpsa/core/filter/select.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
             echo '<select class="filter_input" onchange="document.forms[\'' . $this->name . '_filter\'].submit();" name="' . $this->name . '">';
 
             foreach ($options as $option) {
-                echo '<option value="' .  $option['id'] . '"';
+                echo '<option value="' . $option['id'] . '"';
                 if ($option['selected'] == true) {
                     echo " selected=\"selected\"";
                 }

lib/org/openpsa/core/queryfilter.php

Spacing +2 added lines, -2 removed lines

@@ -77,9 +77,9 @@
         $filter_id = $this->_identifier . '_' . $filtername;
         $user = midcom::get()->auth->user->get_storage();
 
-        if (   isset($_POST['unset_filter'])
+        if (isset($_POST['unset_filter'])
             && $_POST['unset_filter'] == $filter_id) {
-            if (   $user->get_parameter("org_openpsa_core_filter", $filter_id)
+            if ($user->get_parameter("org_openpsa_core_filter", $filter_id)
                 && !$user->delete_parameter("org_openpsa_core_filter", $filter_id)) {
                 $message_content = sprintf(
                     $l10n->get('the handed filter for %s could not be set as parameter'),

lib/org/openpsa/widgets/grid/provider.php

Spacing +3 added lines, -3 removed lines

@@ -232,7 +232,7 @@ 
 
     private function _convert_to_localdata()
     {
-        return "var " . $this->_grid->get_identifier() . '_entries = ' .  json_encode($this->get_rows()) . ";\n";
+        return "var " . $this->_grid->get_identifier() . '_entries = ' . json_encode($this->get_rows()) . ";\n";
     }
 
     private function _render_json()
@@ -266,7 +266,7 @@ 
             $this->_sort_field = $query['sidx'];
             $this->_sort_direction = strtoupper($query['sord']);
         }
-        if (   !empty($query['_search'])
+        if (!empty($query['_search'])
             && $query['_search'] === 'true') {
             foreach ($query as $field => $value) {
                 if (in_array($field, array('_search', 'nd', 'page', 'rows', 'sidx', 'sord'))) {
@@ -291,7 +291,7 @@ 
 
         $this->_total_rows = $qb->count();
 
-        if (   $this->_datatype == 'json'
+        if ($this->_datatype == 'json'
             && !empty($this->_results_per_page)) {
             $qb->set_limit($this->_results_per_page);
             if (!empty($this->_offset)) {

lib/org/openpsa/widgets/ui.php

Spacing +3 added lines, -3 removed lines

@@ -37,8 +37,8 @@ 
             $config = array_merge($defaults, $config);
 
             $node_url = $siteconfig->get_node_full_url($component);
-            if (   $node_url
-                && (   !$user_id
+            if ($node_url
+                && (!$user_id
                     || midcom::get()->auth->acl->can_do_byguid('midgard:read', $siteconfig->get_node_guid($component), 'midcom_db_topic', $user_id))) {
                 $providers[] = array(
                     'placeholder' => midcom::get()->i18n->get_string('search title', $component),
@@ -114,7 +114,7 @@ 
         echo '<div id="tabs">';
         echo "\n<ul>\n";
         foreach ($tabdata as $key => $tab) {
-            echo "<li><a id='key_" . $key ."' class='tabs_link' href='" . $prefix . $tab['url'] . "' ><span> " . $tab['title'] . "</span></a></li>";
+            echo "<li><a id='key_" . $key . "' class='tabs_link' href='" . $prefix . $tab['url'] . "' ><span> " . $tab['title'] . "</span></a></li>";
         }
         echo "\n</ul>\n";
         echo "</div>\n";

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