flack / openpsa

lib/midcom/services/session.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
      */
     public function __construct($context = null)
     {
-        if (   is_null($context)
+        if (is_null($context)
             || is_numeric($context)) {
             $this->_domain = midcom_core_context::get($context)->get_key(MIDCOM_CONTEXT_COMPONENT);
         } else {

lib/midcom/services/i18n/formatter.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 
     public function number($value, $precision = 2)
     {
-        if (   is_float($value)
+        if (is_float($value)
             && version_compare(Intl::getIcuVersion(), '49', '<')) {
             // workaround for http://bugs.icu-project.org/trac/ticket/8561
             if ($precision == 0) {
@@ -57,7 +57,7 @@ 
             $value = time();
         }
         //PHP < 5.3.4 compat
-        if (   version_compare(PHP_VERSION, '5.3.5', '<')
+        if (version_compare(PHP_VERSION, '5.3.5', '<')
             && $value instanceof DateTime) {
             $value = (int) $value->format('U') + timezone_offset_get($value->getTimeZone(), $value);
         }

lib/midcom/services/permalinks/main.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
         if (is_a($object, 'midcom_db_attachment')) {
             // Faster linking to attachments
             $parent = $object->get_parent();
-            if (   is_a($parent, 'midcom_db_topic')
+            if (is_a($parent, 'midcom_db_topic')
                 && $nav->is_node_in_tree($parent->id, $nav->get_root_node())) {
                 $napobj = $nav->get_node($parent->id);
                 return $napobj[MIDCOM_NAV_FULLURL] . $object->name;

Braces +2 added lines, -1 removed lines

@@ -72,7 +72,8 @@
 
         try {
             $object = midcom::get()->dbfactory->get_object_by_guid($guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add("Failed to resolve the GUID {$guid}, this is most probably an access denied error.", MIDCOM_LOG_ERROR);
             debug_add('Last MidCOM error string: ' . $e->getMessage());
             return null;

lib/midcom/services/indexer/backend/solr.php

Braces +2 added lines, -1 removed lines

@@ -213,7 +213,8 @@
         $browser = new Browser;
         try {
             $response = $browser->send($request);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Failed to execute request " . $request->getUrl() . ": " . $e->getMessage(), MIDCOM_LOG_WARN);
             return false;
         }

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

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
      */
     public function members_to_fields()
     {
-        if (   empty($this->topic_guid)
+        if (empty($this->topic_guid)
             || empty($this->topic_url)
             || empty($this->component)) {
             //if one of those is missing, we override all three to ensure consistency

lib/midcom/core/context.php

Spacing +5 added lines, -5 removed lines

@@ -95,7 +95,7 @@ 
             $id = count(self::$_contexts);
         }
         $this->id = $id;
-        self::$_contexts[$id] =& $this;
+        self::$_contexts[$id] = & $this;
     }
 
     /**
@@ -124,7 +124,7 @@ 
             return self::$_contexts[$id];
         }
 
-        if (   $id < 0
+        if ($id < 0
             || $id >= count(self::$_contexts)) {
             debug_add("Could not get invalid context $id.", MIDCOM_LOG_WARN);
             $ret = false;
@@ -163,7 +163,7 @@ 
             return false;
         }
 
-        if (   (   $key === MIDCOM_CONTEXT_ROOTTOPICID
+        if (($key === MIDCOM_CONTEXT_ROOTTOPICID
                 || $key === MIDCOM_CONTEXT_ROOTTOPIC)
             && $this->_data[$key] === null) {
             $this->_initialize_root_topic();
@@ -250,7 +250,7 @@ 
             $component = $this->_data[MIDCOM_CONTEXT_COMPONENT];
         }
 
-        return (   array_key_exists($component, $this->_data[MIDCOM_CONTEXT_CUSTOMDATA])
+        return (array_key_exists($component, $this->_data[MIDCOM_CONTEXT_CUSTOMDATA])
                 && array_key_exists($key, $this->_data[MIDCOM_CONTEXT_CUSTOMDATA][$component]));
     }
 
@@ -303,7 +303,7 @@ 
             $component = $this->_data[MIDCOM_CONTEXT_COMPONENT];
         }
 
-        $this->_data[MIDCOM_CONTEXT_CUSTOMDATA][$component][$key] =& $value;
+        $this->_data[MIDCOM_CONTEXT_CUSTOMDATA][$component][$key] = & $value;
     }
 
     public function get_component()

Braces +2 added lines, -1 removed lines

@@ -181,7 +181,8 @@
         } else {
             try {
                 $root_node = midcom_db_topic::get_cached($guid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 if ($e instanceof midcom_error_forbidden) {
                     throw $e;
                 }

lib/midgard/admin/asgard/stylehelper.php

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
                 'midcom' => array(
                     'style-init' => '',
                     'style-finish' => '',
-                 )
+                    )
             ),
             'nodes' => array(),
         );

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
 
     public function __construct(array &$data)
     {
-        $this->_data =& $data;
+        $this->_data = & $data;
         midcom::get()->head->enable_jquery_ui(array('accordion'));
     }
 
@@ -33,11 +33,11 @@ 
             return;
         }
 
-        if (   midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_style')
-            && (   $this->_data['handler_id'] !== '____mfa-asgard-object_create'
+        if (midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_style')
+            && ($this->_data['handler_id'] !== '____mfa-asgard-object_create'
                 || $this->_data['current_type'] == 'midgard_element')) {
             $help_element = $this->_get_help_style_elementnames($this->_data['object']);
-        } elseif (   midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_element')
+        } elseif (midcom::get()->dbfactory->is_a($this->_data['object'], 'midgard_element')
                   && $this->_data['handler_id'] !== '____mfa-asgard-object_create') {
             $help_element = $this->_get_help_element();
         }
@@ -49,7 +49,7 @@ 
 
     private function _get_help_element()
     {
-        if (   empty($this->_data['object']->name)
+        if (empty($this->_data['object']->name)
             || empty($this->_data['object']->style)) {
             // We cannot help with empty elements
             return;

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

Spacing +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
     {
         $this->_object = midcom::get()->dbfactory->get_object_by_guid($this->_guid);
 
-        if (   !midcom::get()->config->get('midcom_services_rcs_enable')
+        if (!midcom::get()->config->get('midcom_services_rcs_enable')
             || !$this->_object->_use_rcs) {
             throw new midcom_error_notfound("Revision control not supported for " . get_class($this->_object) . ".");
         }
@@ -188,7 +188,7 @@ 
 
         $show_previous = false;
         if ($diff_view) {
-            if (   $before != ''
+            if ($before != ''
                 && $before2 != '') {
                 // When browsing diffs we want to display buttons to previous instead of current
                 $first = $before2;
@@ -301,7 +301,7 @@ 
         $this->_guid = $args[0];
         $this->_load_object();
 
-        if (   !$this->_backend->version_exists($args[1])
+        if (!$this->_backend->version_exists($args[1])
             || !$this->_backend->version_exists($args[2])) {
             throw new midcom_error_notfound("One of the revisions {$args[1]} or {$args[2]} does not exist.");
         }
@@ -389,7 +389,7 @@ 
 
         $this->_prepare_toolbars($args[1]);
 
-        if (   $this->_backend->version_exists($args[1])
+        if ($this->_backend->version_exists($args[1])
             && $this->_backend->restore_to_revision($args[1])) {
             midcom::get()->uimessages->add($this->_l10n->get('midcom.admin.rcs'), sprintf($this->_l10n->get('restore to version %s successful'), $args[1]));
             return new midcom_response_relocate("__mfa/asgard/object/open/{$this->_guid}/");

lib/midgard/admin/asgard/response.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     public function send()
     {
         $context = midcom_core_context::get();
-        $data =& $context->get_custom_key('request_data');
+        $data = & $context->get_custom_key('request_data');
         midcom::get()->style->enter_context($context->id);
 
         if (isset($data['view_title'])) {