flack / openpsa

src/midcom/grid/grid.php

Spacing +4 added lines, -4 removed lines

@@ -109,7 +109,7 @@ 
         if (file_exists(MIDCOM_STATIC_ROOT . $jqgrid_path . 'i18n/grid.locale-' . $language . '.js')) {
             $lang = $language;
         }
-        $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'i18n/grid.locale-'. $lang . '.js');
+        $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'i18n/grid.locale-' . $lang . '.js');
         $head->add_jsfile(MIDCOM_STATIC_URL . $jqgrid_path . 'jquery.jqgrid.min.js');
 
         $head->add_jsfile(MIDCOM_STATIC_URL . '/midcom.grid/jqGrid.custom.js');
@@ -155,7 +155,7 @@ 
     public function set_option(string $key, $value, bool $autoquote_string = true) : self
     {
         $this->_raw_options[$key] = $value;
-        if (   $autoquote_string
+        if ($autoquote_string
             && is_string($value)) {
             $value = '"' . str_replace('"', '\\"', $value) . '"';
         } elseif ($value === true) {
@@ -185,7 +185,7 @@ 
     public function set_select_column(string $name, string $label, string $options, array $selectdata) : self
     {
         $selectstring = implode(';', array_map(
-            function ($key, $value) {
+            function($key, $value) {
                 return $key . ':' . $value;
             },
             array_keys($selectdata),
@@ -231,7 +231,7 @@ 
      */
     public function remove_column(string $name)
     {
-        if (   empty($name)
+        if (empty($name)
             || !array_key_exists($name, $this->_columns)) {
             throw new midcom_error('Invalid column name ' . $name);
         }

src/midcom/workflow/datamanager.php

Spacing +2 added lines, -2 removed lines

@@ -122,8 +122,8 @@
             return 'undefined';
         }
 
-        if (   !str_starts_with($url, '/')
-            && ! preg_match('|^https?://|', $url)) {
+        if (!str_starts_with($url, '/')
+            && !preg_match('|^https?://|', $url)) {
             $url = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX) . $url;
         }
         return '"' . $url . '"';

lib/fi/protie/navigation/main.php

Spacing +7 added lines, -7 removed lines

@@ -281,8 +281,8 @@ 
         $classes = [];
 
         if ($item[MIDCOM_NAV_TYPE] === 'node') {
-            if (   $item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
-                && (   !$this->_nap->get_current_leaf()
+            if ($item[MIDCOM_NAV_ID] === $this->_nap->get_current_node()
+                && (!$this->_nap->get_current_leaf()
                     || !$this->_nap->get_leaf($this->_nap->get_current_leaf()))) {
                 $classes[] = $this->css_active;
             }
@@ -316,7 +316,7 @@ 
         }
 
         // Add information about the object's status
-        if (   $this->object_status_to_class
+        if ($this->object_status_to_class
             && isset($item[MIDCOM_NAV_OBJECT])
             && $css_status_class = midcom::get()->metadata->get_object_classes($item[MIDCOM_NAV_OBJECT])) {
             $classes[] = $css_status_class;
@@ -336,12 +336,12 @@ 
         echo "<a href=\"{$item[MIDCOM_NAV_ABSOLUTEURL]}\"{$link_class}>" . htmlspecialchars($item[MIDCOM_NAV_NAME]) . "</a>";
         // If either of the follow nodes switches is on, follow all the nodes
 
-        if (   $item[MIDCOM_NAV_TYPE] === 'node'
+        if ($item[MIDCOM_NAV_TYPE] === 'node'
             && !$this->show_only_current
-            && (   $this->list_levels === 0
+            && ($this->list_levels === 0
                 || $this->_level < $this->list_levels)) {
-            if (   $this->follow_all
-                || (   $this->follow_selected
+            if ($this->follow_all
+                || ($this->follow_selected
                     && in_array($item[MIDCOM_NAV_ID], $this->node_path, true))) {
                 $this->_level++;
                 $this->_list_child_elements($item[MIDCOM_NAV_ID]);

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

Braces +4 added lines, -2 removed lines

@@ -56,7 +56,8 @@ 
         try {
             midcom::get()->dynamic_load($batch_url);
             $ret = true;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $ret = $e->getMessage();
         }
         ob_end_clean();
@@ -83,7 +84,8 @@ 
         $stat = true;
         try {
             $campaign = new org_openpsa_directmarketing_campaign_dba($args['campaign_guid']);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error("{$args['campaign_guid']} is not a valid campaign GUID");
             $stat = false;
         }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public function _on_watched_dba_delete(midcom_core_dbaobject $object)
     {
         $qb = org_openpsa_directmarketing_campaign_member_dba::new_query_builder();
-        if (   $object instanceof midcom_db_person
+        if ($object instanceof midcom_db_person
             || $object instanceof org_openpsa_contacts_person_dba) {
             $qb->add_constraint('person', '=', $object->id);
         } elseif ($object instanceof org_openpsa_directmarketing_campaign_dba) {

lib/org/openpsa/helpers/fileinfo.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
          * if nothing matched so far and the subtype is alphanumeric, uppercase it on the theory
          * that it's probably a file extension
          */
-        if (   $st_orig == $subtype
+        if ($st_orig == $subtype
             && preg_match('/^[a-z0-9]+$/', $subtype)) {
             $subtype = strtoupper($subtype);
         }

lib/org/openpsa/documents/document.php

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
             return;
         }
         $parent = $this->get_parent();
-        if (   $parent
+        if ($parent
             && $parent->component == 'org.openpsa.documents') {
             midcom::get()->auth->request_sudo('org.openpsa.documents');
 
@@ -154,7 +154,7 @@ 
             $backup_attachment = $backup->create_attachment($original_attachment->name, $original_attachment->title, $original_attachment->mimetype);
 
             $original_handle = $original_attachment->open('r');
-            if (   !$backup_attachment
+            if (!$backup_attachment
                 || !$original_handle) {
                 // Failed to copy the attachment, abort
                 return $backup->delete();

lib/org/openpsa/widgets/contact.php

Spacing +7 added lines, -7 removed lines

@@ -159,12 +159,12 @@ 
             }
         }
 
-        if (   $this->_config->get('jabber_enable_presence')
+        if ($this->_config->get('jabber_enable_presence')
             && $person->get_parameter('org.openpsa.jabber', 'jid')) {
             $this->contact_details['jid'] = $person->get_parameter('org.openpsa.jabber', 'jid');
         }
 
-        if (   $this->_config->get('skype_enable_presence')
+        if ($this->_config->get('skype_enable_presence')
             && $person->get_parameter('org.openpsa.skype', 'name')) {
             $this->contact_details['skype'] = $person->get_parameter('org.openpsa.skype', 'name');
         }
@@ -201,7 +201,7 @@ 
         if (!empty($attachments[$type])) {
             return '<img class="photo" src="' . midcom_db_attachment::get_url($attachments[$type]) . '">';
         }
-        if (   $this->_config->get('gravatar_enable')
+        if ($this->_config->get('gravatar_enable')
             && !empty($this->contact_details['email'])) {
             $size = ($type == 'view') ? 500 : 32;
             $gravatar_url = "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->contact_details['email']))) . "?s=" . $size . '&d=identicon';
@@ -313,7 +313,7 @@ 
 
     private function _show_groups()
     {
-        if (   !$this->show_groups
+        if (!$this->show_groups
             || empty($this->contact_details['id'])) {
             return;
         }
@@ -377,7 +377,7 @@ 
                     $default_shown = true;
                     $cards_to_show[] = $cardname;
                 }
-            } elseif (    $customer->$property
+            } elseif ($customer->$property
                       || ($customer->street && !$inherited_cards_only && !$default_shown)) {
                 $inherited_cards_only = false;
                 $multiple_addresses = true;
@@ -398,8 +398,8 @@ 
 
         foreach ($cards_to_show as $cardname) {
             echo '<div class="vcard">';
-            if (   $multiple_addresses
-                || (   $cardname != 'visiting'
+            if ($multiple_addresses
+                || ($cardname != 'visiting'
                     && !$inherited_cards_only)) {
                 echo '<div style="text-align:center"><em>' . midcom::get()->i18n->get_string($cardname . ' address', 'org.openpsa.contacts') . "</em></div>\n";
             }

Braces +4 added lines, -2 removed lines

@@ -113,7 +113,8 @@ 
 
         try {
             $person = midcom_db_person::get_cached($src);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return $cache[$src] = new self(new midcom_db_person);
         }
 
@@ -313,7 +314,8 @@ 
         foreach ($mc->get_rows(['gid', 'extra']) as $data) {
             try {
                 $group = org_openpsa_contacts_group_dba::get_cached($data['gid']);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
                 continue;
             }

lib/midcom/services/rcs/handler.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
     {
         $this->object = midcom::get()->dbfactory->get_object_by_guid($guid);
 
-        if (   !midcom::get()->config->get('midcom_services_rcs_enable')
+        if (!midcom::get()->config->get('midcom_services_rcs_enable')
             || !$this->object->_use_rcs) {
             throw new midcom_error_notfound("Revision control not supported for " . get_class($this->object) . ".");
         }
@@ -262,7 +262,7 @@ 
             throw new midcom_error_notfound("Revision {$args[1]} does not exist.");
         }
 
-        $data['preview'] = array_filter($this->backend->get_revision($revision), function ($value, $key) {
+        $data['preview'] = array_filter($this->backend->get_revision($revision), function($value, $key) {
             return !is_array($value)
                 && !in_array($value, ['', '0000-00-00'])
                 && midcom_services_rcs::is_field_showable($key);
@@ -292,7 +292,7 @@ 
         $this->object->require_do('midgard:update');
         // TODO: set another privilege for restoring?
 
-        if (   $this->backend->get_history()->version_exists($args[1])
+        if ($this->backend->get_history()->version_exists($args[1])
             && $this->backend->restore_to_revision($args[1])) {
             midcom::get()->uimessages->add($this->_l10n->get('midcom.admin.rcs'), sprintf($this->_l10n->get('restore to version %s successful'), $args[1]));
             return new midcom_response_relocate($this->get_object_url());

lib/midcom/admin/rcs/style/midcom-admin-rcs-history.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         echo "                    <td><a href='" . $data['router']->generate('preview', ['guid' => $guid, 'revision' => $number]) . "'>{$revision['version']}</a></td>\n";
         echo "                    <td>" . $formatter->datetime($revision['date']) . "</td>\n";
 
-        if (   $revision['user']
+        if ($revision['user']
             && $user = midcom::get()->auth->get_user($revision['user'])) {
             $person_label = $user->get_storage()->name;
             echo "                    <td>{$person_label}</td>\n";