flack / openpsa

lib/org/openpsa/mail/template.php

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
         foreach ($parameters as $key => $value) {
             $this->_patterns[] = "/__({$key})__/";
 
-            if (   is_array($value)
+            if (is_array($value)
                 || is_object($value)) {
                 $this->_patterns[] = "/__({$key})_([^ \.>\"-]*?)__/";
             }

lib/org/openpsa/directmarketing/sender.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
         $this->from = $from;
         $this->subject = $subject;
 
-        if (   $message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_TEXT
+        if ($message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_TEXT
             && $message->orgOpenpsaObtype != org_openpsa_directmarketing_campaign_message_dba::EMAIL_HTML) {
             throw new midcom_error('unsupported message type');
         }
@@ -219,7 +219,7 @@ 
         $token .= midcom_helper_misc::random_string($this->token_size - 1, 'abcdefghijklmnopqrstuvwxyz0123456789');
 
         //If token is not free or (very, very unlikely) matches our dummy token, recurse.
-        if (   $token === 'dummy'
+        if ($token === 'dummy'
             || !org_openpsa_directmarketing_campaign_messagereceipt_dba::token_is_free($token)) {
             return $this->_create_token();
         }
@@ -240,7 +240,7 @@ 
             return null;
         }
         $type = $this->_backend->get_type();
-        if (   $person->get_parameter('org.openpsa.directmarketing', "send_all_denied")
+        if ($person->get_parameter('org.openpsa.directmarketing', "send_all_denied")
             || $person->get_parameter('org.openpsa.directmarketing', "send_{$type}_denied")) {
             debug_add("Sending {$type} messages to person {$person->rname} is denied, unsubscribing member (member #{$member->id})");
             $member->orgOpenpsaObtype = org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED;

Braces +4 added lines, -2 removed lines

@@ -160,7 +160,8 @@ 
             $this->_backend->send($person, $member, $token, $subject, $content, $from);
             self::$_messages_sent++;
             $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $status = org_openpsa_directmarketing_campaign_messagereceipt_dba::FAILURE;
             if (!$this->test_mode) {
                 $params[] = [
@@ -209,7 +210,8 @@ 
     {
         try {
             $person = org_openpsa_contacts_person_dba::get_cached($member->person);
-        } catch (midcom_error) {
+        }
+        catch (midcom_error) {
             debug_add("Person #{$member->person} deleted or missing, removing member (member #{$member->id})");
             $member->orgOpenpsaObtype = org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED;
             $member->delete();

lib/midcom/services/auth/backend.php

Spacing +2 added lines, -2 removed lines

@@ -100,7 +100,7 @@ 
             return null;
         }
 
-        if (   midcom::get()->config->get('auth_check_client_ip')
+        if (midcom::get()->config->get('auth_check_client_ip')
             && $data['clientip'] != $request->getClientIp()) {
             debug_add("The session had mismatching client IP.", MIDCOM_LOG_INFO);
             debug_add("Expected {$data['clientip']}, got {$request->getClientIp()}.");
@@ -114,7 +114,7 @@ 
             return null;
         }
 
-        if (   !$this->check_timestamp($data['timestamp'], $user)
+        if (!$this->check_timestamp($data['timestamp'], $user)
             || !$this->authenticate($user->username, '', true)) {
             $this->logout($user);
             return null;

Braces +2 added lines, -1 removed lines

@@ -77,7 +77,8 @@
         if (!array_key_exists($id, $this->_user_cache)) {
             try {
                 $this->_user_cache[$id] = new midcom_core_user($param);
-            } catch (midcom_error) {
+            }
+            catch (midcom_error) {
                 // Keep it silent while missing user object can mess here
                 $this->_user_cache[$id] = null;
             }

lib/midgard/admin/asgard/handler/undelete.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
             $child_indent = $indent + 20;
             echo "{$prefix}<tbody class=\"children\">\n";
             foreach ($child_types as $type => $children) {
-                if (   count($children) < 10
+                if (count($children) < 10
                     || isset($_GET['show_children'][$object->guid][$type])) {
                         foreach ($children as $child) {
                             $this->show_type($child, $child_indent, "{$prefix}    ", false);

lib/net/nehmer/blog/style/index-item.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         &(published:h);
             <?php
             if ($data['linked']) {
-                echo $data['l10n']->get('to') ." <a href=\"{$data['node'][MIDCOM_NAV_ABSOLUTEURL]}\">{$data['node'][MIDCOM_NAV_NAME]}</a>\n";
+                echo $data['l10n']->get('to') . " <a href=\"{$data['node'][MIDCOM_NAV_ABSOLUTEURL]}\">{$data['node'][MIDCOM_NAV_NAME]}</a>\n";
             }
             ?>
     </p>

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

Spacing +2 added lines, -2 removed lines

@@ -141,8 +141,8 @@
         $schema->get_field('paid')['hidden'] = empty($this->invoice->paid);
 
         $contact = $this->invoice->customerContact ?: $this->contact_id;
-        $customer_field =& $schema->get_field('customer');
-        $contact_field =& $schema->get_field('customerContact');
+        $customer_field = & $schema->get_field('customer');
+        $contact_field = & $schema->get_field('customerContact');
 
         if (!empty($contact)) {
             $customer_field['type_config']['options'] = $this->get_customers_for_contact($contact);

Braces +4 added lines, -2 removed lines

@@ -42,7 +42,8 @@ 
             // We're creating invoice for chosen customer
             try {
                 $this->customer = new org_openpsa_contacts_group_dba($company);
-            } catch (midcom_error) {
+            }
+            catch (midcom_error) {
                 $contact = new org_openpsa_contacts_person_dba($company);
                 $this->contact_id = $contact->id;
             }
@@ -143,7 +144,8 @@ 
             if (!empty($this->invoice->customer)) {
                 try {
                     $this->customer = org_openpsa_contacts_group_dba::get_cached($this->invoice->customer);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $customer_field['hidden'] = true;
                     $e->log();
                 }

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

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     public function _handler_create(Request $request, string $guid)
     {
         $current_object = midcom::get()->dbfactory->get_object_by_guid($guid);
-        $entry= new org_openpsa_relatedto_journal_entry_dba();
+        $entry = new org_openpsa_relatedto_journal_entry_dba();
         $entry->linkGuid = $current_object->guid;
 
         midcom::get()->head->set_pagetitle($this->_l10n->get('add journal entry'));
@@ -52,7 +52,7 @@ 
         $workflow = $this->get_workflow('datamanager', ['controller' => $data['controller']]);
         if ($entry->can_do('midgard:delete')) {
             $delete = $this->get_workflow('delete', ['object' => $entry]);
-            $url = $this->router->generate('journal_entry_delete', ['guid' => $guid ]);
+            $url = $this->router->generate('journal_entry_delete', ['guid' => $guid]);
             $workflow->add_dialog_button($delete, $url);
         }
         return $workflow->run($request);

src/midcom/console/command/repligard.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
     private function _confirm(InputInterface $input, OutputInterface $output) : bool
     {
         $options = [true => 'y', false => 'N'];
-        $question = '<question>Delete all rows? [' . implode('|', $options). ']</question> ';
+        $question = '<question>Delete all rows? [' . implode('|', $options) . ']</question> ';
         $question = new ConfirmationQuestion($question, false);
         $dialog = $this->getHelperSet()->get('question');
         return $dialog->ask($input, $output, $question);

Braces +2 added lines, -1 removed lines

@@ -37,7 +37,8 @@
     {
         try {
             $this->db = connection::get_em()->getConnection()->getNativeConnection();
-        } catch (\Exception) {
+        }
+        catch (\Exception) {
             $this->db = $this->create_connection($input, $output);
         }
 

src/midcom/datamanager/template/form.php

Spacing +8 added lines, -8 removed lines

@@ -84,7 +84,7 @@ 
     public function form_end(FormView $view, array $data)
     {
         $string = '';
-        if (   !isset($data['render_rest'])
+        if (!isset($data['render_rest'])
             || $data['render_rest']) {
             $string .= $this->renderer->rest($view);
         }
@@ -223,7 +223,7 @@ 
             $data['attr']['class'] = 'shorttext';
         }
 
-        if (   !empty($data['value'])
+        if (!empty($data['value'])
             || is_numeric($data['value'])) {
             $data['attr']['value'] = $data['value'];
         }
@@ -265,7 +265,7 @@ 
     {
         if ($view->vars['readonly']) {
             $string = $this->get_view_renderer()->autocomplete_widget($view, $data);
-            return $string .  $this->renderer->widget($view['selection']);
+            return $string . $this->renderer->widget($view['selection']);
         }
 
         autocomplete::add_head_elements($data['handler_options']['creation_mode_enabled'], $data['handler_options']['sortable']);
@@ -275,7 +275,7 @@ 
         $jsinit .= "midcom_helper_datamanager2_autocomplete.create_dm2_widget('{$element_id}_search_input', {$data['min_chars']});\n";
 
         $string = '<fieldset ' . $this->renderer->block($view, 'widget_container_attributes') . '>';
-        $string .=  $this->renderer->widget($view['selection']);
+        $string .= $this->renderer->widget($view['selection']);
         $string .= ' ' . $this->renderer->widget($view['search_input']);
         $string .= '</fieldset>';
         return $string . $this->jsinit($jsinit);
@@ -324,7 +324,7 @@ 
         }
 
         $string = '<select ';
-        if (   $data['required']
+        if ($data['required']
             && null === $data['placeholder']
             && $data['placeholder_in_choices'] === false
             && $data['multiple'] === false) {
@@ -338,7 +338,7 @@ 
         $string .= $this->renderer->block($view, 'widget_attributes', $data) . '>';
         if (null !== $data['placeholder']) {
             $string .= '<option value=""';
-            if (   $data['required']
+            if ($data['required']
                 && empty($data['value'])
                 && "0" !== $data['value']) {
                 $string .= ' selected="selected"';
@@ -500,7 +500,7 @@ 
             $string .= '<label class="midcom_datamanager_photo_label">' . $this->renderer->humanize('delete photo') . ' ' . $this->renderer->widget($data['form']['delete']) . '</label>';
             $string .= '<ul>';
             foreach ($objects as $info) {
-                if (   $info['size_x']
+                if ($info['size_x']
                     && $info['size_y']) {
                     $size = "{$info['size_x']}&times;{$info['size_y']}";
                 } else {
@@ -525,7 +525,7 @@ 
         $string .= '</td></tr></table></div>';
         $string .= $this->renderer->row($data['form']['identifier']);
 
-        return $string . $this->jsinit('init_image_widget("' . $view->vars['id'] .'");');
+        return $string . $this->jsinit('init_image_widget("' . $view->vars['id'] . '");');
     }
 
     public function subform_widget(FormView $view, array $data)