flack / openpsa

lib/midcom/config/main.php

Spacing +2 added lines, -2 removed lines

@@ -438,7 +438,7 @@ 
         // show_unapproved_objects). Disabled by default. Unsafe to Link Prefetching!
         'metadata_approval' => false,
         'metadata_scheduling' => false,
-        'metadata_lock_timeout' => 60,    // Time in minutes
+        'metadata_lock_timeout' => 60, // Time in minutes
         'staging2live_staging' => false,
 
         // Set the DM2 schema used by the Metadata Service
@@ -563,7 +563,7 @@ 
         }
 
         // Check the midcom_config site prefix for absolute local urls
-        if (   $key === 'midcom_site_url'
+        if ($key === 'midcom_site_url'
             && substr($this->_merged_config[$key], 0, 1) === '/') {
             $this->_merged_config[$key] = midcom::get()->get_page_prefix() . substr($this->_merged_config[$key], 1);
         }

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

Spacing +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
     {
         foreach ($data as $component => $jobs) {
             // First, verify the component is loaded
-            if (   $component != 'midcom'
+            if ($component != 'midcom'
                 && !midcom::get()->componentloader->load_graceful($component)) {
                 $msg = "Failed to load the component {$component}. See the debug level log for further information, skipping this component.";
                 debug_add($msg, MIDCOM_LOG_ERROR);

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

lib/midcom/services/uimessages.php

Spacing +2 added lines, -2 removed lines

@@ -146,7 +146,7 @@ 
      */
     public function show($show_simple = false)
     {
-        if (   $show_simple
+        if ($show_simple
             || !midcom::get()->auth->can_user_do('midcom:ajax', null, 'midcom_services_uimessages')) {
             $this->show_simple();
             return;
@@ -177,7 +177,7 @@ 
      */
     public function show_simple($prefer_fancy = false)
     {
-        if (   $prefer_fancy
+        if ($prefer_fancy
             && midcom::get()->auth->can_user_do('midcom:ajax', null, 'midcom_services_uimessages')) {
             return $this->show();
         }

lib/midcom/services/metadata.php

Spacing +6 added lines, -6 removed lines

@@ -152,13 +152,13 @@ 
         }
 
         // Approval attributes
-        if (   midcom::get()->config->get('metadata_approval')
+        if (midcom::get()->config->get('metadata_approval')
             && !$object->metadata->is_approved()) {
             $css_classes[] = 'unapproved';
         }
 
         // Hiding and scheduling attributes
-        if (   (   !midcom::get()->config->get('show_hidden_objects')
+        if ((!midcom::get()->config->get('show_hidden_objects')
                 || midcom::get()->config->get('metadata_scheduling'))
             && !$object->metadata->is_visible()) {
             $css_classes[] = 'hidden';
@@ -281,7 +281,7 @@ 
     private function _add_opengraph_metadata($view_metadata)
     {
         $opengraph_type = $view_metadata->object->get_parameter('midcom.helper.metadata', 'opengraph_type');
-        if (   $opengraph_type
+        if ($opengraph_type
             && $opengraph_type != 'none') {
             $request_metadata = $this->get_request_metadata();
 
@@ -401,7 +401,7 @@ 
         }
 
         $component = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_COMPONENT);
-        if (   !$component
+        if (!$component
             || !midcom::get()->componentloader->is_installed($component)
             || !midcom::get()->componentloader->load_graceful($component)) {
             return '';
@@ -425,7 +425,7 @@ 
      */
     public function set_request_metadata($lastmodified, $permalinkguid)
     {
-        if (   is_object($lastmodified)
+        if (is_object($lastmodified)
             && is_a($lastmodified, 'midgard_datetime')) {
             // Midgard2 compatibility
             $lastmodified = $lastmodified->format('U');
@@ -456,7 +456,7 @@ 
             'permalink' => midcom::get()->permalinks->create_permalink($context->get_key(MIDCOM_CONTEXT_PERMALINKGUID)),
         );
 
-        if (   is_object($meta['lastmodified'])
+        if (is_object($meta['lastmodified'])
             && is_a($meta['lastmodified'], 'midgard_datetime')) {
             // Midgard2 compatibility
             $meta['lastmodified'] = $meta['lastmodified']->format('U');

lib/midcom/services/indexer/document.php

Spacing +3 added lines, -3 removed lines

@@ -463,7 +463,7 @@ 
     {
         // Complete fields
         $this->indexed = time();
-        if (   $this->author == ''
+        if ($this->author == ''
             && isset($this->creator->name)) {
             $this->author = $this->creator->name;
         }
@@ -606,7 +606,7 @@ 
     public function read_metadata_from_object($object)
     {
         // Published is set to non-empty value, use it as creation data
-        if (   !empty($object->metadata->published)
+        if (!empty($object->metadata->published)
             && !preg_match('/0{1,4}-0{1,2}0{1,2}\s+0{1,2}:0{1,2}:0{1,2}/', $object->metadata->published)) {
             $this->created = $this->read_unixtime($object->metadata->published);
         } elseif (isset($object->metadata->created)) {
@@ -645,7 +645,7 @@ 
             return @strtotime($stamp);
         }
         // Unix timestamp
-        return (int)$stamp;
+        return (int) $stamp;
     }
 
     /**

Braces +2 added lines, -1 removed lines

@@ -680,7 +680,8 @@
     {
         try {
             return midcom_db_person::get_cached($id);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             return false;
         }
     }

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

Spacing +3 added lines, -3 removed lines

@@ -93,7 +93,7 @@ 
 
     private function process_attachment()
     {
-        if (   !isset($this->attachment->metadata)
+        if (!isset($this->attachment->metadata)
             || !is_object($this->attachment->metadata)) {
             return;
         }
@@ -142,10 +142,10 @@ 
         }
 
         if (strlen(trim($this->attachment->title)) > 0) {
-            $this->title =  "{$this->attachment->title} ({$this->attachment->name})";
+            $this->title = "{$this->attachment->title} ({$this->attachment->name})";
             $this->content .= "\n{$this->attachment->title}\n{$this->attachment->name}";
         } else {
-            $this->title =  $this->attachment->name;
+            $this->title = $this->attachment->name;
             $this->content .= "\n{$this->attachment->name}";
         }
 

lib/midcom/services/_sessioning.php

Braces +2 added lines, -1 removed lines

@@ -85,7 +85,8 @@
 
         try {
             $this->session->start();
-        } catch (RuntimeException $e) {
+        }
+        catch (RuntimeException $e) {
             debug_add($e->getMessage(), MIDCOM_LOG_ERROR);
             return false;
         }

Spacing +3 added lines, -3 removed lines

@@ -67,15 +67,15 @@
             return true;
         }
 
-        if (   !midcom::get()->config->get('sessioning_service_enable')
-            && !(   midcom::get()->config->get('sessioning_service_always_enable_for_users')
+        if (!midcom::get()->config->get('sessioning_service_enable')
+            && !(midcom::get()->config->get('sessioning_service_always_enable_for_users')
                  && midcom_connection::get_user())) {
             return false;
         }
 
         $this->session = new Session(null, new NamespacedAttributeBag('midcom_session_data', $this->ns_separator));
         // Try to start session only if the client sends the id OR we need to set data
-        if (   !isset($_REQUEST[$this->session->getName()])
+        if (!isset($_REQUEST[$this->session->getName()])
             && !$unconditional_start) {
             return false;
         }

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

Indentation +6 added lines, -6 removed lines

@@ -113,12 +113,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)) {

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

Spacing +6 added lines, -6 removed lines

@@ -86,7 +86,7 @@ 
         }
 
         $filename = $this->_generate_rcs_filename($object->guid);
-        $rcsfilename =  "{$filename},v";
+        $rcsfilename = "{$filename},v";
 
         if (!file_exists($rcsfilename)) {
             // The methods return basically what the RCS unix level command returns, so nonzero value is error and zero is ok...
@@ -119,11 +119,11 @@ 
         $filepath = $this->_generate_rcs_filename($this->_guid);
 
         // , must become . to work. Therefore this:
-        str_replace(',', '.', $revision );
+        str_replace(',', '.', $revision);
         // this seems to cause problems:
         //settype ($revision, "float");
 
-        $this->exec('co -q -f -r' . escapeshellarg(trim($revision)) .  " {$filepath} 2>/dev/null");
+        $this->exec('co -q -f -r' . escapeshellarg(trim($revision)) . " {$filepath} 2>/dev/null");
 
         $data = $this->rcs_readfile($this->_guid);
 
@@ -264,7 +264,7 @@ 
             if ($message_array[0] != 'Object') {
                 $history['user'] = $message_array[0];
             }
-            $history['ip']   = $message_array[1];
+            $history['ip'] = $message_array[1];
             $history['message'] = $message_array[2];
         }
         return $history;
@@ -296,7 +296,7 @@ 
 
                 $i += 3;
 
-                while (   $i < $total
+                while ($i < $total
                        && substr($lines[$i], 0, 4) != '----'
                        && substr($lines[$i], 0, 5) != '=====') {
                     $i++;
@@ -334,7 +334,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;
         }