flack / openpsa

lib/midcom/exec/reindex.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
 $http_client = new org_openpsa_httplib();
 $http_client->set_param('timeout', 300);
-if (   !empty($_SERVER['PHP_AUTH_USER'])
+if (!empty($_SERVER['PHP_AUTH_USER'])
     && !empty($_SERVER['PHP_AUTH_PW'])) {
     $http_client->basicauth['user'] = $_SERVER['PHP_AUTH_USER'];
     $http_client->basicauth['password'] = $_SERVER['PHP_AUTH_PW'];

lib/midcom/services/indexer/document.php

Spacing +3 added lines, -3 removed lines

@@ -463,7 +463,7 @@ 
     {
         // Complete fields
         $this->indexed = time();
-        if (   $this->author == ''
+        if ($this->author == ''
             && isset($this->creator->name)) {
             $this->author = $this->creator->name;
         }
@@ -606,7 +606,7 @@ 
     public function read_metadata_from_object($object)
     {
         // Published is set to non-empty value, use it as creation data
-        if (   !empty($object->metadata->published)
+        if (!empty($object->metadata->published)
             && !preg_match('/0{1,4}-0{1,2}0{1,2}\s+0{1,2}:0{1,2}:0{1,2}/', $object->metadata->published)) {
             $this->created = $this->read_unixtime($object->metadata->published);
         } elseif (isset($object->metadata->created)) {
@@ -645,7 +645,7 @@ 
             return @strtotime($stamp);
         }
         // Unix timestamp
-        return (int)$stamp;
+        return (int) $stamp;
     }
 
     /**

Braces +2 added lines, -1 removed lines

@@ -680,7 +680,8 @@
     {
         try {
             return midcom_db_person::get_cached($id);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             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

@@ -223,7 +223,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);
@@ -256,7 +256,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>";
@@ -291,7 +291,7 @@ 
                     $links[$parts[1]] = $parts[2];
                 }
                 // Ignore macros [something: <data>] (for example [abbr: BOFH - Bastard Operator From Hell] or [photo: <GUID>])
-                elseif (   !preg_match('/^(.*?): (.*)/', $fulltext, $macro_parts)
+                elseif (!preg_match('/^(.*?): (.*)/', $fulltext, $macro_parts)
                         || !method_exists($this, "_run_macro_{$macro_parts[1]}")) {
                     // MediaWiki-style link [wikipage] (no text)
                     $links[$fulltext] = $fulltext;

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');
         }

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

src/midcom/datamanager/indexer/document.php

Spacing +3 added lines, -3 removed lines

@@ -137,7 +137,7 @@ 
             $this->content .= "{$this->abstract}\n";
         }
 
-        if (! $this->title) {
+        if (!$this->title) {
             $this->title = $this->document_url;
         }
     }
@@ -178,7 +178,7 @@ 
                     if (!empty($field->vars['value'])) {
                         //only index the first attachment for now
                         $attachment = array_shift($field->vars['value']);
-                        if (   !$attachment instanceof \midcom_db_attachment
+                        if (!$attachment instanceof \midcom_db_attachment
                             && !empty($attachment['object'])) {
                             //This is the form edit case
                             //@todo: In create case, nothing is found currently
@@ -262,7 +262,7 @@ 
      */
     private function resolve_auto_method($name)
     {
-        if (   $name == 'abstract'
+        if ($name == 'abstract'
             || $name == 'title'
             || $name == 'author') {
             return $name;

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 +9 added lines, -9 removed lines

@@ -40,7 +40,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');
@@ -68,7 +68,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')) {
@@ -77,14 +77,14 @@ 
                 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++;
                 continue;
             }
 
-            $this->_request_data['probability'] = (float)$param->value;
+            $this->_request_data['probability'] = (float) $param->value;
             $this->_request_data['person1'] = $person1;
             $this->_request_data['person2'] = $person2;
             break;
@@ -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/midcom/helper/imagefilter.php

Braces +4 added lines, -2 removed lines

@@ -380,7 +380,8 @@ 
         try {
             $cmd = midcom::get()->config->get('utility_imagemagick_base') . "identify " . escapeshellarg($filename);
             $this->_run_command($cmd);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return false;
         }
         return true;
@@ -406,7 +407,8 @@ 
                 debug_add("EXIF information missing or without orientation tag. Skipping.", MIDCOM_LOG_INFO);
                 return;
             }
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Could not read EXIF data: " . $e->getMessage() . ", skipping.", MIDCOM_LOG_WARN);
             return;
         }

Spacing +5 added lines, -5 removed lines

@@ -190,7 +190,7 @@ 
             debug_add("The File {$filename} is not writable.", MIDCOM_LOG_ERROR);
             return false;
         }
-        if (   !empty($this->_filename)
+        if (!empty($this->_filename)
             && $this->_filename !== $filename) {
             $this->_tmpfiles[] = $this->_filename;
         }
@@ -415,7 +415,7 @@ 
         $tmpfile = null;
         $imagesize = getimagesize($this->_filename);
 
-        if (   $imagesize[2] == IMAGETYPE_JPEG
+        if ($imagesize[2] == IMAGETYPE_JPEG
             && $this->_jpegtran_available()) {
             /* jpegtran */
             $operations = [
@@ -474,7 +474,7 @@ 
         while ($rotate > 360) {
             $rotate -= 360;
         }
-        if (   $rotate == 0
+        if ($rotate == 0
             || $rotate == 360) {
             debug_add("Rotate is {$rotate}, we're happy as-is.");
             return;
@@ -484,7 +484,7 @@ 
         $imagesize = getimagesize($this->_filename);
 
         // Try lossless jpegtran rotation if possible
-        if (   $imagesize[2] == IMAGETYPE_JPEG
+        if ($imagesize[2] == IMAGETYPE_JPEG
             && ($rotate % 90 == 0)
             && $this->_jpegtran_available()) {
             $tmpfile = $this->_get_tempfile();
@@ -614,7 +614,7 @@ 
      */
     public function fill($x = null, $y = null, $color = null, $gravity = 'center')
     {
-        if (   empty($x)
+        if (empty($x)
             || empty($y)
             || empty($color)) {
             //This is a bit silly, but here for backwards compatibility...