flack / openpsa

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

lib/midcom/services/auth/frontend/form.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
      */
     public function read_authentication_data()
     {
-        if (   !array_key_exists('midcom_services_auth_frontend_form_submit', $_REQUEST)
+        if (!array_key_exists('midcom_services_auth_frontend_form_submit', $_REQUEST)
             || !array_key_exists('username', $_REQUEST)
             || !array_key_exists('password', $_REQUEST)) {
             return null;
@@ -52,7 +52,7 @@ 
     {
         // Store the submitted form if the session expired, but user wants to save the data
         if (count($_POST) > 0) {
-            $data =& midcom_core_context::get()->get_custom_key('request_data');
+            $data = & midcom_core_context::get()->get_custom_key('request_data');
 
             $data['restored_form_data'] = array();
 

lib/midcom/services/auth/sessionmgr.php

Spacing +3 added lines, -3 removed lines

@@ -192,7 +192,7 @@ 
             $clientip = $_SERVER['REMOTE_ADDR'];
         }
 
-        if (   midcom::get()->config->get('auth_check_client_ip')
+        if (midcom::get()->config->get('auth_check_client_ip')
             && $session->clientip != $clientip) {
             debug_add("The session {$session->guid} (#{$session->id}) had mismatching client IP.", MIDCOM_LOG_INFO);
             debug_add("Expected {$session->clientip}, got {$clientip}.");
@@ -254,7 +254,7 @@ 
     private function _load_person()
     {
         if (!$this->user) {
-            debug_add("Failed to authenticate the given user: ". midcom_connection::get_error_string(),
+            debug_add("Failed to authenticate the given user: " . midcom_connection::get_error_string(),
             MIDCOM_LOG_INFO);
             return false;
         }
@@ -440,7 +440,7 @@ 
         $result = array();
         $query_result = array_keys($mc->list_keys());
         foreach ($query_result as $userid) {
-            if (   ($user = $this->auth->get_user($userid))
+            if (($user = $this->auth->get_user($userid))
                 && $user->is_online()) {
                 $result[$user->guid] = $user;
             }

Braces +2 added lines, -1 removed lines

@@ -175,7 +175,8 @@
     {
         try {
             $session = new midcom_core_login_session_db($sessionid);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add('Login session ' . $sessionid . ' failed to load: ' . $e->getMessage(), MIDCOM_LOG_INFO);
             return false;
         }

lib/net/nemein/redirector/viewer.php

Spacing +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@ 
     public function _on_initialize()
     {
         // Match /
-        if (   is_null($this->_config->get('redirection_type'))
-            || (   $this->_topic->can_do('net.nemein.redirector:noredirect')
+        if (is_null($this->_config->get('redirection_type'))
+            || ($this->_topic->can_do('net.nemein.redirector:noredirect')
                 && !$this->_config->get('admin_redirection'))) {
             $this->_request_switch['redirect'] = array(
                 'handler' => array('net_nemein_redirector_handler_tinyurl', 'list'),
@@ -77,7 +77,7 @@ 
 
             // Catch first the configuration option for showing editing interface instead
             // of redirecting administrators
-            if (   $this->_topic->can_do('net.nemein.redirector:noredirect')
+            if ($this->_topic->can_do('net.nemein.redirector:noredirect')
                 && !$this->_config->get('admin_redirection')) {
                 midcom::get()->relocate("{$this->_topic->name}/edit/{$args[0]}/");
             }

Braces +2 added lines, -1 removed lines

@@ -152,7 +152,8 @@
                     try {
                         $topic = new midcom_db_topic($id);
                         $id = $topic->id;
-                    } catch (midcom_error $e) {
+                    }
+                    catch (midcom_error $e) {
                         $e->log();
                         break;
                     }

lib/net/nemein/wiki/resolver.php

Spacing +3 added lines, -3 removed lines

@@ -130,7 +130,7 @@ 
          that is populated only once, and even then only the
          first time we encounter a namespaced wikilink */
         static $folder_tree = array();
-        if (   count($folder_tree) == 0
+        if (count($folder_tree) == 0
             || $force_resolve_folder_tree) {
             $folder_tree = $this->_resolve_folder_tree($force_as_root);
         }
@@ -160,7 +160,7 @@ 
             $localpath = $path;
             $matches['latest_parent'] = $folder_tree['/'];
             $missing_levels = 0;
-            while (   $localpath
+            while ($localpath
                    && $localpath != '/') {
                 $localpath = dirname($localpath);
                 $missing_levels++;
@@ -187,7 +187,7 @@ 
 
         $root_folder = $folder;
         $max = 100;
-        while (   $folder[MIDCOM_NAV_COMPONENT] == 'net.nemein.wiki'
+        while ($folder[MIDCOM_NAV_COMPONENT] == 'net.nemein.wiki'
                && (($parent = $nap->get_node_uplink($folder[MIDCOM_NAV_ID])) != -1)
                && $max > 0) {
             $root_folder = $folder;