flack / openpsa

lib/midcom/helper/toolbar/node.php

Braces +2 added lines, -1 removed lines

@@ -88,7 +88,8 @@
                         $style = midcom_db_style::get_cached($style_id);
                         $styleeditor_url = midcom_connection::get_url('self') . "__mfa/asgard/object/view/{$style->guid}/";
                         $enabled = true;
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         $e->log();
                     }
                 }

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
         }
         $buttons = [];
         $workflow = new midcom\workflow\datamanager;
-        if (   $this->topic->can_do('midgard:update')
+        if ($this->topic->can_do('midgard:update')
             && $this->topic->can_do('midcom.admin.folder:topic_management')) {
             $buttons[] = $workflow->get_button("__ais/folder/edit/", [
                 MIDCOM_TOOLBAR_LABEL => midcom::get()->i18n->get_string('edit folder', 'midcom.admin.folder'),
@@ -49,7 +49,7 @@ 
             ]);
         }
 
-        if (   $urltopic->can_do('midgard:update')
+        if ($urltopic->can_do('midgard:update')
             && $urltopic->can_do('midcom.admin.folder:topic_management')) {
             // Allow to move other than root folder
             if ($urltopic->guid !== midcom::get()->config->get('midcom_root_topic_guid')) {
@@ -61,7 +61,7 @@ 
             }
         }
 
-        if (   $this->topic->can_do('midgard:update')
+        if ($this->topic->can_do('midgard:update')
             && $this->topic->can_do('midcom.admin.folder:topic_management')) {
             $buttons[] = [
                 MIDCOM_TOOLBAR_URL => "__ais/folder/order/",
@@ -78,7 +78,7 @@ 
             ];
         }
         $buttons = array_merge($buttons, $this->get_approval_controls($this->topic, false));
-        if (   $this->topic->can_do('midcom.admin.folder:template_management')
+        if ($this->topic->can_do('midcom.admin.folder:template_management')
             && midcom::get()->auth->can_user_do('midgard.admin.asgard:manage_objects', null, 'midgard_admin_asgard_plugin')) {
             $enabled = false;
             $styleeditor_url = '';
@@ -103,7 +103,7 @@ 
             ];
         }
 
-        if (   $this->topic->can_do('midgard:create')
+        if ($this->topic->can_do('midgard:create')
             && $this->topic->can_do('midcom.admin.folder:topic_management')) {
             $buttons[] = $workflow->get_button("__ais/folder/create/", [
                 MIDCOM_TOOLBAR_LABEL => midcom::get()->i18n->get_string('create subfolder', 'midcom.admin.folder'),
@@ -111,7 +111,7 @@ 
                 MIDCOM_TOOLBAR_ACCESSKEY => 'f',
             ]);
         }
-        if (   $urltopic->guid !== midcom::get()->config->get('midcom_root_topic_guid')
+        if ($urltopic->guid !== midcom::get()->config->get('midcom_root_topic_guid')
             && $urltopic->can_do('midgard:delete')
             && $urltopic->can_do('midcom.admin.folder:topic_management')) {
             $workflow = new midcom\workflow\delete(['object' => $urltopic, 'recursive' => true]);

lib/midcom/helper/search/handler/search.php

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
     {
         $node = $nap->get_node($node_id);
 
-        if (   !array_key_exists($node[MIDCOM_NAV_COMPONENT], $this->_request_data['components'])
+        if (!array_key_exists($node[MIDCOM_NAV_COMPONENT], $this->_request_data['components'])
             && $node[MIDCOM_NAV_COMPONENT] != 'midcom.helper.search') {
             $l10n = $this->_i18n->get_l10n($node[MIDCOM_NAV_COMPONENT]);
             $this->_request_data['components'][$node[MIDCOM_NAV_COMPONENT]] = $l10n->get($node[MIDCOM_NAV_COMPONENT]);
@@ -112,7 +112,7 @@ 
         $this->prepare_query_data();
         $this->prepare_formdata($_REQUEST['type']);
 
-        if (   count(explode(' ', $data['query'])) == 1
+        if (count(explode(' ', $data['query'])) == 1
             && strpos($data['query'], '*') === false
             && $this->_config->get('single_term_auto_wilcard')) {
             //If there is only one search term append * to the query if auto_wildcard is enabled
@@ -192,12 +192,12 @@ 
             $this->_request_data['last_document_number'] = $last_document_id + 1;
             $this->_request_data['shown_documents'] = $last_document_id - $first_document_id + 1;
             $this->_request_data['results_per_page'] = $results_per_page;
-            $this->_request_data['all_results'] =& $result;
+            $this->_request_data['all_results'] = & $result;
             $this->_request_data['result'] = array_slice($result, $first_document_id, $results_per_page);
 
             // Register GUIDs for cache engine
             foreach ($this->_request_data['result'] as $doc) {
-                if (   !isset($doc->source)
+                if (!isset($doc->source)
                     || !mgd_is_guid($doc->source)) {
                     // Non-Midgard results don't need to go through cache registration
                     continue;

lib/midcom/baseclasses/components/configuration.php

Braces +2 added lines, -1 removed lines

@@ -143,7 +143,8 @@
 
         try {
             $data = file_get_contents($filename);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             return false;
         }
 

lib/midcom/baseclasses/components/handler.php

Spacing +2 added lines, -2 removed lines

@@ -100,12 +100,12 @@
     {
         $this->_master = $master;
 
-        $this->_request_data =& $master->_request_data;
+        $this->_request_data = & $master->_request_data;
         $this->_topic = $master->_topic;
 
         // Load component specific stuff, special treatment if the handler has
         // a component different than the master handler set.
-        if (   $this->_component
+        if ($this->_component
             && $this->_component != $master->_component) {
             $this->_config->store_from_object($this->_topic, $this->_component, true);
         } else {

lib/midcom/style/midcom_helper_datamanager2_unlock.php

Braces +2 added lines, -1 removed lines

@@ -4,7 +4,8 @@
 try {
     $person = new midcom_db_person($metadata->locker);
     $name = $person->name;
-} catch (midcom_error $e) {
+}
+catch (midcom_error $e) {
     $name = $this->data['handler']->_l10n_midcom->get('unknown user');
     $e->log();
 }

lib/midcom/exec/touch_attachments.php

Braces +2 added lines, -1 removed lines

@@ -16,7 +16,8 @@
 foreach ($atts as $att) {
     try {
         $att->file_to_cache();
-    } catch (midcom_error $e) {
+    }
+    catch (midcom_error $e) {
         echo 'Error: ' . $e->getMessage() . "\n";
     }
 }

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/toolbars.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
             return;
         }
         $initialized = true;
-        if (   !midcom::get()->auth->user
+        if (!midcom::get()->auth->user
             || !midcom::get()->config->get('toolbars_enable_centralized')
             || !midcom::get()->auth->can_user_do('midcom:centralized_toolbar', null, $this)) {
             return;

lib/midcom/services/cron.php

Braces +2 added lines, -1 removed lines

@@ -153,7 +153,8 @@
                         $job['component'] = $component;
                         $this->_jobs[] = $job;
                     }
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log(MIDCOM_LOG_ERROR);
                     debug_print_r('Got this job declaration:', $job);
                     echo "ERROR: Failed to register a job for {$component}: " . $e->getMessage() . "\n";