flack / openpsa

src/midcom/datamanager/storage/mnrelation.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
         $qb = midcom::get()->dbfactory->new_query_builder($this->config['type_config']['mapping_class_name']);
         $qb->add_constraint($this->config['type_config']['master_fieldname'], '=', $this->get_master_foreign_key());
 
-        if (   $this->config['type_config']['sortable']
+        if ($this->config['type_config']['sortable']
             && preg_match('/^(ASC|DESC)/i', $this->config['type_config']['sortable_sort_order'], $regs)) {
             $order = strtoupper($regs[1]);
             $qb->add_order('metadata.score', $order);

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

Braces +4 added lines, -2 removed lines

@@ -66,7 +66,8 @@ 
             try {
                 $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;
             }
@@ -137,7 +138,8 @@ 
                 try {
                     $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');
                 }

Spacing +9 added lines, -9 removed lines

@@ -40,7 +40,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}");
             $qb = new midgard_query_builder('midgard_parameter');
@@ -68,7 +68,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')) {
@@ -77,14 +77,14 @@ 
                 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);
                 $i++;
                 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;
@@ -102,7 +102,7 @@ 
             if ($keep == 'both') {
                 $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
                     $option1->delete_parameter('org.openpsa.contacts.duplicates:possible_duplicate', $option2->guid);
@@ -120,11 +120,11 @@ 
                 }
             } else {
                 if ($keep == $option1->guid) {
-                    $person1 =& $option1;
-                    $person2 =& $option2;
+                    $person1 = & $option1;
+                    $person2 = & $option2;
                 } elseif ($keep == $option2->guid) {
-                    $person1 =& $option2;
-                    $person2 =& $option1;
+                    $person1 = & $option2;
+                    $person2 = & $option1;
                 } else {
                     throw new midcom_error('Something weird happened (basically we got bogus data)');
                 }

lib/midcom/helper/imagefilter.php

Braces +4 added lines, -2 removed lines

@@ -380,7 +380,8 @@ 
         try {
             $cmd = midcom::get()->config->get('utility_imagemagick_base') . "identify " . escapeshellarg($filename);
             $this->_run_command($cmd);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return false;
         }
         return true;
@@ -406,7 +407,8 @@ 
                 debug_add("EXIF information missing or without orientation tag. Skipping.", MIDCOM_LOG_INFO);
                 return;
             }
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Could not read EXIF data: " . $e->getMessage() . ", skipping.", MIDCOM_LOG_WARN);
             return;
         }

Spacing +4 added lines, -4 removed lines

@@ -190,7 +190,7 @@ 
             debug_add("The File {$filename} is not writable.", MIDCOM_LOG_ERROR);
             return false;
         }
-        if (   !empty($this->_filename)
+        if (!empty($this->_filename)
             && $this->_filename !== $filename) {
             $this->_tmpfiles[] = $this->_filename;
         }
@@ -411,7 +411,7 @@ 
         $tmpfile = null;
         $imagesize = getimagesize($this->_filename);
 
-        if (   $imagesize[2] == IMAGETYPE_JPEG
+        if ($imagesize[2] == IMAGETYPE_JPEG
             && $this->_jpegtran_available()) {
             /* jpegtran */
             $operations = [
@@ -479,7 +479,7 @@ 
         $imagesize = getimagesize($this->_filename);
 
         // Try lossless jpegtran rotation if possible
-        if (   $imagesize[2] == IMAGETYPE_JPEG
+        if ($imagesize[2] == IMAGETYPE_JPEG
             && ($rotate % 90 == 0)
             && $this->_jpegtran_available()) {
             $tmpfile = $this->_get_tempfile();
@@ -609,7 +609,7 @@ 
      */
     public function fill($x = null, $y = null, $color = null, $gravity = 'center')
     {
-        if (   empty($x)
+        if (empty($x)
             || empty($y)
             || empty($color)) {
             //This is a bit silly, but here for backwards compatibility...

lib/midcom/services/rcs/backend/rcs.php

Braces +4 added lines, -2 removed lines

@@ -453,7 +453,8 @@ 
 
         try {
             @exec($command, $output, $status);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add($e->getMessage());
         }
 
@@ -549,7 +550,8 @@ 
 
         try {
             $object = midcom::get()->dbfactory->get_object_by_guid($this->_guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add("{$this->_guid} could not be resolved to object", MIDCOM_LOG_ERROR);
             return false;
         }

Indentation +6 added lines, -6 removed lines

@@ -105,12 +105,12 @@
         return $status;
     }
 
-   /**
-    * Get the object of a revision
-    *
-    * @param string $revision identifier of revision wanted
-    * @return array array representation of the object
-    */
+    /**
+     * Get the object of a revision
+     *
+     * @param string $revision identifier of revision wanted
+     * @return array array representation of the object
+     */
     public function get_revision($revision) : array
     {
         if (empty($this->_guid)) {

Spacing +2 added lines, -2 removed lines

@@ -277,7 +277,7 @@ 
 
                 $i += 3;
 
-                while (   $i < $total
+                while ($i < $total
                        && substr($lines[$i], 0, 4) != '----'
                        && substr($lines[$i], 0, 5) != '=====') {
                     $i++;
@@ -315,7 +315,7 @@ 
      */
     private function rcs_writefile(string $guid, $data)
     {
-        if (   !is_writable($this->_config->get_rcs_root())
+        if (!is_writable($this->_config->get_rcs_root())
             || empty($guid)) {
             return false;
         }

lib/midcom/db/attachment.php

Spacing +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
     public function update_cache()
     {
         // Check if the attachment can be read anonymously
-        if (   midcom::get()->config->get('attachment_cache_enabled')
+        if (midcom::get()->config->get('attachment_cache_enabled')
             && !$this->can_do('midgard:read', 'EVERYONE')) {
             // Not public file, ensure it is removed
             $filename = $this->get_cache_path();

lib/midcom/helper/_styleloader.php

Braces +4 added lines, -2 removed lines

@@ -166,7 +166,8 @@ 
                     break;
                 }
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
         }
 
         $path_parts = array_reverse($path_parts);
@@ -410,7 +411,8 @@ 
                 && $db_style = $this->get_style_id_from_path($root_topic->style)) {
                 $_style = $this->_get_element_in_styletree($db_style, $_element);
             }
-        } catch (midcom_error_forbidden $e) {
+        }
+        catch (midcom_error_forbidden $e) {
             $e->log();
         }
 

Spacing +8 added lines, -8 removed lines

@@ -307,7 +307,7 @@ 
             $element = $matches[2];
         }
 
-        if (   isset($stylepath)
+        if (isset($stylepath)
             && $styleid = $this->get_style_id_from_path($stylepath)) {
             array_unshift($this->_scope, $styleid);
         }
@@ -341,7 +341,7 @@ 
         // This is a bit of a hack to allow &(); tags
         $preparsed = midcom_helper_misc::preparse($style);
         if (midcom_core_context::get()->has_custom_key('request_data')) {
-            $data =& midcom_core_context::get()->get_custom_key('request_data');
+            $data = & midcom_core_context::get()->get_custom_key('request_data');
         }
 
         if (eval('?>' . $preparsed) === false) {
@@ -375,7 +375,7 @@ 
 
         try {
             $root_topic = $context->get_key(MIDCOM_CONTEXT_ROOTTOPIC);
-            if (   $root_topic->style
+            if ($root_topic->style
                 && $db_style = $this->get_style_id_from_path($root_topic->style)) {
                 $_style = $this->_get_element_in_styletree($db_style, $_element);
             }
@@ -410,7 +410,7 @@ 
             if (array_key_exists($src, $this->_styles)) {
                 return $this->_styles[$src];
             }
-            if (   $this->_scope[0] != ''
+            if ($this->_scope[0] != ''
                 && $result = $this->_get_element_in_styletree($this->_scope[0], $_element)) {
                 $this->_styles[$src] = $result;
                 return $this->_styles[$src];
@@ -428,7 +428,7 @@ 
         if (array_key_exists($src, $this->_snippets)) {
             return $this->_snippets[$src];
         }
-        if (   midcom::get()->config->get('theme')
+        if (midcom::get()->config->get('theme')
             && $content = midcom_helper_misc::get_element_content($_element)) {
             $this->_snippets[$src] = $content;
             return $content;
@@ -487,7 +487,7 @@ 
             }
         } else {
             $style = $topic->style ?: midcom_core_context::get()->get_inherited_style();
-            if (   is_string($style)
+            if (is_string($style)
                 && substr($style, 0, 6) === 'theme:') {
                 $theme_dir = OPENPSA2_THEME_ROOT . midcom::get()->config->get('theme') . '/style';
                 $parts = explode('/', str_replace('theme:/', '', $style));
@@ -666,7 +666,7 @@ 
             $this->_styledirs_append[$context->id] = [];
         }
 
-        if (   $this->_topic
+        if ($this->_topic
             && $_st = $this->_get_component_style($this->_topic)) {
             array_unshift($this->_scope, $_st);
         }
@@ -684,7 +684,7 @@ 
      */
     public function leave_context()
     {
-        if (   $this->_topic
+        if ($this->_topic
             && $this->_get_component_style($this->_topic)) {
             array_shift($this->_scope);
         }

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

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object)
     {
-        if (   $object instanceof org_openpsa_documents_document_dba
+        if ($object instanceof org_openpsa_documents_document_dba
             && $object->topic == $topic->id) {
             return "document/{$object->guid}/";
         }

lib/net/nehmer/static/midcom/interfaces.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         }
 
         $config = $this->get_config_for_topic($topic);
-        if (   $object->name == 'index'
+        if ($object->name == 'index'
             && !$config->get('autoindex')) {
             return '';
         }

Braces +2 added lines, -1 removed lines

@@ -29,7 +29,8 @@
         foreach ($qb->execute() as $article) {
             try {
                 $datamanager->set_storage($article);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log(MIDCOM_LOG_WARN);
                 continue;
             }

lib/net/nemein/tag/handler.php

Braces +6 added lines, -3 removed lines

@@ -384,7 +384,8 @@ 
                 $value = $link->value;
 
                 $tags[$key] = $value;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -443,7 +444,8 @@ 
             try {
                 $tag = net_nemein_tag_tag_dba::get_cached($link->tag);
                 $link_object_map[$link->fromGuid][$tag->tag] = $link;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -472,7 +474,8 @@ 
                     $tmpobject = midcom::get()->dbfactory->convert_midgard_to_midcom($tmpobject);
                 }
                 $return[] = $tmpobject;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

Spacing +2 added lines, -2 removed lines

@@ -184,7 +184,7 @@ 
      */
     public function copy_tags($from, $to) : bool
     {
-        if (   !is_object($from)
+        if (!is_object($from)
             || !is_object($to)) {
             return false;
         }
@@ -488,7 +488,7 @@ 
         $strlen = strlen($tags_string);
         for ($i = 0; $i < $strlen; $i++) {
             $char = $tags_string[$i];
-            if (   (   $char == ' '
+            if (($char == ' '
                     && !$quote_open)
                 || $i == $strlen) {
                 $tags[] = $current_tag;