flack / openpsa

lib/midcom/core/collector.php

Spacing +4 added lines, -4 removed lines

@@ -134,7 +134,7 @@ 
         $counter = 0;
 
         foreach ($result as $object_guid => $empty_copy) {
-            if (    $this->_user_id
+            if ($this->_user_id
                 && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $object_guid, $classname, $this->_user_id)) {
                 debug_add("Failed to load result, read privilege on {$object_guid} not granted for the current user.", MIDCOM_LOG_INFO);
                 continue;
@@ -145,7 +145,7 @@ 
                 if ($counter <= $this->_offset) {
                     continue;
                 }
-                if (   $this->_limit
+                if ($this->_limit
                     && $counter > ($this->_offset + $this->_limit)) {
                     break;
                 }
@@ -223,7 +223,7 @@ 
 
     public function get_subkey($key, $property)
     {
-        if (   $this->_user_id
+        if ($this->_user_id
             && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $key, $this->_real_class, $this->_user_id)) {
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;
@@ -233,7 +233,7 @@ 
 
     public function get($key)
     {
-        if (   $this->_user_id
+        if ($this->_user_id
             && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $key, $this->_real_class, $this->_user_id)) {
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;

lib/net/nehmer/static/midcom/interfaces.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
         }
 
         $config = $this->get_config_for_topic($topic);
-        if (   $object->name == 'index'
+        if ($object->name == 'index'
             && !$config->get('autoindex')) {
             return '';
         }

Braces +2 added lines, -1 removed lines

@@ -29,7 +29,8 @@
         foreach ($qb->execute() as $article) {
             try {
                 $datamanager->set_storage($article);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log(MIDCOM_LOG_WARN);
                 continue;
             }

lib/net/nemein/tag/handler.php

Braces +6 added lines, -3 removed lines

@@ -384,7 +384,8 @@ 
                 $value = $link->value;
 
                 $tags[$key] = $value;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -443,7 +444,8 @@ 
             try {
                 $tag = net_nemein_tag_tag_dba::get_cached($link->tag);
                 $link_object_map[$link->fromGuid][$tag->tag] = $link;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }
@@ -472,7 +474,8 @@ 
                     $tmpobject = midcom::get()->dbfactory->convert_midgard_to_midcom($tmpobject);
                 }
                 $return[] = $tmpobject;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

Spacing +3 added lines, -3 removed lines

@@ -184,7 +184,7 @@ 
      */
     public function copy_tags($from, $to)
     {
-        if (   !is_object($from)
+        if (!is_object($from)
             || !is_object($to)) {
             return false;
         }
@@ -488,7 +488,7 @@ 
         $strlen = strlen($tags_string);
         for ($i = 0; $i < $strlen; $i++) {
             $char = $tags_string[$i];
-            if (   (   $char == ' '
+            if (($char == ' '
                     && !$quote_open)
                 || $i == $strlen) {
                 $tags[] = $current_tag;
@@ -499,7 +499,7 @@ 
                 $quote_open = false;
                 continue;
             }
-            if (   $char === '"'
+            if ($char === '"'
                 || $char === "'") {
                 $quote_open = $char;
                 continue;

lib/net/nemein/tag/tag.php

Spacing +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
 
     public function _on_creating()
     {
-        return (   $this->validate_tag($this->tag)
+        return ($this->validate_tag($this->tag)
                 && $this->_check_duplicates() == 0);
     }
 
@@ -66,7 +66,7 @@ 
             midcom::get()->uimessages->add(midcom::get()->i18n->get_string('net.nemein.tag', 'net.nemein.tag'), sprintf(midcom::get()->i18n->get_string('tag "%s" is not valid. tags may not be numeric', 'net.nemein.tag'), $tag), 'info');
             return false;
         }
-        if (   strstr($tag, '"')
+        if (strstr($tag, '"')
             || strstr($tag, "'")) {
             midcom::get()->uimessages->add(midcom::get()->i18n->get_string('net.nemein.tag', 'net.nemein.tag'), sprintf(midcom::get()->i18n->get_string('tag "%s" is not valid. tags may not contain quotes', 'net.nemein.tag'), $tag), 'info');
             return false;
@@ -77,7 +77,7 @@ 
 
     public function _on_updating()
     {
-        return (   $this->validate_tag($this->tag)
+        return ($this->validate_tag($this->tag)
                 && $this->_check_duplicates() == 0);
     }
 

lib/net/nemein/tag/exec/merge.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 <h1>Merge tags</h1>
 
 <?php
-if (   isset($_POST['from'])
+if (isset($_POST['from'])
     && isset($_POST['to'])) {
     if (net_nemein_tag_handler::merge_tags($_POST['from'], $_POST['to'])) {
         echo "<p>Successfully merged tag \"{$_POST['from']}\" to \"{$_POST['to']}\"</p>\n";

lib/net/nemein/redirector/viewer.php

Braces +2 added lines, -1 removed lines

@@ -152,7 +152,8 @@
                     try {
                         $topic = new midcom_db_topic($id);
                         $id = $topic->id;
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         $e->log();
                         break;
                     }

Spacing +2 added lines, -2 removed lines

@@ -19,8 +19,8 @@
     public function _on_initialize()
     {
         // Match /
-        if (   $this->_config->get('redirection_type') === null
-            || (   $this->_topic->can_do('net.nemein.redirector:noredirect')
+        if ($this->_config->get('redirection_type') === null
+            || ($this->_topic->can_do('net.nemein.redirector:noredirect')
                 && !$this->_config->get('admin_redirection'))) {
             $this->_request_switch['redirect'] = [
                 'handler' => [net_nemein_redirector_handler_tinyurl::class, 'list'],

lib/net/nemein/wiki/midcom/interfaces.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object)
     {
-        if (   $object instanceof midcom_db_article
+        if ($object instanceof midcom_db_article
             && $topic->id == $object->topic) {
             if ($object->name == 'index') {
                 return '';

Braces +2 added lines, -1 removed lines

@@ -30,7 +30,8 @@
             foreach ($result as $wikipage) {
                 try {
                     $datamanager->set_storage($wikipage);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log(MIDCOM_LOG_WARN);
                     continue;
                 }

lib/net/nemein/wiki/handler/feed.php

Braces +2 added lines, -1 removed lines

@@ -66,7 +66,8 @@
             try {
                 $author = new midcom_db_person($wikipage->metadata->revisor);
                 $item->author = $author->name;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
 

lib/net/nemein/wiki/handler/latest.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
                     return;
                 }
 
-                if (   $history['date'] < $from
+                if ($history['date'] < $from
                     || $history['date'] > $to) {
                     // We can ignore revisions outside the timeframe
                     continue;
@@ -93,7 +93,7 @@ 
         $this->_seek_updated($from);
 
         $i = 0;
-        while (   $this->_updated_pages < $this->_max_pages
+        while ($this->_updated_pages < $this->_max_pages
                && $i < 20) {
             // Expand seek by another two weeks
             $to = $from;