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

Indentation +3 added lines, -3 removed lines

@@ -252,9 +252,9 @@
                 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 +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());
         }

Braces +2 added lines, -1 removed lines

@@ -148,7 +148,8 @@
         try {
             $this->$function();
             $this->_response->success = true;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $this->_response->success = false;
             $this->_response->error = $e->getMessage();
         }

lib/org/openpsa/slideshow/image.php

Braces +4 added lines, -2 removed lines

@@ -41,7 +41,8 @@ 
 
         try {
             $folder = midcom_db_topic::get_cached($this->topic);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         $folder->delete_attachment(self::FOLDER_THUMBNAIL);
@@ -51,7 +52,8 @@ 
     {
         try {
             return new midcom_db_attachment($this->$type);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
         $rows = $mc->get_rows(['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/helpers/main.php

Braces +2 added lines, -1 removed lines

@@ -55,7 +55,8 @@
              $guid = $parts[1];
              try {
                  $attachments[$parts[0]] = midcom_db_attachment::get_cached($guid);
-             } catch (midcom_error $e) {
+             }
+             catch (midcom_error $e) {
                  $e->log();
              }
          }

Indentation +26 added lines, -26 removed lines

@@ -35,31 +35,31 @@
         return $output;
     }
 
-     /**
-      * @param midcom_core_dbaobject $object The object we're working on
-      * @param string $field The schema field name
-      * @return midcom_db_attachment[] List of attachments, indexed by identifier
-      */
-     public static function get_dm2_attachments($object, $field)
-     {
-         $attachments = [];
-         $identifiers = explode(',', $object->get_parameter('midcom.helper.datamanager2.type.blobs', 'guids_' . $field));
-         if (empty($identifiers)) {
-             return $attachments;
-         }
-         foreach ($identifiers as $identifier) {
-             $parts = explode(':', $identifier);
-             if (sizeof($parts) != 2) {
-                 continue;
-             }
-             $guid = $parts[1];
-             try {
-                 $attachments[$parts[0]] = midcom_db_attachment::get_cached($guid);
-             } catch (midcom_error $e) {
-                 $e->log();
-             }
-         }
+        /**
+         * @param midcom_core_dbaobject $object The object we're working on
+         * @param string $field The schema field name
+         * @return midcom_db_attachment[] List of attachments, indexed by identifier
+         */
+        public static function get_dm2_attachments($object, $field)
+        {
+            $attachments = [];
+            $identifiers = explode(',', $object->get_parameter('midcom.helper.datamanager2.type.blobs', 'guids_' . $field));
+            if (empty($identifiers)) {
+                return $attachments;
+            }
+            foreach ($identifiers as $identifier) {
+                $parts = explode(':', $identifier);
+                if (sizeof($parts) != 2) {
+                    continue;
+                }
+                $guid = $parts[1];
+                try {
+                    $attachments[$parts[0]] = midcom_db_attachment::get_cached($guid);
+                } catch (midcom_error $e) {
+                    $e->log();
+                }
+            }
 
-         return $attachments;
-     }
+            return $attachments;
+        }
 }

lib/org/openpsa/contacts/cron/duplicates/clean.php

Braces +2 added lines, -1 removed lines

@@ -35,7 +35,8 @@
                 try {
                     midcom::get()->dbfactory->get_object_by_guid($param->name);
                     $tried[$param->name] = true;
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $tried[$param->name] = false;
                 }
             }

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