flack / openpsa

src/midcom/datamanager/storage/mnrelation.php

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
         $qb = midcom::get()->dbfactory->new_query_builder($this->config['type_config']['mapping_class_name']);
         $qb->add_constraint($this->config['type_config']['master_fieldname'], '=', $this->get_master_foreign_key());
 
-        if (   $this->config['type_config']['sortable']
+        if ($this->config['type_config']['sortable']
             && preg_match('/^(ASC|DESC)/i', $this->config['type_config']['sortable_sort_order'], $regs)) {
             $order = strtoupper($regs[1]);
             $qb->add_order('metadata.score', $order);

lib/org/openpsa/contacts/handler/duplicates/person.php

Braces +4 added lines, -2 removed lines

@@ -66,7 +66,8 @@ 
             try {
                 $person1 = new org_openpsa_contacts_person_dba($param->parentguid);
                 $person2 = new org_openpsa_contacts_person_dba($param->name);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $i++;
                 continue;
             }
@@ -137,7 +138,8 @@ 
                 try {
                     $merger = new org_openpsa_contacts_duplicates_merge('person', $this->_config);
                     $merger->merge_delete($person1, $person2);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     // TODO: Localize
                     midcom::get()->uimessages->add($this->_l10n->get('org.openpsa.contacts'), 'Merge failed, errstr: ' . $e->getMessage(), 'error');
                 }

Spacing +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 
     private function load_next()
     {
-        $i =& $this->_request_data['loop_i'];
+        $i = & $this->_request_data['loop_i'];
         while ($i < 100) {
             debug_add("Loop iteration {$i}");
             $qb = new midgard_query_builder('midgard_parameter');
@@ -69,7 +69,7 @@ 
                 continue;
             }
             // Make sure we actually have enough rights to do this
-            if (   !$person1->can_do('midgard:update')
+            if (!$person1->can_do('midgard:update')
                 || !$person1->can_do('midgard:delete')
                 || !$person2->can_do('midgard:update')
                 || !$person2->can_do('midgard:delete')) {
@@ -78,7 +78,7 @@ 
                 continue;
             }
             // Extra sanity check (in case of semi-successful not-duplicate mark)
-            if (   $person1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person2->guid)
+            if ($person1->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person2->guid)
                 || $person2->get_parameter('org.openpsa.contacts.duplicates:not_duplicate', $person1->guid)) {
                 debug_add("It seems these two (#{$person1->id} and #{$person2->id}) have also marked as not duplicates, some cleanup might be a good thing", MIDCOM_LOG_WARN);
                 $i++;
@@ -102,7 +102,7 @@ 
             if ($keep == 'both') {
                 $option1->require_do('midgard:update');
                 $option2->require_do('midgard:update');
-                if (   $option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
+                if ($option1->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option2->guid, time())
                     && $option2->set_parameter('org.openpsa.contacts.duplicates:not_duplicate', $option1->guid, time())) {
                     // Clear the possible duplicate parameters
                     $option1->delete_parameter('org.openpsa.contacts.duplicates:possible_duplicate', $option2->guid);
@@ -120,11 +120,11 @@ 
                 }
             } else {
                 if ($keep == $option1->guid) {
-                    $person1 =& $option1;
-                    $person2 =& $option2;
+                    $person1 = & $option1;
+                    $person2 = & $option2;
                 } elseif ($keep == $option2->guid) {
-                    $person1 =& $option2;
-                    $person2 =& $option1;
+                    $person1 = & $option2;
+                    $person2 = & $option1;
                 } else {
                     throw new midcom_error('Something weird happened (basically we got bogus data)');
                 }

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/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/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;

lib/net/nemein/wiki/wikipage.php

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;

Braces +2 added lines, -1 removed lines

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