flack / openpsa

lib/org/openpsa/mail/exec/test.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 midcom::get()->auth->require_admin_user();
 $post = Request::createFromGlobals()->request;
 
-if (   !$post->get('to')
+if (!$post->get('to')
     || !$post->get('from')) {
     ?>
     <h2>Send test email</h2>

lib/org/openpsa/invoices/status.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
     {
         $entries = array_merge($this->get_status_entries(), $this->get_journal_entries());
 
-        usort($entries, function (array $a, array $b) {
+        usort($entries, function(array $a, array $b) {
             if ($a['timestamp'] == $b['timestamp']) {
                 return $b['order'] <=> $a['order'];
             }
@@ -92,8 +92,8 @@ 
                 'order' => 3
             ];
         }
-        if (   $this->invoice->due
-            && (   (   $this->invoice->due < time()
+        if ($this->invoice->due
+            && (($this->invoice->due < time()
                     && $this->invoice->paid == 0)
                 || $this->invoice->due < $this->invoice->paid)) {
             $entries[] = [

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 (string $guid) use ($prefix) {
+        $tree->link_callback = function(string $guid) use ($prefix) {
             return $prefix . 'group/' . $guid . '/';
         };
         $tree->constraints[] = ['orgOpenpsaObtype', '<', org_openpsa_contacts_group_dba::ORGANIZATION];

lib/org/openpsa/invoices/invoice/pdf.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
             $attachment->update();
         } else {
             $attachment = $this->invoice->create_attachment($filename, $this->invoice->get_label(), "application/pdf");
-            if (   !$attachment
+            if (!$attachment
                 || !$this->invoice->set_parameter("midcom.helper.datamanager2.type.blobs", $name, $attachment->guid . ":" . $attachment->guid)) {
                 throw new midcom_error("Failed to create invoice attachment for pdf: " . midcom_connection::get_error_string());
             }

lib/org/openpsa/invoices/handler/invoice/action.php

Braces +4 added lines, -2 removed lines

@@ -125,7 +125,8 @@ 
         try {
             $pdf_helper->render_and_attach();
             return $this->reply(true, $this->_l10n->get('pdf created'));
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $this->reply(false, $this->_l10n->get('pdf creation failed') . ': ' . $e->getMessage());
         }
     }
@@ -136,7 +137,8 @@ 
         try {
             $pdf_helper->render_and_attach('reminder');
             return $this->reply(true, $this->_l10n->get('reminder pdf created'));
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $this->reply(false, $this->_l10n->get('reminder pdf creation failed') . ': ' . $e->getMessage());
         }
     }    

lib/org/openpsa/user/validator.php

Braces +2 added lines, -2 removed lines

@@ -162,10 +162,10 @@
         $result = [];
 
         $accounthelper = $this->get_accounthelper(new midcom_db_person($fields["person"]));
-        if (!$accounthelper->check_password_reuse($fields['new_password'])){
+        if (!$accounthelper->check_password_reuse($fields['new_password'])) {
             $result['password'] = $this->l10n->get('password was already used');
         }
-        if (!$accounthelper->check_password_strength($fields['new_password'])){
+        if (!$accounthelper->check_password_strength($fields['new_password'])) {
             $result['password'] = $this->l10n->get('password weak');
         }
         return $result ?: true;

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
     {
         $result = $this->is_username_available($fields);
 
-        if (   $fields['password']['switch']
+        if ($fields['password']['switch']
             && !$this->get_accounthelper()->check_password_strength((string) $fields['password']['password'])) {
             $result = ['password' => $this->l10n->get('password weak')];
         }
@@ -162,10 +162,10 @@ 
         $result = [];
 
         $accounthelper = $this->get_accounthelper(new midcom_db_person($fields["person"]));
-        if (!$accounthelper->check_password_reuse($fields['new_password'])){
+        if (!$accounthelper->check_password_reuse($fields['new_password'])) {
             $result['password'] = $this->l10n->get('password was already used');
         }
-        if (!$accounthelper->check_password_strength($fields['new_password'])){
+        if (!$accounthelper->check_password_strength($fields['new_password'])) {
             $result['password'] = $this->l10n->get('password weak');
         }
         return $result ?: true;

lib/midcom/helper/toolbar.php

Spacing +16 added lines, -16 removed lines

@@ -223,7 +223,7 @@ 
      * @see midcom_helper_toolbar::_check_index()
      * @see midcom_helper_toolbar::clean_item()
      */
-    public function add_item(array $item, string|int $before = -1)
+    public function add_item(array $item, string | int $before = -1)
     {
         if ($before != -1) {
             $before = $this->_check_index($before, false);
@@ -249,7 +249,7 @@ 
      *     it before a URL, an integer will insert it before a
      *     given index.
      */
-    public function add_items(array $items, string|int $before = -1)
+    public function add_items(array $items, string | int $before = -1)
     {
         foreach ($items as $item) {
             $this->add_item($item, $before);
@@ -279,7 +279,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-';
@@ -304,7 +304,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, '/')
@@ -323,13 +323,13 @@ 
      * @see midcom_helper_toolbar::get_index_from_url()
      * @see midcom_helper_toolbar::_check_index()
      */
-    public function remove_item(string|int $index)
+    public function remove_item(string | int $index)
     {
         $index = $this->_check_index($index);
 
         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),
@@ -350,7 +350,7 @@ 
      *
      * @param string|int $index The integer index or URL of the item to enable.
      */
-    public function enable_item(string|int $index)
+    public function enable_item(string | int $index)
     {
         $index = $this->_check_index($index);
         $this->items[$index][MIDCOM_TOOLBAR_ENABLED] = true;
@@ -361,7 +361,7 @@ 
      *
      * @param string|int $index The integer index or URL of the item to disable.
      */
-    public function disable_item(string|int $index)
+    public function disable_item(string | int $index)
     {
         $index = $this->_check_index($index, false);
 
@@ -375,7 +375,7 @@ 
      *
      * @param string|int $index The integer index or URL of the item to hide.
      */
-    public function hide_item(string|int $index)
+    public function hide_item(string | int $index)
     {
         $index = $this->_check_index($index, false);
 
@@ -389,7 +389,7 @@ 
      *
      * @param string|int $index The integer index or URL of the item to show.
      */
-    public function show_item(string|int $index)
+    public function show_item(string | int $index)
     {
         $index = $this->_check_index($index);
         $this->items[$index][MIDCOM_TOOLBAR_HIDDEN] = false;
@@ -403,7 +403,7 @@ 
      * @see midcom_helper_toolbar::_check_index()
      * @see midcom_helper_toolbar::add_item()
      */
-    public function update_item_url(string|int $index, string $url)
+    public function update_item_url(string | int $index, string $url)
     {
         $index = $this->_check_index($index);
         $this->set_url($this->items[$index], $url);
@@ -414,7 +414,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;
@@ -480,7 +480,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);
@@ -540,7 +540,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];
@@ -591,7 +591,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;
             }
@@ -609,7 +609,7 @@ 
      *
      * @param string|int $index The integer index or URL to check
      */
-    protected function _check_index(string|int $index, bool $raise_error = true) :?int
+    protected function _check_index(string | int $index, bool $raise_error = true) : ?int
     {
         if (is_string($index)) {
             $url = $index;

lib/midcom/helper/reflector/main.php

Spacing +5 added lines, -5 removed lines

@@ -51,7 +51,7 @@ 
      *
      * @return static
      */
-    public static function get(string|object $src) : self
+    public static function get(string | object $src) : self
     {
         $identifier = get_called_class() . (is_object($src) ? get_class($src) : $src);
 
@@ -286,7 +286,7 @@ 
 
         $label_prop = $this->get_label_property();
 
-        if (    $label_prop != 'guid'
+        if ($label_prop != 'guid'
              && $this->property_exists($label_prop)) {
             $search_properties[$label_prop] = true;
         }
@@ -336,7 +336,7 @@ 
                 continue;
             }
 
-            if (   !$this->is_link($property)
+            if (!$this->is_link($property)
                 && $this->get_midgard_type($property) != MGD_TYPE_GUID) {
                 continue;
             }
@@ -370,7 +370,7 @@ 
     protected static function class_rewrite(string $schema_type) : string
     {
         $extends = midcom_baseclasses_components_configuration::get('midcom.helper.reflector', 'config')->get_array('class_extends');
-        if (   isset($extends[$schema_type])
+        if (isset($extends[$schema_type])
             && class_exists($extends[$schema_type])) {
             return $extends[$schema_type];
         }
@@ -390,7 +390,7 @@ 
     /**
      * Get the MgdSchema classname for given class
      */
-    public static function resolve_baseclass(string|object $classname) : string
+    public static function resolve_baseclass(string | object $classname) : string
     {
         static $cached = [];
 

Braces +2 added lines, -1 removed lines

@@ -153,7 +153,8 @@
         if ($object instanceof mgdobject) {
             try {
                 $obj = midcom::get()->dbfactory->convert_midgard_to_midcom($object);
-            } catch (midcom_error) {
+            }
+            catch (midcom_error) {
                 return null;
             }
         } else {

lib/midcom/helper/_dbfactory.php

Spacing +5 added lines, -5 removed lines

@@ -55,7 +55,7 @@ 
 
             throw new midcom_error_midgard($e, $guid);
         }
-        if (   get_class($tmp) == 'midgard_person'
+        if (get_class($tmp) == 'midgard_person'
             && $this->person_class != 'midgard_person') {
             $tmp = new $this->person_class($guid);
         }
@@ -67,7 +67,7 @@ 
      *
      * @param string $classname Which DBA are we dealing with
      */
-    public function get_cached(string $classname, string|int $src) : midcom_core_dbaobject
+    public function get_cached(string $classname, string | int $src) : midcom_core_dbaobject
     {
         static $cache = [];
 
@@ -84,7 +84,7 @@ 
         }
         $object = new $classname($src);
         $cache[$classname][$object->guid] = $object;
-        $cache[$classname][$object->id] =& $cache[$classname][$object->guid];
+        $cache[$classname][$object->id] = & $cache[$classname][$object->guid];
         return $cache[$classname][$object->guid];
     }
 
@@ -131,7 +131,7 @@ 
             return true;
         }
 
-        if (   isset($object->__object)
+        if (isset($object->__object)
             && is_object($object->__object)
             && $object->__object instanceof $class) {
             // Decorator whose MgdSchema object matches
@@ -154,7 +154,7 @@ 
             return $this->get_parent_data_uncached($object);
         });
 
-        if (   empty($parent_guid)
+        if (empty($parent_guid)
             || $parent_guid === $object->guid) {
             return null;
         }

Braces +4 added lines, -2 removed lines

@@ -50,7 +50,8 @@ 
     {
         try {
             $tmp = midgard_object_class::get_object_by_guid($guid);
-        } catch (mgd_exception $e) {
+        }
+        catch (mgd_exception $e) {
             debug_add('Loading object by GUID ' . $guid . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_INFO);
 
             throw new midcom_error_midgard($e, $guid);
@@ -159,7 +160,8 @@ 
 
         try {
             return $this->get_cached($classname, $parent_guid);
-        } catch (midcom_error) {
+        }
+        catch (midcom_error) {
             return null;
         }
     }