flack / openpsa

src/midcom/templating/loader.php

Spacing +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
 
     private function resolve_includes(string $content) : string
     {
-        return preg_replace_callback("/<\\(([a-zA-Z0-9 _-]+)\\)>/", function (array $matches) {
+        return preg_replace_callback("/<\\(([a-zA-Z0-9 _-]+)\\)>/", function(array $matches) {
             $element = $matches[1];
 
             switch ($element) {

lib/midcom/services/cache/main.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
     {
         if (!isset($this->_modules[$name])) {
             $this->_modules[$name] = $module;
-            $this->$name =& $this->_modules[$name];
+            $this->$name = & $this->_modules[$name];
         }
     }
 

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

Spacing +10 added lines, -10 removed lines

@@ -98,8 +98,8 @@ 
         if (!$this->_schemadb) {
             $this->_schemadb = schemadb::from_path($this->_config->get('schemadb'));
 
-            if (   $this->_config->get('use_captcha')
-                || (   !midcom::get()->auth->user
+            if ($this->_config->get('use_captcha')
+                || (!midcom::get()->auth->user
                     && $this->_config->get('use_captcha_if_anonymous'))) {
                 $fields = $this->_schemadb->get('comment')->get('fields');
                 $fields['captcha'] = [
@@ -112,7 +112,7 @@ 
                 $this->_schemadb->get('comment')->set('fields', $fields);
             }
 
-            if (   $this->_config->get('ratings_enable')
+            if ($this->_config->get('ratings_enable')
                 && $this->_schemadb->get('comment')->has_field('rating')) {
                 $this->_schemadb->get('comment')->get_field('rating')['hidden'] = false;
             }
@@ -191,7 +191,7 @@ 
             $this->_comments = $this->_comments->execute();
         }
 
-        if (   midcom::get()->auth->user
+        if (midcom::get()->auth->user
             || $this->_config->get('allow_anonymous')) {
             $this->_init_post_controller($request);
             if ($response = $this->_process_post($request)) {
@@ -222,7 +222,7 @@ 
      */
     private function _process_post(Request $request)
     {
-        if (   !midcom::get()->auth->user
+        if (!midcom::get()->auth->user
             && !midcom::get()->auth->request_sudo('net.nehmer.comments')) {
             throw new midcom_error('We were anonymous but could not acquire SUDO privileges, aborting');
         }
@@ -235,7 +235,7 @@ 
                 }
 
                 $formdata = $this->_post_controller->get_form_values();
-                if (   $formdata['subscribe']
+                if ($formdata['subscribe']
                     && midcom::get()->auth->user) {
                     // User wants to subscribe to receive notifications about this comments thread
 
@@ -269,7 +269,7 @@ 
      */
     private function _get_last_modified() : int
     {
-        return array_reduce($this->_comments, function ($carry, net_nehmer_comments_comment $item) {
+        return array_reduce($this->_comments, function($carry, net_nehmer_comments_comment $item) {
             return max($item->metadata->revised, $carry);
         }, 0);
     }
@@ -291,8 +291,8 @@ 
                 $data['comment_toolbar'] = $this->populate_post_toolbar($comment);
                 midcom_show_style('comments-item');
 
-                if (   midcom::get()->auth->admin
-                    || (   midcom::get()->auth->user
+                if (midcom::get()->auth->admin
+                    || (midcom::get()->auth->user
                         && $comment->can_do('midgard:delete'))) {
                     midcom_show_style('comments-admintoolbar');
                 }
@@ -302,7 +302,7 @@ 
             midcom_show_style('comments-nonefound');
         }
 
-        if (   midcom::get()->auth->user
+        if (midcom::get()->auth->user
             || $this->_config->get('allow_anonymous')) {
             midcom_show_style('post-comment');
         } else {

lib/net/nehmer/comments/handler/moderate.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         $message['content'] = '';
         $logs = $comment->get_logs();
         if (!empty($logs)) {
-            $message['content'] .= $this->_l10n->get('moderation history').":\n\n";
+            $message['content'] .= $this->_l10n->get('moderation history') . ":\n\n";
             foreach ($logs as $time => $log) {
                 $reported = $this->_l10n->get_formatter()->datetime(strtotime("{$time}Z"));
                 $message['content'] .= $this->_l10n->get(sprintf('%s: %s by %s (from %s)', "$reported:\n", $this->_l10n->get($log['action']), $log['reporter'], $log['ip'])) . "\n\n";

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

Braces +2 added lines, -1 removed lines

@@ -47,7 +47,8 @@
         if ($node_id) {
             try {
                 $comments_topic = new midcom_db_topic($node_id);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return null;
             }
 

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

Braces +2 added lines, -1 removed lines

@@ -409,7 +409,8 @@
             foreach ($this->_articles as $article_counter => $article) {
                 try {
                     $data['datamanager']->set_storage($article);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                     continue;
                 }

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 
     private function _process_category_constraint(org_openpsa_qbpager $qb)
     {
-        if (   !in_array($this->category, $this->_request_data['categories'])
+        if (!in_array($this->category, $this->_request_data['categories'])
             && !$this->_config->get('categories_custom_enable')) {
             throw new midcom_error('Custom categories are not allowed');
             // TODO: Check here if there are actually items in this cat?
@@ -88,7 +88,7 @@ 
         midcom::get()->head->set_pagetitle($this->_request_data['page_title']);
 
         // Activate correct leaf
-        if (   $this->_config->get('show_navigation_pseudo_leaves')
+        if ($this->_config->get('show_navigation_pseudo_leaves')
             && in_array($this->category, $this->_request_data['categories'])) {
             $this->set_active_leaf($this->_topic->id . '_CAT_' . $this->category);
         }

lib/org/openpsa/directmarketing/importer/csv.php

Spacing +2 added lines, -2 removed lines

@@ -55,11 +55,11 @@
         foreach (array_filter($csv_line) as $field => $value) {
             // Process the row accordingly
             $field_matching = $this->_settings['fields'][$field];
-            if (   $field_matching
+            if ($field_matching
                 && strstr($field_matching, ':')) {
                 [$schemadb, $schema_field] = explode(':', $field_matching);
 
-                if (   !array_key_exists($schemadb, $this->_schemadbs)
+                if (!array_key_exists($schemadb, $this->_schemadbs)
                     || !$this->_schemadbs[$schemadb]->get('default')->has_field($schema_field)) {
                     // Invalid matching, skip
                     continue;

lib/midcom/services/auth/acl.php

Spacing +2 added lines, -2 removed lines

@@ -568,10 +568,10 @@
         }
 
         //owner privileges override everything but person privileges, so we have to cross-check those here
-        if (   $privilegename != 'midgard:owner'
+        if ($privilegename != 'midgard:owner'
             && $last_scope < MIDCOM_PRIVILEGE_SCOPE_OWNER) {
             $owner_privileges = $this->get_owner_default_privileges();
-            if (    array_key_exists($privilegename, $owner_privileges)
+            if (array_key_exists($privilegename, $owner_privileges)
                  && $this->_load_content_privilege('midgard:owner', $guid, $class, $user_id)
                  && self::$_content_privileges_cache[$cache_id]['midgard:owner']) {
                 self::$_content_privileges_cache[$cache_id][$privilegename] = ($owner_privileges[$privilegename] == MIDCOM_PRIVILEGE_ALLOW);

Indentation +11 added lines, -11 removed lines

@@ -261,17 +261,17 @@
     private static $_default_magic_class_privileges = [];
 
     /**
-    * Internal cache of the content privileges of users on content objects, this is
-    * an associative array using a combination of the user identifier and the object's
-    * guid as index. The privileges for the anonymous user use the magic
-    * EVERYONE as user identifier.
-    *
-    * This must not be merged with the class-wide privileges_cache, because otherwise
-    * class_default_privileges for child objects might be overridden by parent default
-    * privileges
-    *
-    * @var array
-    */
+     * Internal cache of the content privileges of users on content objects, this is
+     * an associative array using a combination of the user identifier and the object's
+     * guid as index. The privileges for the anonymous user use the magic
+     * EVERYONE as user identifier.
+     *
+     * This must not be merged with the class-wide privileges_cache, because otherwise
+     * class_default_privileges for child objects might be overridden by parent default
+     * privileges
+     *
+     * @var array
+     */
     private static $_content_privileges_cache = [];
 
     /**

lib/midcom/services/rcs/main.php

Braces +2 added lines, -1 removed lines

@@ -64,7 +64,8 @@
         try {
             $backend->update($message);
             return true;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add('RCS: Could not save file!');
             $e->log();
             return false;