flack / openpsa

lib/midgard/admin/asgard/plugin.php

Spacing +2 added lines, -2 removed lines

@@ -161,7 +161,7 @@ 
 
         $parent = $object->get_parent();
 
-        if (   $object instanceof midcom_db_parameter
+        if ($object instanceof midcom_db_parameter
             && !empty($parent->guid)) {
             // Add "parameters" list to breadcrumb if we're in a param
             $breadcrumb[] = [
@@ -171,7 +171,7 @@ 
         }
 
         $i = 0;
-        while (   !empty($parent->guid)
+        while (!empty($parent->guid)
                && $i < 10) {
             $i++;
             $parent_reflector = midcom_helper_reflector::get($parent);

lib/midgard/admin/asgard/navigation.php

Spacing +14 added lines, -14 removed lines

@@ -41,7 +41,7 @@ 
         $this->_component = 'midgard.admin.asgard';
 
         $this->_object = $object;
-        $this->_request_data =& $request_data;
+        $this->_request_data = & $request_data;
 
         $this->root_types = midcom_helper_reflector_tree::get_root_classes();
 
@@ -57,7 +57,7 @@ 
             // we go through the path bottom up and show the first root type we find
             foreach (array_reverse($this->_object_path) as $node) {
                 foreach ($this->root_types as $root_type) {
-                    if (   $node instanceof $root_type
+                    if ($node instanceof $root_type
                         || midcom_helper_reflector::is_same_class($root_type, $node->__midcom_class_name__)) {
                         $this->expanded_root_types[] = $root_type;
                         break;
@@ -69,7 +69,7 @@ 
 
     protected function _is_collapsed(string $type, int $total) : bool
     {
-        return (   $total > $this->_config->get('max_navigation_entries')
+        return ($total > $this->_config->get('max_navigation_entries')
                 && empty($_GET['show_all_' . $type]));
     }
 
@@ -85,7 +85,7 @@ 
         foreach ($ref->get_child_classes() as $class) {
             $qb = $ref->_child_objects_type_qb($class, $object, false);
 
-            if (   !$qb
+            if (!$qb
                 || !($count = $qb->count_unchecked())) {
                 continue;
             }
@@ -131,7 +131,7 @@ 
     {
         $qb = $ref->_root_objects_qb();
 
-        if (   !$qb
+        if (!$qb
             || !($total = $qb->count_unchecked())) {
             return;
         }
@@ -209,7 +209,7 @@ 
         }
 
         echo "<a href=\"" . midcom_connection::get_url('self') . "__mfa/asgard/object/{$mode}/{$object->guid}/\" title=\"GUID: {$object->guid}, ID: {$object->id}\">{$icon}{$label}</a>\n";
-        if (   $selected
+        if ($selected
             || $autoexpand) {
             $this->_list_child_elements($object, $level + 1);
         }
@@ -229,7 +229,7 @@ 
                 continue;
             }
 
-            if (   method_exists($class, 'navigation')
+            if (method_exists($class, 'navigation')
                 && ($this->_request_data['plugin_name'] == "asgard_{$component}")) {
                 $this->_request_data['expanded'] = true;
                 midcom_show_style('midgard_admin_asgard_navigation_section_header');
@@ -263,13 +263,13 @@ 
         if ($this->_is_selected($object)) {
             $css_class .= ' selected';
         }
-        if (   is_object($this->_object)
-            && (   $object->guid == $this->_object->guid
-                || (   $this->_object instanceof midcom_db_parameter
+        if (is_object($this->_object)
+            && ($object->guid == $this->_object->guid
+                || ($this->_object instanceof midcom_db_parameter
                     && $object->guid == $this->_object->parentguid))) {
             $css_class .= ' current';
         }
-        if ( !$object->can_do('midgard:update')) {
+        if (!$object->can_do('midgard:update')) {
             $css_class .= ' readonly';
         }
         return $css_class;
@@ -290,7 +290,7 @@ 
         // Get the types that might have special display conditions
         // @TODO: Should this just include to the configuration selection, although it would break the consistency
         // of other similar preference sets, which simply override the global settings?
-        if (   ($selected = midgard_admin_asgard_plugin::get_preference('midgard_types'))
+        if (($selected = midgard_admin_asgard_plugin::get_preference('midgard_types'))
             && preg_match_all('/\|([a-z0-9\.\-_]+)/', $selected, $regs)) {
             $types = array_flip($regs[1]);
             if ($exclude) {
@@ -308,7 +308,7 @@ 
             }
 
             // If the regular expression has been set, check which types should be shown
-            $label_mapping = array_filter($label_mapping, function ($root_type) use ($regexp, $exclude) {
+            $label_mapping = array_filter($label_mapping, function($root_type) use ($regexp, $exclude) {
                 return preg_match($regexp, $root_type) == $exclude;
             }, ARRAY_FILTER_USE_KEY);
         }
@@ -338,7 +338,7 @@ 
          * click if nothing is expanded
          */
         $types_shown = false;
-        if (    !empty($expanded_types)
+        if (!empty($expanded_types)
              && midgard_admin_asgard_plugin::get_preference('navigation_type') === 'dropdown') {
             $this->_draw_select_navigation();
             $types_shown = true;

lib/midgard/admin/asgard/handler/object/permissions.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
         $tmp = $this->_object;
 
         $i = 0;
-        while (   !empty($tmp->guid)
+        while (!empty($tmp->guid)
                && !($tmp instanceof midcom_db_topic)
                && $i < 100) {
             // Get the parent; wishing eventually to get a topic
@@ -127,7 +127,7 @@ 
 
         $assignees = $this->load_assignees();
         $this->process_assignees($assignees, $schemadb);
-        $assignee_field =& $schemadb->get('privileges')->get_field('add_assignee');
+        $assignee_field = & $schemadb->get('privileges')->get_field('add_assignee');
 
         if (!$this->additional_assignee) {
             // Populate additional assignee selector

lib/midcom/helper/imagepopup/handler/upload.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         $temp = $request->files->get('file');
 
         // Verify file extension
-        if (   !$temp instanceof UploadedFile
+        if (!$temp instanceof UploadedFile
             || !in_array(strtolower($temp->getClientOriginalExtension()), ["gif", "jpg", "png"])) {
             throw new midcom_error('Invalid extension.');
         }

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

Braces +2 added lines, -1 removed lines

@@ -33,7 +33,8 @@
                 $member->require_do('midgard:update');
                 $member->extra = $request->request->get('title');
                 $response['status'] = $member->update();
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
             $response['message'] = midcom_connection::get_error_string();

lib/org/openpsa/relatedto/handler/relatedto.php

Braces +6 added lines, -3 removed lines

@@ -116,7 +116,8 @@ 
             //TODO: check for duplicates ?
             try {
                 $result = ['other_obj' => midcom::get()->dbfactory->get_object_by_guid($link[$other . 'Guid'])];
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 continue;
             }
             $result['link'] = [
@@ -403,7 +404,8 @@ 
             if (!($this->_object instanceof org_openpsa_relatedto_dba)) {
                 $response['status'] = "method requires guid of a link object as an argument";
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $response['status'] = "error: " . $e->getMessage();
         }
 
@@ -424,7 +426,8 @@ 
             $relation = new org_openpsa_relatedto_dba($guid);
             $result = $relation->delete();
             $status = 'Last message: ' . midcom_connection::get_error_string();
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $result = false;
             $status = "Object '{$guid}' could not be loaded, error:" . $e->getMessage();
         }

Spacing +2 added lines, -2 removed lines

@@ -196,10 +196,10 @@
      *
      * @param array $link The necessary link information
      */
-    private function _render_line(array $link, midcom_core_dbaobject &$other_obj)
+    private function _render_line(array $link, midcom_core_dbaobject & $other_obj)
     {
         $this->_request_data['link'] = $link;
-        $this->_request_data['other_obj'] =& $other_obj;
+        $this->_request_data['other_obj'] = & $other_obj;
         $this->_request_data['icon'] = midcom_helper_reflector::get_object_icon($other_obj);
 
         if (get_class($other_obj) != $link['class']) {

lib/org/openpsa/contacts/handler.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
         $prefix = $nap->get_node($this->_topic->id)[MIDCOM_NAV_ABSOLUTEURL];
 
         $tree = new org_openpsa_widgets_tree(org_openpsa_contacts_group_dba::class, 'owner');
-        $tree->link_callback = function ($guid) use ($prefix) {
+        $tree->link_callback = function($guid) use ($prefix) {
             return $prefix . 'group/' . $guid . '/';
         };
         $tree->constraints[] = ['orgOpenpsaObtype', '<', org_openpsa_contacts_group_dba::ORGANIZATION];

src/midcom/datamanager/indexer/document.php

Spacing +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
                     if (!empty($field->vars['value'])) {
                         //only index the first attachment for now
                         $attachment = array_shift($field->vars['value']);
-                        if (   !$attachment instanceof \midcom_db_attachment
+                        if (!$attachment instanceof \midcom_db_attachment
                             && !empty($attachment['object'])) {
                             //This is the form edit case
                             //@todo: In create case, nothing is found currently

lib/midcom/helper/toolbar.php

Spacing +8 added lines, -8 removed lines

@@ -340,7 +340,7 @@ 
 
         $item = array_replace($defaults, $item);
 
-        if (   !empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
+        if (!empty($item[MIDCOM_TOOLBAR_ACCESSKEY])
             && !array_key_exists($item[MIDCOM_TOOLBAR_ACCESSKEY], $used_access_keys)) {
             // We have valid access key, add it to help text
             $prefix = 'Alt-';
@@ -365,7 +365,7 @@ 
     private function set_url(array &$item, string $url)
     {
         $item[MIDCOM_TOOLBAR__ORIGINAL_URL] = $url;
-        if (   (   empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
+        if ((empty($item[MIDCOM_TOOLBAR_OPTIONS]["rel"])
                 // Some items may want to keep their links unmutilated
                 || $item[MIDCOM_TOOLBAR_OPTIONS]["rel"] != "directlink")
             && !str_starts_with($url, '/')
@@ -390,7 +390,7 @@ 
 
         if ($index == 0) {
             array_shift($this->items);
-        } elseif ($index == count($this->items) -1) {
+        } elseif ($index == count($this->items) - 1) {
             array_pop($this->items);
         } else {
             $this->items = array_merge(array_slice($this->items, 0, $index),
@@ -513,7 +513,7 @@ 
      */
     public function render() : string
     {
-        $visible_items = array_filter($this->items, function ($item) {
+        $visible_items = array_filter($this->items, function($item) {
             return !$item[MIDCOM_TOOLBAR_HIDDEN];
         });
         $this->rendered = true;
@@ -576,7 +576,7 @@ 
             // Try finding uppercase version of the accesskey first
             $accesskey = strtoupper($item[MIDCOM_TOOLBAR_ACCESSKEY]);
             $position = strpos($label, $accesskey);
-            if (   $position === false
+            if ($position === false
                 && midcom::get()->i18n->get_current_language() == 'en') {
                 // Try lowercase, too
                 $accesskey = strtolower($accesskey);
@@ -636,7 +636,7 @@ 
             $attributes['title'] = $item[MIDCOM_TOOLBAR_HELPTEXT];
         }
 
-        if (   $item[MIDCOM_TOOLBAR_ENABLED]
+        if ($item[MIDCOM_TOOLBAR_ENABLED]
             && $item[MIDCOM_TOOLBAR_ACCESSKEY] !== null) {
             $attributes['class'] = 'accesskey';
             $attributes['accesskey'] = $item[MIDCOM_TOOLBAR_ACCESSKEY];
@@ -699,7 +699,7 @@ 
     public function get_index_from_url(string $url) : ?int
     {
         foreach ($this->items as $i => $item) {
-            if (   $item[MIDCOM_TOOLBAR_URL] == $url
+            if ($item[MIDCOM_TOOLBAR_URL] == $url
                 || $item[MIDCOM_TOOLBAR__ORIGINAL_URL] == $url) {
                 return $i;
             }
@@ -717,7 +717,7 @@ 
      *
      * @param mixed $index The integer index or URL to check
      */
-    protected function _check_index($index, bool $raise_error = true) :?int
+    protected function _check_index($index, bool $raise_error = true) : ?int
     {
         if (is_string($index)) {
             $url = $index;