flack / openpsa

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

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

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
             ));
         }
 
-        if (   $this->_article->topic === $this->_topic->id
+        if ($this->_article->topic === $this->_topic->id
             && $this->_article->can_do('midgard:delete')) {
             $delete = $this->get_workflow('delete', array('object' => $this->_article));
             $buttons[] = $delete->get_button("delete/{$this->_article->guid}/");
@@ -97,7 +97,7 @@ 
 
         if ($this->_config->get('enable_ajax_editing')) {
             $this->_request_data['controller'] = midcom_helper_datamanager2_controller::create('ajax');
-            $this->_request_data['controller']->schemadb =& $this->_request_data['schemadb'];
+            $this->_request_data['controller']->schemadb = & $this->_request_data['schemadb'];
             $this->_request_data['controller']->set_storage($this->_article);
             $this->_request_data['controller']->process_ajax();
         }
@@ -105,7 +105,7 @@ 
         if ($this->_config->get('comments_enable')) {
             if ($comments_node = $this->_seek_comments()) {
                 $this->_request_data['comments_url'] = $comments_node[MIDCOM_NAV_RELATIVEURL] . "comment/{$this->_article->guid}";
-                if (   $this->_topic->can_do('midgard:update')
+                if ($this->_topic->can_do('midgard:update')
                     && $this->_topic->can_do('net.nehmer.comments:moderation')) {
                     net_nehmer_comments_viewer::add_head_elements();
                 }

Braces +2 added lines, -1 removed lines

@@ -218,7 +218,8 @@
         if ($this->_config->get('comments_topic')) {
             try {
                 $comments_topic = new midcom_db_topic($this->_config->get('comments_topic'));
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return false;
             }
 

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

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
             ));
         }
 
-        if (   $this->_article->topic === $this->_topic->id
+        if ($this->_article->topic === $this->_topic->id
             && $this->_article->can_do('midgard:delete')) {
             $delete = $this->get_workflow('delete', array('object' => $this->_article));
             $buttons[] = $delete->get_button("delete/{$this->_article->guid}/");
@@ -115,13 +115,13 @@ 
 
         if ($this->_config->get('enable_ajax_editing')) {
             $this->_request_data['controller'] = midcom_helper_datamanager2_controller::create('ajax');
-            $this->_request_data['controller']->schemadb =& $this->_request_data['schemadb'];
+            $this->_request_data['controller']->schemadb = & $this->_request_data['schemadb'];
             $this->_request_data['controller']->set_storage($this->_article);
             $this->_request_data['controller']->process_ajax();
         }
 
         $arg = $this->_article->name ?: $this->_article->guid;
-        if (   $arg != 'index'
+        if ($arg != 'index'
             && $this->_config->get('hide_navigation')) {
             $this->add_breadcrumb("{$arg}/", $this->_article->title);
         }
@@ -131,13 +131,13 @@ 
         midcom::get()->metadata->set_request_metadata($this->_article->metadata->revised, $this->_article->guid);
         $this->bind_view_to_object($this->_article, $this->_datamanager->schema->name);
 
-        if (   $this->_config->get('indexinnav')
+        if ($this->_config->get('indexinnav')
             || $this->_config->get('autoindex')
             || $this->_article->name != 'index') {
             $this->set_active_leaf($this->_article->id);
         }
 
-        if (   $this->_config->get('folder_in_title')
+        if ($this->_config->get('folder_in_title')
             && $this->_topic->extra != $this->_article->title) {
             midcom::get()->head->set_pagetitle("{$this->_topic->extra}: {$this->_article->title}");
         } else {
@@ -191,7 +191,7 @@ 
      */
     public function _show_view($handler_id, array &$data)
     {
-        if (   $this->_config->get('enable_ajax_editing')
+        if ($this->_config->get('enable_ajax_editing')
             && isset($data['controller'])) {
             // For AJAX handling it is the controller that renders everything
             $this->_request_data['view_article'] = $this->_request_data['controller']->get_content_html();

lib/midcom/helper/datamanager2/qfrule/checkjsdate.php

Spacing +3 added lines, -3 removed lines

@@ -40,13 +40,13 @@ 
          * if the field has the default value or is empty, the user gets a free pass
          * (if the field is required, this is caught by a separate rule)
          */
-        if (   $date == ""
+        if ($date == ""
             || $date == "0000-00-00"
             || $date == "0000-00-00 00:00:00") {
             debug_add("value {$date} is assumed to be intentionally blank");
             return true;
         }
-        if (    preg_match("/^\d{4}-\d{2}-\d{2}/", $date) == 0
+        if (preg_match("/^\d{4}-\d{2}-\d{2}/", $date) == 0
              && preg_match("/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/", $date) == 0) {
             debug_add("value {$date} is incorrectly formatted");
             return false;
@@ -64,7 +64,7 @@ 
 
     private function _sanitize_time($value, $options)
     {
-        if (   empty($value[0][$options . '_hours'])
+        if (empty($value[0][$options . '_hours'])
             && empty($value[0][$options . '_minutes'])
             && empty($value[0][$options . '_seconds'])) {
             return '';

lib/midgard/admin/asgard/toolbar.php

Spacing +3 added lines, -3 removed lines

@@ -144,7 +144,7 @@ 
             );
         }
 
-        if (   midcom::get()->config->get('midcom_services_rcs_enable')
+        if (midcom::get()->config->get('midcom_services_rcs_enable')
             && $object->can_do('midgard:update')
             && $object->_use_rcs) {
             $buttons[] = array(
@@ -205,7 +205,7 @@ 
     private function get_toolbar_update_items($object)
     {
         $buttons = array();
-        if (   is_a($object, 'midcom_db_topic')
+        if (is_a($object, 'midcom_db_topic')
             && $object->component
             && $object->can_do('midcom:component_config')) {
             $buttons[] = array(
@@ -243,7 +243,7 @@ 
             MIDCOM_TOOLBAR_ENABLED => $object->can_do('midgard:privileges'),
         );
 
-        if (   midcom::get()->componentloader->is_installed('midcom.helper.replicator')
+        if (midcom::get()->componentloader->is_installed('midcom.helper.replicator')
             && midcom::get()->auth->admin) {
             $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => "__mfa/asgard_midcom.helper.replicator/object/{$object->guid}/",

Braces +2 added lines, -1 removed lines

@@ -117,7 +117,8 @@
                                 }
                                 break;
                         }
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         $e->log();
                     }
                 }

lib/org/openpsa/contacts/midcom/interfaces.php

Spacing +6 added lines, -6 removed lines

@@ -78,11 +78,11 @@ 
 
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object)
     {
-        if (   $object instanceof org_openpsa_contacts_group_dba
+        if ($object instanceof org_openpsa_contacts_group_dba
             || $object instanceof midcom_db_group) {
             return "group/{$object->guid}/";
         }
-        if (   $object instanceof org_openpsa_contacts_person_dba
+        if ($object instanceof org_openpsa_contacts_person_dba
             || $object instanceof midcom_db_person) {
             return "person/{$object->guid}/";
         }
@@ -111,8 +111,8 @@ 
             // We have a feed URL, but we should check if it is GeoRSS as well
             $items = net_nemein_rss_fetch::raw_fetch($data['rss_url'])->get_items();
 
-            if (   count($items) > 0
-                && (   $items[0]->get_latitude()
+            if (count($items) > 0
+                && ($items[0]->get_latitude()
                     || $items[0]->get_longitude())) {
                 // This is a GeoRSS feed
                 $data['georss_url'] = $data['rss_url'];
@@ -175,14 +175,14 @@ 
         $data = $this->_get_data_from_url($group->homepage);
 
         // Use the data we got
-        if (   midcom::get()->componentloader->is_installed('org.routamc.positioning')
+        if (midcom::get()->componentloader->is_installed('org.routamc.positioning')
             && array_key_exists('icbm', $data)) {
             // We know where the group is located
             $icbm_parts = explode(',', $data['icbm']);
             if (count($icbm_parts) == 2) {
                 $latitude = (float) $icbm_parts[0];
                 $longitude = (float) $icbm_parts[1];
-                if (   abs($latitude) < 90
+                if (abs($latitude) < 90
                     && abs($longitude) < 180) {
                     $location = new org_routamc_positioning_location_dba();
                     $location->date = time();

Braces +2 added lines, -1 removed lines

@@ -159,7 +159,8 @@
 
         try {
             $object = new $classname($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error($type . " {$guid} not found, error " . $e->getMessage());
             return false;
         }

lib/org/openpsa/products/handler/list.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
             $this->datamanager = new midcom_helper_datamanager2_datamanager($data['schemadb_group']);
             if (midcom::get()->config->get('enable_ajax_editing')) {
                 $this->controller = midcom_helper_datamanager2_controller::create('ajax');
-                $this->controller->schemadb =& $data['schemadb_group'];
+                $this->controller->schemadb = & $data['schemadb_group'];
                 $this->controller->set_storage($data['group']);
                 $this->controller->process_ajax();
                 $this->datamanager = $this->controller->datamanager;

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