flack / openpsa

lib/midcom/services/rcs/backend/rcs.php

Braces +4 added lines, -2 removed lines

@@ -453,7 +453,8 @@ 
 
         try {
             @exec($command, $output, $status);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add($e->getMessage());
         }
 
@@ -549,7 +550,8 @@ 
 
         try {
             $object = midcom::get()->dbfactory->get_object_by_guid($this->_guid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             debug_add("{$this->_guid} could not be resolved to object", MIDCOM_LOG_ERROR);
             return false;
         }

Indentation +6 added lines, -6 removed lines

@@ -105,12 +105,12 @@
         return $status;
     }
 
-   /**
-    * Get the object of a revision
-    *
-    * @param string $revision identifier of revision wanted
-    * @return array array representation of the object
-    */
+    /**
+     * Get the object of a revision
+     *
+     * @param string $revision identifier of revision wanted
+     * @return array array representation of the object
+     */
     public function get_revision($revision)
     {
         if (empty($this->_guid)) {

Spacing +2 added lines, -2 removed lines

@@ -294,7 +294,7 @@ 
 
                 $i += 3;
 
-                while (   $i < $total
+                while ($i < $total
                        && substr($lines[$i], 0, 4) != '----'
                        && substr($lines[$i], 0, 5) != '=====') {
                     $i++;
@@ -332,7 +332,7 @@ 
      */
     private function rcs_writefile($guid, $data)
     {
-        if (   !is_writable($this->_config->get_rcs_root())
+        if (!is_writable($this->_config->get_rcs_root())
             || empty($guid)) {
             return false;
         }

lib/midcom/baseclasses/core/dbobject.php

Braces +2 added lines, -1 removed lines

@@ -735,7 +735,8 @@
          */
         try {
             return $object->get_by_id($object->id);
-        } catch (exception $e) {
+        }
+        catch (exception $e) {
             return false;
         }
     }

Spacing +4 added lines, -4 removed lines

@@ -133,14 +133,14 @@ 
         if ($parent !== null) {
             // Attachments are a special case
             if ($object instanceof midcom_db_attachment) {
-                if (   !$parent->can_do('midgard:attachments')
+                if (!$parent->can_do('midgard:attachments')
                     || !$parent->can_do('midgard:update')) {
                     debug_add("Failed to create attachment, update or attachments privilege on the parent " . get_class($parent) . " {$parent->guid} not granted for the current user.",
                         MIDCOM_LOG_ERROR);
                     midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
                     return false;
                 }
-            } elseif (   !$parent->can_do('midgard:create')
+            } elseif (!$parent->can_do('midgard:create')
                       && !midcom::get()->auth->can_user_do('midgard:create', null, get_class($object))) {
                 debug_add("Failed to create object, create privilege on the parent " . get_class($parent) . " {$parent->guid} or the actual object class not granted for the current user.",
                     MIDCOM_LOG_ERROR);
@@ -263,7 +263,7 @@ 
             }
 
             // Default the owner to first group of current user
-            if (   empty($object->metadata->owner)
+            if (empty($object->metadata->owner)
                 && $first_group = midcom::get()->auth->user->get_first_group_guid()) {
                 $object->metadata->set('owner', $first_group);
             }
@@ -720,7 +720,7 @@ 
      */
     public static function get_by_guid(midcom_core_dbaobject $object, $guid)
     {
-        if (   !midcom::get()->auth->admin
+        if (!midcom::get()->auth->admin
             && !midcom::get()->auth->acl->can_do_byguid('midgard:read', $guid, get_class($object), midcom::get()->auth->acl->get_user_id())) {
             debug_add("Failed to load object, read privilege on the " . get_class($object) . " {$guid} not granted for the current user.", MIDCOM_LOG_ERROR);
             return false;

lib/midcom/services/cache/main.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 
         $this->_modules[$name] = new $classname();
         $this->_modules[$name]->initialize();
-        $this->$name =& $this->_modules[$name];
+        $this->$name = & $this->_modules[$name];
         array_unshift($this->_unload_queue, $name);
     }
 

lib/midcom/db/attachment.php

Spacing +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
     public function update_cache()
     {
         // Check if the attachment can be read anonymously
-        if (   midcom::get()->config->get('attachment_cache_enabled')
+        if (midcom::get()->config->get('attachment_cache_enabled')
             && !$this->can_do('midgard:read', 'EVERYONE')) {
             // Not public file, ensure it is removed
             $filename = $this->get_cache_path();

lib/midcom/helper/nav/item.php

Spacing +2 added lines, -2 removed lines

@@ -98,8 +98,8 @@
         }
 
         // Check the Metadata if and only if we are configured to do so.
-        if (   is_object($this->object)
-            && (   midcom::get()->config->get('show_hidden_objects') == false
+        if (is_object($this->object)
+            && (midcom::get()->config->get('show_hidden_objects') == false
                 || midcom::get()->config->get('show_unapproved_objects') == false)) {
             // Check Hiding, Scheduling and Approval
             $metadata = $this->object->metadata;

lib/midcom/helper/nav/leaf.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
     public function is_readable_by($user_id)
     {
-        return (   empty($this->object)
+        return (empty($this->object)
                 || !$this->guid
                 || !$user_id
                 || midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->guid, $this->object->__midcom_class_name__, $user_id));

Braces +2 added lines, -1 removed lines

@@ -52,7 +52,8 @@
         } elseif (!empty($this->data[MIDCOM_NAV_GUID])) {
             try {
                 $this->data[MIDCOM_NAV_OBJECT] = midcom::get()->dbfactory->get_object_by_guid($this->data[MIDCOM_NAV_GUID]);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
             }
         } else {
             debug_add("Warning: The leaf {$this->leafid} of topic {$topic->id} does set neither a GUID nor an object.");

lib/midcom/helper/_styleloader.php

Braces +4 added lines, -2 removed lines

@@ -166,7 +166,8 @@ 
                     break;
                 }
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
         }
 
         $path_parts = array_reverse($path_parts);
@@ -410,7 +411,8 @@ 
                 && $db_style = $this->get_style_id_from_path($root_topic->style)) {
                 $_style = $this->_get_element_in_styletree($db_style, $_element);
             }
-        } catch (midcom_error_forbidden $e) {
+        }
+        catch (midcom_error_forbidden $e) {
             $e->log();
         }
 

Spacing +8 added lines, -8 removed lines

@@ -301,7 +301,7 @@ 
             $element = $matches[2];
         }
 
-        if (   isset($stylepath)
+        if (isset($stylepath)
             && $styleid = $this->get_style_id_from_path($stylepath)) {
             array_unshift($this->_scope, $styleid);
         }
@@ -345,7 +345,7 @@ 
     public function render($preparsed, $path)
     {
         if (midcom_core_context::get()->has_custom_key('request_data')) {
-            $data =& midcom_core_context::get()->get_custom_key('request_data');
+            $data = & midcom_core_context::get()->get_custom_key('request_data');
         }
 
         if (eval('?>' . $preparsed) === false) {
@@ -379,7 +379,7 @@ 
 
         try {
             $root_topic = $context->get_key(MIDCOM_CONTEXT_ROOTTOPIC);
-            if (   $root_topic->style
+            if ($root_topic->style
                 && $db_style = $this->get_style_id_from_path($root_topic->style)) {
                 $_style = $this->_get_element_in_styletree($db_style, $_element);
             }
@@ -414,7 +414,7 @@ 
             if (array_key_exists($src, $this->_styles)) {
                 return $this->_styles[$src];
             }
-            if (   $this->_scope[0] != ''
+            if ($this->_scope[0] != ''
                 && $result = $this->_get_element_in_styletree($this->_scope[0], $_element)) {
                 $this->_styles[$src] = $result;
                 return $this->_styles[$src];
@@ -432,7 +432,7 @@ 
         if (array_key_exists($src, $this->_snippets)) {
             return $this->_snippets[$src];
         }
-        if (   midcom::get()->config->get('theme')
+        if (midcom::get()->config->get('theme')
             && $content = midcom_helper_misc::get_element_content($_element)) {
             $this->_snippets[$src] = $content;
             return $content;
@@ -489,7 +489,7 @@ 
             }
         } else {
             $style = $topic->style ?: midcom_core_context::get()->get_inherited_style();
-            if (   is_string($style)
+            if (is_string($style)
                 && strpos($style, 'theme:') === 0) {
                 $theme_dir = OPENPSA2_THEME_ROOT . midcom::get()->config->get('theme') . '/style';
                 $parts = explode('/', str_replace('theme:/', '', $style));
@@ -668,7 +668,7 @@ 
             $this->_styledirs_append[$context->id] = [];
         }
 
-        if (   $this->_topic
+        if ($this->_topic
             && $_st = $this->_get_component_style($this->_topic)) {
             array_unshift($this->_scope, $_st);
         }
@@ -686,7 +686,7 @@ 
      */
     public function leave_context()
     {
-        if (   $this->_topic
+        if ($this->_topic
             && $this->_get_component_style($this->_topic)) {
             array_shift($this->_scope);
         }

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

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
     public function resolve_object_link(midcom_db_topic $topic, midcom_core_dbaobject $object)
     {
-        if (   $object instanceof org_openpsa_documents_document_dba
+        if ($object instanceof org_openpsa_documents_document_dba
             && $object->topic == $topic->id) {
             return "document/{$object->guid}/";
         }

lib/org/openpsa/projects/workflow.php

Spacing +2 added lines, -2 removed lines

@@ -170,7 +170,7 @@ 
     {
         debug_add("task->start() called with user #" . midcom_connection::get_user());
         //PONDER: Check actual status objects for more accurate logic ?
-        if (   $task->status >= org_openpsa_projects_task_status_dba::STARTED
+        if ($task->status >= org_openpsa_projects_task_status_dba::STARTED
             && $task->status <= org_openpsa_projects_task_status_dba::APPROVED) {
             //We already have started status
             debug_add('Task has already been started');
@@ -382,7 +382,7 @@ 
 
     private static function is_manager($task)
     {
-        return (   $task->manager == 0
+        return ($task->manager == 0
                 || midcom_connection::get_user() == $task->manager);
     }
 }

Braces +2 added lines, -1 removed lines

@@ -356,7 +356,8 @@
                 // The agreement allows invoicing only approved hours, therefore don't mark unapproved
                 $qb->add_constraint('metadata.isapproved', '=', true);
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
         }