flack / openpsa

lib/net/nehmer/blog/handler/view.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
             ]);
         }
 
-        if (   $this->_article->topic === $this->_topic->id
+        if ($this->_article->topic === $this->_topic->id
             && $this->_article->can_do('midgard:delete')) {
             $delete = $this->get_workflow('delete', ['object' => $this->_article]);
             $buttons[] = $delete->get_button("delete/{$this->_article->guid}/");
@@ -83,7 +83,7 @@ 
         if ($this->_config->get('comments_enable')) {
             if ($node = net_nehmer_comments_interface::get_node($this->_topic, $this->_config->get('comments_topic'))) {
                 $data['comments_url'] = $node[MIDCOM_NAV_RELATIVEURL] . "comment/{$this->_article->guid}";
-                if (   $this->_topic->can_do('midgard:update')
+                if ($this->_topic->can_do('midgard:update')
                     && $this->_topic->can_do('net.nehmer.comments:moderation')) {
                     net_nehmer_comments_viewer::add_head_elements();
                 }

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

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) {

Braces +4 added lines, -2 removed lines

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

lib/errors.php

Spacing +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
             return;
         }
 
-        if (   !is_writable($config['filename'])
+        if (!is_writable($config['filename'])
             && !is_writable(dirname($config['filename']))) {
             debug_add("Error logging file {$config['filename']} is not writable", MIDCOM_LOG_WARN);
             return;

lib/org/openpsa/directmarketing/sender/backend/email.php

Indentation +7 added lines, -7 removed lines

@@ -148,13 +148,13 @@
     }
 
     /**
-    * Inserts a link detector to the given HTML source. All outgoing
-    * HTTP links in the source HTML are replaced with the given
-    * link detector address so that the token "URL" is replaced with
-    * encoded form of the original link. It is expected that the link detector
-    * address points to a script that records the passed link and
-    * forwards the client to the real link target.
-    */
+     * Inserts a link detector to the given HTML source. All outgoing
+     * HTTP links in the source HTML are replaced with the given
+     * link detector address so that the token "URL" is replaced with
+     * encoded form of the original link. It is expected that the link detector
+     * address points to a script that records the passed link and
+     * forwards the client to the real link target.
+     */
     private function _insert_link_detector(string $html, string $address) : string
     {
         $address = addslashes($address);

Spacing +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
         $address = addslashes($address);
         return preg_replace_callback(
             '/href="(http:\/\/.*?)"/i',
-            function (array $match) use ($address) {
+            function(array $match) use ($address) {
                 return 'href="' . str_replace("URL", rawurlencode($match[1]), $address) . '"';
             },
             $html);

lib/midcom/admin/folder/handler/move.php

Braces +2 added lines, -1 removed lines

@@ -47,7 +47,8 @@
                 $target = new midcom_db_topic($request->request->getInt('move_to'));
                 $this->_move_object($target);
                 midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('moved %s to %s'), $this->_topic->get_label(), $target->get_label()));
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 midcom::get()->uimessages->add($this->_l10n->get($this->_component), $e->getMessage(), 'error');
             }
         }

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     {
         $this->_object = midcom::get()->dbfactory->get_object_by_guid($guid);
 
-        if (   !($this->_object instanceof midcom_db_topic)
+        if (!($this->_object instanceof midcom_db_topic)
             && !($this->_object instanceof midcom_db_article)) {
             throw new midcom_error_notfound("Moving only topics and articles is supported.");
         }
@@ -66,7 +66,7 @@ 
     {
         $folder ??= midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ROOTTOPIC);
 
-        if (   $this->_object instanceof midcom_db_topic
+        if ($this->_object instanceof midcom_db_topic
             && $folder->up == $this->_object->id) {
             $tree_disabled = true;
         }
@@ -79,7 +79,7 @@ 
             $selected = ' checked="checked"';
         }
 
-        if (   !($this->_object instanceof midcom_db_topic)
+        if (!($this->_object instanceof midcom_db_topic)
             && $folder->component !== $this->current_folder->component) {
             // Non-topic objects may only be moved under folders of same component
             $class = 'wrong_component';

lib/org/openpsa/products/product/group.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
         }
 
         $result_cache[$cache_key] = [];
-        $ret =& $result_cache[$cache_key];
+        $ret = & $result_cache[$cache_key];
 
         if (empty($up)) {
             // TODO: use reflection to see what kind of property this is ?

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

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
             }
 
             $reflector = midcom_helper_reflector::get($linked_object);
-            $link_html = "<a href='" . midcom::get()->permalinks->create_permalink($linked_object->guid) . "'>" . $reflector->get_object_label($linked_object) ."</a>";
+            $link_html = "<a href='" . midcom::get()->permalinks->create_permalink($linked_object->guid) . "'>" . $reflector->get_object_label($linked_object) . "</a>";
             $data['linked_objects'][$entry->linkGuid] = $link_html;
             $data['linked_raw_objects'][$entry->linkGuid] = $reflector->get_object_label($linked_object);
         }

Braces +2 added lines, -1 removed lines

@@ -142,7 +142,8 @@
             //create reflector with linked object to get the right label
             try {
                 $linked_object = midcom::get()->dbfactory->get_object_by_guid($entry->linkGuid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 unset($data['entries'][$i]);
                 $e->log();
                 continue;

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();