flack / openpsa

lib/midcom/core/group.php

Braces +6 added lines, -3 removed lines

@@ -92,7 +92,8 @@ 
             }
             try {
                 $this->_storage = new midgard_group($id);
-            } catch (Exception $e) {
+            }
+            catch (Exception $e) {
                 debug_add('Tried to load a midcom_core_group, but got error ' . $e->getMessage(), MIDCOM_LOG_ERROR);
                 debug_print_r('Passed argument was:', $id);
                 throw new midcom_error($e->getMessage());
@@ -151,7 +152,8 @@ 
             try {
                 $user = new midcom_core_user($member->uid);
                 $return[$user->id] = $user;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("The membership record {$member->id} is invalid, the user {$member->uid} failed to load.", MIDCOM_LOG_ERROR);
                 debug_add('Last Midgard error was: ' . $e->getMessage());
                 debug_print_r('Membership record was:', $member);
@@ -183,7 +185,8 @@ 
             try {
                 $group = new midcom_core_group($gid);
                 $return[$group->id] = $group;
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 debug_add("The group {$gid} is unknown, skipping the membership record.", MIDCOM_LOG_ERROR);
                 debug_add('Last Midgard error was: ' . midcom_connection::get_error_string());
             }

lib/midcom/core/privilege.php

Spacing +6 added lines, -6 removed lines

@@ -211,7 +211,7 @@ 
      */
     public function set_assignee($assignee)
     {
-        if (   is_a($assignee, 'midcom_core_user')
+        if (is_a($assignee, 'midcom_core_user')
             || is_a($assignee, 'midcom_core_group')) {
             $this->assignee = $assignee->id;
         } elseif (is_string($assignee)) {
@@ -256,27 +256,27 @@ 
         }
 
         // 2. Assignee
-        if (   !$this->is_magic_assignee()
+        if (!$this->is_magic_assignee()
             && !$this->get_assignee()) {
             debug_add("The assignee identifier '{$this->assignee}' is invalid.", MIDCOM_LOG_INFO);
             return false;
         }
 
-        if (   $this->assignee == 'SELF'
+        if ($this->assignee == 'SELF'
             && $this->classname != ''
             && !class_exists($this->classname)) {
             debug_add("The class '{$this->classname}' is not loaded, the SELF magic assignee with class restriction is invalid therefore.", MIDCOM_LOG_INFO);
             return false;
         }
 
-        if (   $this->assignee != 'SELF'
+        if ($this->assignee != 'SELF'
             && $this->classname != '') {
             debug_add("The classname parameter was specified without having the magic assignee SELF set, this is invalid.", MIDCOM_LOG_INFO);
             return false;
         }
 
         // Prevent owner assignments to owners
-        if (   $this->assignee == 'OWNER'
+        if ($this->assignee == 'OWNER'
             && $this->privilegename == 'midgard:owner') {
             debug_add("Tried to assign midgard:owner to the OWNER magic assignee, this is invalid.", MIDCOM_LOG_INFO);
             return false;
@@ -288,7 +288,7 @@ 
                 MIDCOM_LOG_INFO);
             return false;
         }
-        if (   !$object->can_do('midgard:update')
+        if (!$object->can_do('midgard:update')
             || !$object->can_do('midgard:privileges')) {
             debug_add("Insufficient privileges on the content object with the GUID '{$this->__guid}', midgard:update and midgard:privileges required.",
                 MIDCOM_LOG_INFO);

Braces +2 added lines, -1 removed lines

@@ -145,7 +145,8 @@
         if (is_null($this->__cached_object)) {
             try {
                 $this->__cached_object = midcom::get()->dbfactory->get_object_by_guid($this->objectguid);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 return false;
             }
         }

lib/midcom/core/dbaobject.php

Braces +2 added lines, -1 removed lines

@@ -98,7 +98,8 @@
             try {
                 $mgdschemaclass = $this->__mgdschema_class_name__;
                 $this->__object = new $mgdschemaclass($id);
-            } catch (midgard_error_exception $e) {
+            }
+            catch (midgard_error_exception $e) {
                 debug_add('Constructing ' . $this->__mgdschema_class_name__ . ' object ' . $id . ' failed, reason: ' . $e->getMessage(), MIDCOM_LOG_WARN);
                 throw new midcom_error_midgard($e, $id);
             }

Spacing +5 added lines, -5 removed lines

@@ -85,12 +85,12 @@ 
         if (is_object($id)) {
             $this->__object = midcom::get()->dbfactory->convert_midcom_to_midgard($id);
         } else {
-            if (   is_string($id)
+            if (is_string($id)
                 && strlen($id) == 1) {
                 debug_add('Constructing ' . $this->__mgdschema_class_name__ . ' object ' . $id . ' with ID typecast to string. Changing typecast.', MIDCOM_LOG_INFO);
                 $id = (int) $id;
             }
-            if (   is_int($id)
+            if (is_int($id)
                 && $id < 1) {
                 throw new midcom_error($id . ' is not a valid database ID');
             }
@@ -104,7 +104,7 @@ 
             }
 
             //Some useful information for performance tuning
-            if (   midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
+            if (midcom::get()->config->get('log_level') >= MIDCOM_LOG_DEBUG
                 && $this->__object->guid) {
                 static $guids = array();
                 static $total = 0;
@@ -126,7 +126,7 @@ 
             }
         }
 
-        if (   $this->__object->guid
+        if ($this->__object->guid
             && mgd_is_guid($this->__object->guid)) {
             midcom_baseclasses_core_dbobject::post_db_load_checks($this);
         }
@@ -678,7 +678,7 @@ 
     }
     public function enable_rcs()
     {
-        $this->_use_rcs  = true;
+        $this->_use_rcs = true;
     }
     public function set_rcs_message($msg)
     {

lib/midcom/core/querybuilder.php

Braces +4 added lines, -2 removed lines

@@ -69,7 +69,8 @@ 
     {
         try {
             $result = $this->_query->execute();
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Query failed: " . $e->getMessage(), MIDCOM_LOG_ERROR);
             return array();
         }
@@ -90,7 +91,8 @@ 
             $classname = $this->_real_class;
             try {
                 $object = new $classname($object);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 if ($e->getCode() == MIDCOM_ERRFORBIDDEN) {
                     $this->denied++;
                 }

Spacing +7 added lines, -7 removed lines

@@ -73,7 +73,7 @@ 
             debug_add("Query failed: " . $e->getMessage(), MIDCOM_LOG_ERROR);
             return array();
         }
-        if (   empty($result)
+        if (empty($result)
             && $false_on_empty_mgd_resultset) {
             return false;
         }
@@ -93,7 +93,7 @@ 
             }
 
             // Check approval
-            if (   $this->hide_invisible
+            if ($this->hide_invisible
                 && !midcom::get()->config->get('show_unapproved_objects')
                 && !$object->__object->is_approved()) {
                 continue;
@@ -134,7 +134,7 @@ 
             debug_print_function_stack('We were called from here:');
         }
 
-        if (   empty($this->_limit)
+        if (empty($this->_limit)
             && empty($this->_offset)) {
             // No point to do windowing
             $newresult = $this->_execute_and_check_privileges();
@@ -186,23 +186,23 @@ 
         if (!$this->_window_size) {
             // Try to be smart about the window size
             switch (true) {
-                case (   empty($this->_offset)
+                case (empty($this->_offset)
                       && $this->_limit):
                     // Get limited number from start (I supposed generally less than 50% will be unreadable)
                     $this->_window_size = round($this->_limit * 1.5);
                     break;
-                case (   empty($this->_limit)
+                case (empty($this->_limit)
                       && $this->_offset):
                     // Get rest from offset
                     /* TODO: Somehow factor in that if we have huge number of objects and relatively small offset we want to increase window size
                     $full_object_count = $this->_query->count();
                     */
                     $this->_window_size = $this->_offset * 2;
-                case (   $this->_offset > $this->_limit):
+                case ($this->_offset > $this->_limit):
                     // Offset is greater than limit, basically this is almost the same problem as above
                     $this->_window_size = $this->_offset * 2;
                     break;
-                case (   $this->_limit > $this->_offset):
+                case ($this->_limit > $this->_offset):
                     // Limit is greater than offset, this is probably similar to getting limited number from beginning
                     $this->_window_size = $this->_limit * 2;
                     break;

lib/midcom/services/dbclassloader.php

Spacing +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
         foreach ($definitions as $mgdschema_class => $midcom_class) {
             $this->_mgdschema_class_handler[$midcom_class] = $component;
 
-            if (   substr($mgdschema_class, 0, 8) == 'midgard_'
+            if (substr($mgdschema_class, 0, 8) == 'midgard_'
                 || substr($mgdschema_class, 0, 12) == 'midcom_core_'
                 || $mgdschema_class == midcom::get()->config->get('person_class')) {
                 $this->_midgard_classes[$mgdschema_class] = $midcom_class;

lib/midcom/services/auth/main.php

Braces +4 added lines, -2 removed lines

@@ -787,7 +787,8 @@ 
                     $param = $param->__object;
                 }
                 $this->_user_cache[$id] = new midcom_core_user($param);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 // Keep it silent while missing user object can mess here
                 $this->_user_cache[$id] = false;
             }
@@ -849,7 +850,8 @@ 
             $tmp = new midcom_core_group($id);
             $id = $tmp->id;
             $this->_group_cache[$id] = $tmp;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $this->_group_cache[$id] = false;
             debug_add("Group with identifier {$id} could not be loaded: " . $e->getMessage(), MIDCOM_LOG_WARN);
         }

Spacing +9 added lines, -9 removed lines

@@ -184,7 +184,7 @@ 
 
         $person_class = midcom::get()->config->get('person_class');
         $person = new $person_class($this->user->guid);
-        if (   midcom::get()->config->get('auth_save_prev_login')
+        if (midcom::get()->config->get('auth_save_prev_login')
             && $person->get_parameter('midcom', 'last_login')) {
             $person->set_parameter('midcom', 'prev_login', $person->get_parameter('midcom', 'last_login'));
         }
@@ -202,7 +202,7 @@ 
         }
 
         // There was form data sent before authentication was re-required
-        if (   isset($_POST['restore_form_data'])
+        if (isset($_POST['restore_form_data'])
             && isset($_POST['restored_form_data'])) {
             foreach ($_POST['restored_form_data'] as $key => $string) {
                 $value = @unserialize(base64_decode($string));
@@ -225,7 +225,7 @@ 
      */
     private function _sync_user_with_backend()
     {
-        $this->user =& $this->_auth_backend->user;
+        $this->user = & $this->_auth_backend->user;
         // This check is a bit fuzzy but will work as long as MidgardAuth is in sync with
         // MidCOM auth.
         $this->admin = (midcom_connection::is_admin() || midcom_connection::get('root'));
@@ -255,10 +255,10 @@ 
      */
     private function _initialize_user_from_midgard()
     {
-        if (   midcom_connection::get_user()
+        if (midcom_connection::get_user()
             && $user = $this->get_user(midcom_connection::get_user())) {
             $this->user = $user;
-            if (   midcom_connection::is_admin()
+            if (midcom_connection::is_admin()
                 || midcom_connection::get('root')) {
                 $this->admin = true;
             }
@@ -353,7 +353,7 @@ 
             return true;
         }
         if (is_null($user)) {
-            $user =& $this->user;
+            $user = & $this->user;
         }
 
         if ($user == 'EVERYONE') {
@@ -581,7 +581,7 @@ 
      */
     public function require_admin_user($message = null)
     {
-        if (   !$this->admin
+        if (!$this->admin
             && !$this->_component_sudo) {
             if ($message === null) {
                 $message = midcom::get()->i18n->get_string('access denied: admin level privileges required', 'midcom');
@@ -601,7 +601,7 @@ 
     public function require_admin_or_ip($domain)
     {
         $ips = midcom::get()->config->get('indexer_reindex_allowed_ips');
-        if (   $ips
+        if ($ips
             && in_array($_SERVER['REMOTE_ADDR'], $ips)) {
             if (!$this->request_sudo($domain)) {
                 throw new midcom_error('Failed to acquire SUDO rights. Aborting.');
@@ -930,7 +930,7 @@ 
 
         // Determine login warning so that wrong user/pass is shown.
         $login_warning = '';
-        if (   $this->auth_credentials_found
+        if ($this->auth_credentials_found
             && is_null($this->user)) {
             $login_warning = midcom::get()->i18n->get_string('login message - user or password wrong', 'midcom');
         }

lib/midcom/debug.php

Braces +2 added lines, -1 removed lines

@@ -193,7 +193,8 @@
                     $log_method = 'error';
                 }
                 $this->firephp->$log_method($message);
-            } catch (Exception $e) {
+            }
+            catch (Exception $e) {
                 // Ignore FirePHP errors for now
             }
         }

Spacing +5 added lines, -5 removed lines

@@ -181,7 +181,7 @@ 
         fputs($file, $prefix . trim($message) . "\n");
         fclose($file);
 
-        if (   $this->firephp
+        if ($this->firephp
             && !_midcom_headers_sent()) {
             try {
                 $log_method = $this->_loglevels[$loglevel];
@@ -215,12 +215,12 @@ 
 
         while ($bt) {
             $caller = array_shift($bt);
-            if (   array_key_exists('class', $caller)
+            if (array_key_exists('class', $caller)
                 && $caller['class'] == 'midcom_debug') {
                 continue;
             }
 
-            if (   !array_key_exists('function', $bt[0])
+            if (!array_key_exists('function', $bt[0])
                 || $bt[0]['function'] != 'require') {
                 $caller = array_shift($bt);
             }
@@ -231,11 +231,11 @@ 
         if (array_key_exists('class', $caller)) {
             $return .= $caller['class'] . '::';
         }
-        if (   array_key_exists('function', $caller)
+        if (array_key_exists('function', $caller)
             && substr($caller['function'], 0, 6) != 'debug_') {
             $return .= $caller['function'] . ': ';
         } else {
-            $return .= $caller['file'] . ' (' . $caller['line']. '): ';
+            $return .= $caller['file'] . ' (' . $caller['line'] . '): ';
         }
         return $return;
     }

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 +16 added lines, -16 removed lines

@@ -134,14 +134,14 @@ 
         if (!is_null($parent)) {
             // Attachments are a special case
             if (midcom::get()->dbfactory->is_a($object, 'midgard_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);
@@ -265,7 +265,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);
                 }
@@ -702,7 +702,7 @@ 
 
         $object->__object->get_by_id((int) $id);
 
-        if (   $object->id != 0
+        if ($object->id != 0
             && $object->action != 'delete') {
             if (!$object->can_do('midgard:read')) {
                 debug_add("Failed to load object, read privilege on the " . get_class($object) . " {$object->guid} not granted for the current user.",
@@ -728,14 +728,14 @@ 
      */
     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;
         }
         $object->__object->get_by_guid((string) $guid);
 
-        if (   $object->id != 0
+        if ($object->id != 0
             && $object->action != 'delete') {
             $object->_on_loaded();
             return true;
@@ -756,7 +756,7 @@ 
     {
         $object->__object->get_by_path((string) $path);
 
-        if (   $object->id != 0
+        if ($object->id != 0
             && $object->action != 'delete') {
             if (!$object->can_do('midgard:read')) {
                 $object->__object = new $object->__mgdschema_class_name__;
@@ -979,7 +979,7 @@ 
             debug_add('Cannot set parameters on a non-persistant object.', MIDCOM_LOG_WARN);
             return false;
         }
-        if (   empty($domain)
+        if (empty($domain)
             || empty($name)
             || !is_string($domain)
             || !is_string($name)) {
@@ -989,7 +989,7 @@ 
             return false;
         }
 
-        if (   !$object->can_do('midgard:update')
+        if (!$object->can_do('midgard:update')
             || !$object->can_do('midgard:parameters')) {
             debug_add("Failed to set parameters, midgard:update or midgard:parameters on the " . get_class($object) . " {$object->guid} not granted for the current user.",
                 MIDCOM_LOG_ERROR);
@@ -1033,7 +1033,7 @@ 
             debug_add('Cannot delete parameters on a non-persistant object.', MIDCOM_LOG_WARN);
             return false;
         }
-        if (   empty($domain)
+        if (empty($domain)
             || empty($name)
             || !is_string($domain)
             || !is_string($name)) {
@@ -1043,7 +1043,7 @@ 
             return false;
         }
 
-        if (   !$object->can_do('midgard:update')
+        if (!$object->can_do('midgard:update')
             || !$object->can_do('midgard:parameters')) {
             debug_add("Failed to delete parameters, midgard:update or midgard:parameters on the " . get_class($object) . " {$object->guid} not granted for the current user.",
                 MIDCOM_LOG_ERROR);
@@ -1103,7 +1103,7 @@ 
      */
     public static function set_privilege(midcom_core_dbaobject $object, $privilege, $assignee = null, $value = MIDCOM_PRIVILEGE_ALLOW, $classname = '')
     {
-        if (   !$object->can_do('midgard:update')
+        if (!$object->can_do('midgard:update')
             || !$object->can_do('midgard:privileges')) {
             debug_add("Failed to set a privilege, midgard:update or midgard:privileges on the " . get_class($object) . " {$object->guid} not granted for the current user.",
                 MIDCOM_LOG_ERROR);
@@ -1137,7 +1137,7 @@ 
      */
     public static function unset_privilege(midcom_core_dbaobject $object, $privilege, $assignee = null, $classname = '')
     {
-        if (   !$object->can_do('midgard:update')
+        if (!$object->can_do('midgard:update')
             || !$object->can_do('midgard:privileges')) {
             debug_add("Failed to unset a privilege, midgard:update or midgard:privileges on the " . get_class($object) . " {$object->guid} not granted for the current user.",
                 MIDCOM_LOG_ERROR);
@@ -1254,7 +1254,7 @@ 
             return false;
         }
 
-        if (   !$object->can_do('midgard:update')
+        if (!$object->can_do('midgard:update')
             || !$object->can_do('midgard:attachments')) {
             debug_add("Failed to set parameters, midgard:update or midgard:attachments on the " . get_class($object) . " {$object->guid} not granted for the current user.",
                 MIDCOM_LOG_ERROR);
@@ -1280,7 +1280,7 @@ 
             return false;
         }
 
-        if (   !$object->can_do('midgard:update')
+        if (!$object->can_do('midgard:update')
             || !$object->can_do('midgard:attachments')) {
             debug_add("Failed to set parameters, midgard:update or midgard:attachments on the " . get_class($object) . " {$object->guid} not granted for the current user.",
                 MIDCOM_LOG_ERROR);
@@ -1294,7 +1294,7 @@ 
         $attachment->parentguid = $object->guid;
 
         if (!$attachment->create()) {
-            debug_add("Could not create the attachment '{$name}' for " . get_class($object) . " {$object->guid}: "  . midcom_connection::get_error_string(),
+            debug_add("Could not create the attachment '{$name}' for " . get_class($object) . " {$object->guid}: " . midcom_connection::get_error_string(),
                 MIDCOM_LOG_INFO);
             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());
         }