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

Spacing +5 added lines, -5 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...
@@ -121,7 +121,7 @@ 
         // , must become . to work. Therefore this:
         str_replace(',', '.', $revision);
 
-        $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);
 
@@ -262,7 +262,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;
@@ -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;
         }

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)) {

lib/midcom/services/indexer/main.php

Braces +12 added lines, -6 removed lines

@@ -135,7 +135,8 @@ 
 
         try {
             return $this->_backend->index($documents);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Indexing error: " . $e->getMessage(), MIDCOM_LOG_ERROR);
             return false;
         }
@@ -175,7 +176,8 @@ 
         }
         try {
             return $this->_backend->delete($RIs);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Deleting error: " . $e->getMessage(), MIDCOM_LOG_ERROR);
             return false;
         }
@@ -196,7 +198,8 @@ 
 
         try {
             return $this->_backend->delete_all($constraint);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Deleting error: " . $e->getMessage(), MIDCOM_LOG_ERROR);
             return false;
         }
@@ -230,7 +233,8 @@ 
 
         try {
             $result_raw = $this->_backend->query($query, $filter, $options);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Query error: " . $e->getMessage(), MIDCOM_LOG_ERROR);
             return false;
         }
@@ -256,7 +260,8 @@ 
             if (!empty($document->topic_guid)) {
                 try {
                     midcom_db_topic::get_cached($document->topic_guid);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     // Skip document, the object is hidden.
                     debug_add("Skipping the generic document {$document->title}, its topic seems to be invisible, we cannot proceed.");
                     continue;
@@ -269,7 +274,8 @@ 
                 // Strip language code from end of RI if it looks like "<GUID>_<LANG>"
                 try {
                     midcom::get()->dbfactory->get_object_by_guid(preg_replace('/^([0-9a-f]{32,80})_[a-z]{2}$/', '\\1', $document->RI));
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     // Skip document, the object is hidden, deleted or otherwise unavailable.
                     //@todo Maybe nonexistent objects should be removed from index?
                     continue;

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

@@ -132,14 +132,14 @@ 
         if (!is_null($parent)) {
             // 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);
                 }
@@ -722,7 +722,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/baseclasses/components/handler/rest.php

Braces +4 added lines, -2 removed lines

@@ -138,7 +138,8 @@ 
         try {
             $this->_object = new $classname($this->_id);
             return $this->_object;
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             $this->_stop($e->getMessage(), $e->getCode());
         }
     }
@@ -211,7 +212,8 @@ 
             if (is_null($this->_response)) {
                 $this->_stop('Could not handle request, unknown method', 405);
             }
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $this->_responseStatus = $e->getCode();
             return $this->_send_response($e->getMessage());
         }

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/helper/imagepopup/handler/list.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
         midcom::get()->auth->require_valid_user();
         midcom::get()->skip_page_style = true;
 
-        $this->add_stylesheet(MIDCOM_STATIC_URL ."/midcom.helper.imagepopup/styling.css", 'screen');
+        $this->add_stylesheet(MIDCOM_STATIC_URL . "/midcom.helper.imagepopup/styling.css", 'screen');
 
         $data['filetype'] = $args[0];
         $data['object'] = null;

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