flack / openpsa

lib/midcom/response/relocate.php

Spacing +3 added lines, -3 removed lines

@@ -28,14 +28,14 @@
 
     public function send()
     {
-        if (   $this->url == ''
-            || (   substr($this->url, 0, 1) != "/")
+        if ($this->url == ''
+            || (substr($this->url, 0, 1) != "/")
                 && !preg_match('|^https?://|', $this->url)) {
             $prefix = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ANCHORPREFIX);
             if ($prefix == '') {
                 $prefix = '/';
             }
-            $this->url =  "{$prefix}{$this->url}";
+            $this->url = "{$prefix}{$this->url}";
             debug_add("This is a relative URL from the local site, prepending anchor prefix: {$this->url}");
         }
         $location = "Location: {$this->url}";

lib/midcom/style/dm2_config_recreate.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
         continue;
     }
 
-    if (   !$object->can_do('midgard:update')
+    if (!$object->can_do('midgard:update')
         || !$object->can_do('midgard:attachments')) {
         printf(midcom::get()->i18n->get_string('not recreating object %s %s, reason %s', 'midcom'), $type, $object->guid, 'Insufficient privileges') . "\n";
         continue;

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/cache/module/nap.php

Braces +2 added lines, -1 removed lines

@@ -132,7 +132,8 @@
                       && $nodeobject = $nav->get_node($node->id)) {
                 $napobject = $nav->get_leaf($nodeobject[MIDCOM_NAV_ID] . '-' . $object->id);
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }
         return $napobject;

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
             // Get parent from DB and compare to catch moves
             if ($parent = $napobject[MIDCOM_NAV_OBJECT]->get_parent()) {
                 $parent_entry_from_object = $this->get_guid($parent->guid);
-                if (    $parent_entry_from_object
+                if ($parent_entry_from_object
                      && $parent_entry_from_object[MIDCOM_NAV_ID] != $cached_node_id) {
                     $this->_cache->delete($this->_prefix . '-' . $parent_entry_from_object[MIDCOM_NAV_ID] . '-leaves');
                 }
@@ -92,7 +92,7 @@ 
             $parent_id = $napobject[MIDCOM_NAV_NODEID];
             $parent_entry = $this->get_node($parent_id);
 
-            if (   $parent_entry
+            if ($parent_entry
                 && array_key_exists(MIDCOM_NAV_SUBNODES, $parent_entry)) {
                 unset($parent_entry[MIDCOM_NAV_SUBNODES]);
                 $this->put_node($parent_id, $parent_entry);
@@ -102,7 +102,7 @@ 
             if ($parent = $napobject[MIDCOM_NAV_OBJECT]->get_parent()) {
                 $parent_entry_from_object = $this->get_guid($parent->guid);
 
-                if (    !empty($parent_entry_from_object[MIDCOM_NAV_ID])
+                if (!empty($parent_entry_from_object[MIDCOM_NAV_ID])
                      && !empty($parent_entry[MIDCOM_NAV_ID])
                      && $parent_entry_from_object[MIDCOM_NAV_ID] != $parent_entry[MIDCOM_NAV_ID]) {
                     unset($parent_entry_from_object[MIDCOM_NAV_SUBNODES]);
@@ -128,7 +128,7 @@ 
             $nav = new midcom_helper_nav;
             if ($object instanceof midcom_db_topic) {
                 $napobject = $nav->get_node($object->id);
-            } elseif (   ($node = $nav->find_closest_topic($object))
+            } elseif (($node = $nav->find_closest_topic($object))
                       && $nodeobject = $nav->get_node($node->id)) {
                 $napobject = $nav->get_leaf($nodeobject[MIDCOM_NAV_ID] . '-' . $object->id);
             }
@@ -153,7 +153,7 @@ 
         }
         $lang_id = midcom::get()->i18n->get_current_language();
         $result = $this->_cache->fetch("{$this->_prefix}-{$key}");
-        if (   !is_array($result)
+        if (!is_array($result)
             || !isset($result[$lang_id])) {
             return false;
         }
@@ -177,7 +177,7 @@ 
 
         $lang_id = midcom::get()->i18n->get_current_language();
         $result = $this->_cache->fetch("{$this->_prefix}-{$key}");
-        if (   !is_array($result)
+        if (!is_array($result)
             || !isset($result[$lang_id])) {
             return false;
         }
@@ -244,7 +244,7 @@ 
 
         $lang_id = midcom::get()->i18n->get_current_language();
         $result = $this->_cache->fetch("{$this->_prefix}-{$guid}");
-        if (   !is_array($result)
+        if (!is_array($result)
             || !isset($result[$lang_id])) {
             return false;
         }

lib/midcom/services/permalinks/main.php

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;

Spacing +1 added lines, -1 removed lines

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

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/config/test.php

Indentation +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
             $this->add('Setting: upload_max_filesize', self::OK, ini_get('upload_max_filesize'));
         } else {
             $this->add('Setting: upload_max_filesize',
-                             self::WARNING, "To make bulk uploads (for exampe in the Image Gallery) useful, you should increase the Upload limit to something above 50 MB. (Current setting: {$upload_limit})");
+                                self::WARNING, "To make bulk uploads (for exampe in the Image Gallery) useful, you should increase the Upload limit to something above 50 MB. (Current setting: {$upload_limit})");
         }
 
         $post_limit = $this->ini_get_filesize('post_max_size');

Braces +2 added lines, -1 removed lines

@@ -74,7 +74,8 @@
                 $config = new midcom_services_rcs_config($config);
                 $config->test_rcs_config();
                 $this->add("MidCOM RCS", self::OK);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $this->add("MidCOM RCS", self::ERROR, $e->getMessage());
             }
         } else {

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 class midcom_config_test
 {
     const OK = 0;
-    const WARNING =  1;
+    const WARNING = 1;
     const ERROR = 2;
 
     private $messages = [

lib/midcom/core/privilege.php

Braces +2 added lines, -1 removed lines

@@ -145,7 +145,8 @@
         if (is_null($this->__cached_object)) {
             try {
                 $this->__cached_object = midcom::get()->dbfactory->get_object_by_guid($this->objectguid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return false;
             }
         }

Spacing +6 added lines, -6 removed lines

@@ -210,7 +210,7 @@ 
      */
     public function set_assignee($assignee)
     {
-        if (   is_a($assignee, midcom_core_user::class)
+        if (is_a($assignee, midcom_core_user::class)
             || is_a($assignee, midcom_core_group::class)) {
             $this->assignee = $assignee->id;
         } elseif (is_string($assignee)) {
@@ -255,27 +255,27 @@ 
         }
 
         // 2. Assignee
-        if (   !$this->is_magic_assignee()
+        if (!$this->is_magic_assignee()
             && !$this->get_assignee()) {
             debug_add("The assignee identifier '{$this->assignee}' is invalid.", MIDCOM_LOG_INFO);
             return false;
         }
 
-        if (   $this->assignee == 'SELF'
+        if ($this->assignee == 'SELF'
             && $this->classname != ''
             && !class_exists($this->classname)) {
             debug_add("The class '{$this->classname}' is not loaded, the SELF magic assignee with class restriction is invalid therefore.", MIDCOM_LOG_INFO);
             return false;
         }
 
-        if (   $this->assignee != 'SELF'
+        if ($this->assignee != 'SELF'
             && $this->classname != '') {
             debug_add("The classname parameter was specified without having the magic assignee SELF set, this is invalid.", MIDCOM_LOG_INFO);
             return false;
         }
 
         // Prevent owner assignments to owners
-        if (   $this->assignee == 'OWNER'
+        if ($this->assignee == 'OWNER'
             && $this->privilegename == 'midgard:owner') {
             debug_add("Tried to assign midgard:owner to the OWNER magic assignee, this is invalid.", MIDCOM_LOG_INFO);
             return false;
@@ -287,7 +287,7 @@ 
                 MIDCOM_LOG_INFO);
             return false;
         }
-        if (   !$object->can_do('midgard:update')
+        if (!$object->can_do('midgard:update')
             || !$object->can_do('midgard:privileges')) {
             debug_add("Insufficient privileges on the content object with the GUID '{$this->__guid}', midgard:update and midgard:privileges required.",
                 MIDCOM_LOG_INFO);