flack / openpsa

lib/midcom/services/indexer/document/attachment.php

Spacing +3 added lines, -3 removed lines

@@ -93,7 +93,7 @@ 
 
     private function process_attachment()
     {
-        if (   !isset($this->attachment->metadata)
+        if (!isset($this->attachment->metadata)
             || !is_object($this->attachment->metadata)) {
             return;
         }
@@ -142,10 +142,10 @@ 
         }
 
         if (strlen(trim($this->attachment->title)) > 0) {
-            $this->title =  "{$this->attachment->title} ({$this->attachment->name})";
+            $this->title = "{$this->attachment->title} ({$this->attachment->name})";
             $this->content .= "\n{$this->attachment->title}\n{$this->attachment->name}";
         } else {
-            $this->title =  $this->attachment->name;
+            $this->title = $this->attachment->name;
             $this->content .= "\n{$this->attachment->name}";
         }
 

lib/net/nemein/wiki/wikipage.php

Braces +2 added lines, -1 removed lines

@@ -196,7 +196,8 @@
 
         try {
             $diff_fields = $rcs_handler->get_diff($prev_version, $this_version, 'unified');
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return '';
         }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
     public function _on_creating()
     {
-        if (   $this->title == ''
+        if ($this->title == ''
             || !$this->topic) {
             // We must have wikiword and topic at this stage
             return false;

lib/net/nemein/wiki/parser.php

Braces +2 added lines, -1 removed lines

@@ -63,7 +63,8 @@
 
         try {
             $attachment = new midcom_db_attachment($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return "<span class=\"missing_photo\" title=\"{$guid}\">{$fulltag}</span>{$after}";
         }

Spacing +3 added lines, -3 removed lines

@@ -224,7 +224,7 @@ 
                 return $this->render_link($parts[1], $parts[2]) . $after;
 
             // Macro [something: <data>] (for example [abbr: BOFH - Bastard Operator From Hell] or [photo: <GUID>])
-            case (   preg_match('/^(.*?): (.*)/', $fulltext, $macro_parts)
+            case (preg_match('/^(.*?): (.*)/', $fulltext, $macro_parts)
                   && method_exists($this, "_run_macro_{$macro_parts[1]}")):
                 $method = "_run_macro_{$macro_parts[1]}";
                 return $this->$method($macro_parts[2], $match[0], $after);
@@ -257,7 +257,7 @@ 
                 $folder = $wikipage_match['latest_parent'];
             }
 
-            if (   isset($folder[MIDCOM_NAV_OBJECT])
+            if (isset($folder[MIDCOM_NAV_OBJECT])
                 && $folder[MIDCOM_NAV_OBJECT]->can_do('midgard:create')) {
                 $workflow = $this->get_workflow('datamanager');
                 return "<a href=\"{$folder[MIDCOM_NAV_ABSOLUTEURL]}create/?wikiword={$wikipage_match['remaining_path']}\" " . $workflow->render_attributes() . " class=\"wiki_missing\" title=\"" . $this->_l10n->get('click to create') . "\">{$text}</a>";
@@ -300,7 +300,7 @@ 
                     $links[$parts[1]] = $parts[2];
                     break;
                 // Ignore macros [something: <data>] (for example [abbr: BOFH - Bastard Operator From Hell] or [photo: <GUID>])
-                case (   preg_match('/^(.*?): (.*)/', $fulltext, $macro_parts)
+                case (preg_match('/^(.*?): (.*)/', $fulltext, $macro_parts)
                       && method_exists($this, "_run_macro_{$macro_parts[1]}")):
                     continue 2;
 

lib/net/nemein/rss/fetch.php

Spacing +6 added lines, -6 removed lines

@@ -101,7 +101,7 @@ 
             $etag = trim($parser->data['headers']['etag']);
 
             $feed_etag = $this->_feed->get_parameter('net.nemein.rss', 'etag');
-            if (   !empty($feed_etag)
+            if (!empty($feed_etag)
                 && $feed_etag == $etag) {
                 // Feed hasn't changed, skip updating
                 debug_add("Feed {$this->_feed->url} has not changed since " . date('c', $this->_feed->latestfetch), MIDCOM_LOG_WARN);
@@ -187,7 +187,7 @@ 
         $guid = $item->get_id();
         $title = $item->get_title();
 
-        if (   (   empty($title)
+        if ((empty($title)
                 || trim($title) == '...')
             && empty($guid)) {
             // Something wrong with this entry, skip it
@@ -255,7 +255,7 @@ 
                 $meta_values['published'] = $article_date;
             }
 
-            if (   $this->apply_values($article, $values, $meta_values)
+            if ($this->apply_values($article, $values, $meta_values)
                 && !$article->update()) {
                 return false;
             }
@@ -284,14 +284,14 @@ 
     private function find_author(net_nemein_rss_parser_item $item)
     {
         // Try to figure out item author
-        if (   $this->_feed->forceauthor
+        if ($this->_feed->forceauthor
             && $this->_feed->defaultauthor) {
             // Feed has a "default author" set, use it
             return new midcom_db_person($this->_feed->defaultauthor);
         }
         $author = $this->match_item_author($item);
         $fallback_person_id = 1;
-        if (   !$author
+        if (!$author
             || $author->id == $fallback_person_id) {
             if ($this->_feed->defaultauthor) {
                 // Feed has a "default author" set, use it
@@ -477,7 +477,7 @@ 
             }
         }
 
-        if (   !empty($author_info['username'])
+        if (!empty($author_info['username'])
             && $person = midcom::get()->auth->get_user_by_name($author_info['username'])) {
             return $person->get_storage();
         }

lib/net/nehmer/static/navigation.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
         $qb->add_constraint('name', '<>', '');
 
         // Unless in Auto-Index mode or the index article is hidden, we skip the index article.
-        if (   !$this->_config->get('autoindex')
+        if (!$this->_config->get('autoindex')
             && !$this->_config->get('indexinnav')) {
             $qb->add_constraint('name', '<>', 'index');
         }

lib/midgard/admin/asgard/handler/object/attachments.php

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
         }
 
         // Check if we have an uploaded file
-        if (   isset($_FILES['midgard_admin_asgard_file'])
+        if (isset($_FILES['midgard_admin_asgard_file'])
             && is_uploaded_file($_FILES['midgard_admin_asgard_file']['tmp_name'])) {
             return $this->_process_file_upload($_FILES['midgard_admin_asgard_file']);
         }
@@ -86,19 +86,19 @@ 
 
         $needs_update = false;
 
-        if (   !empty($_POST['midgard_admin_asgard_filename'])
+        if (!empty($_POST['midgard_admin_asgard_filename'])
             && $local_file->name != $_POST['midgard_admin_asgard_filename']) {
             $local_file->name = $_POST['midgard_admin_asgard_filename'];
             $needs_update = true;
         }
 
-        if (   !empty($_POST['midgard_admin_asgard_mimetype'])
+        if (!empty($_POST['midgard_admin_asgard_mimetype'])
             && $local_file->mimetype != $_POST['midgard_admin_asgard_mimetype']) {
             $local_file->mimetype = $_POST['midgard_admin_asgard_mimetype'];
             $needs_update = true;
         }
 
-        if (   $needs_update
+        if ($needs_update
             && !$local_file->update()) {
             return false;
         }
@@ -232,7 +232,7 @@ 
         $this->bind_view_to_object($this->_file);
 
         $filename = $this->_process_form();
-        if (   $filename
+        if ($filename
             && $filename != $data['filename']) {
             return new midcom_response_relocate("__mfa/asgard/object/attachments/{$this->_object->guid}/{$filename}/");
         }

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

Spacing +2 added lines, -2 removed lines

@@ -109,8 +109,8 @@
         }
 
         $help = new midcom_admin_help_help();
-        $this->_request_data['help'] =  $help->get_help_contents('asgard_'.$this->type, $help_component);
-        $this->_request_data['component'] =  $component;
+        $this->_request_data['help'] = $help->get_help_contents('asgard_' . $this->type, $help_component);
+        $this->_request_data['component'] = $component;
     }
 
     /**

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

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
         $data['reflector'] = midcom_helper_reflector::get($data['type']);
         $data['label_property'] = $data['reflector']->get_label_property();
 
-        if (   isset($_POST['undelete'])
+        if (isset($_POST['undelete'])
             && is_array($_POST['undelete'])) {
             if (isset($_POST['purge'])) {
                 $this->_purge();

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

Spacing +6 added lines, -6 removed lines

@@ -20,7 +20,7 @@ 
 
         // List installed MgdSchema types and convert to DBA classes
         foreach ($this->_request_data['schema_types'] as $schema_type) {
-            if (   !is_null($type)
+            if (!is_null($type)
                 && $schema_type != $type) {
                 // Skip
                 continue;
@@ -49,7 +49,7 @@ 
                 $qb->add_constraint('metadata.revised', '>=', $since);
             }
 
-            if (   $only_mine
+            if ($only_mine
                 && midcom::get()->auth->user) {
                 $qb->add_constraint('metadata.authors', 'LIKE', '|' . midcom::get()->auth->user->guid . '|');
             }
@@ -93,7 +93,7 @@ 
 
         $data['view_title'] = $this->_l10n->get('asgard');
 
-        if (    isset($_POST['execute_mass_action'])
+        if (isset($_POST['execute_mass_action'])
              && !empty($_POST['selections'])
              && isset($_POST['mass_action'])) {
             $method_name = "_mass_{$_POST['mass_action']}";
@@ -108,14 +108,14 @@ 
             }
 
             $data['review_by'] = null;
-            if (   $this->_config->get('enable_review_dates')
+            if ($this->_config->get('enable_review_dates')
                 && isset($_REQUEST['review_by'])
                 && $_REQUEST['review_by'] != 'any') {
                 $data['review_by'] = (int) $_REQUEST['review_by'];
             }
 
             $data['type_filter'] = null;
-            if (   isset($_REQUEST['type_filter'])
+            if (isset($_REQUEST['type_filter'])
                 && $_REQUEST['type_filter'] != 'any') {
                 $data['type_filter'] = $_REQUEST['type_filter'];
             }
@@ -274,7 +274,7 @@ 
                 continue;
             }
 
-            if (   $object->can_do('midgard:update')
+            if ($object->can_do('midgard:update')
                 && $object->can_do('midcom:approve')) {
                 $object->metadata->approve();
                 midcom::get()->uimessages->add($this->_l10n->get('midgard.admin.asgard'), sprintf($this->_l10n->get('object %s approved'), $object->guid));

Braces +8 added lines, -4 removed lines

@@ -147,7 +147,8 @@ 
         foreach ($activities as $activity) {
             try {
                 $object = midcom::get()->dbfactory->get_object_by_guid($activity->target);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 if (midcom_connection::get_error() == MGD_ERR_OBJECT_DELETED) {
                     // TODO: Visualize deleted objects somehow
                 }
@@ -155,7 +156,8 @@ 
             }
             try {
                 $actor = midcom_db_person::get_cached($activity->actor);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $actor = null;
             }
 
@@ -253,7 +255,8 @@ 
         foreach ($guids as $guid) {
             try {
                 $object = midcom::get()->dbfactory->get_object_by_guid($guid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 continue;
             }
 
@@ -270,7 +273,8 @@ 
         foreach ($guids as $guid) {
             try {
                 $object = midcom::get()->dbfactory->get_object_by_guid($guid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 continue;
             }