flack / openpsa

lib/midcom/debug.php

Spacing +4 added lines, -4 removed lines

@@ -185,12 +185,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);
             }
@@ -201,11 +201,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/services/i18n/main.php

Spacing +3 added lines, -3 removed lines

@@ -129,7 +129,7 @@ 
         $rawdata = base64_decode($_COOKIE['midcom_services_i18n']);
         $array = unserialize($rawdata);
 
-        if (   !array_key_exists('language', $array)
+        if (!array_key_exists('language', $array)
             || !array_key_exists('charset', $array)) {
             debug_add("Rejecting cookie, it seems invalid.");
             return;
@@ -158,7 +158,7 @@ 
                 $lang = substr($lang, 0, 2);
                 $q = $this->_get_q($params);
 
-                if (   !isset($http_langs[$lang])
+                if (!isset($http_langs[$lang])
                     || $http_langs[$lang] < $q) {
                     $http_langs[$lang] = $q;
                 }
@@ -421,7 +421,7 @@ 
     private function iconv($source_charset, $destination_charset, $string)
     {
         $result = @iconv($source_charset, $destination_charset, $string);
-        if (   $result === false
+        if ($result === false
             && strlen($string) > 0) {
             debug_add("Iconv returned failed to convert a string, returning an empty string.", MIDCOM_LOG_WARN);
             debug_print_r("Tried to convert this string from {$source_charset} to {$destination_charset}:", $string);

lib/midcom/admin/folder/handler/move.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
     {
         $this->_object = midcom::get()->dbfactory->get_object_by_guid($args[0]);
 
-        if (   !is_a($this->_object, 'midcom_db_topic')
+        if (!is_a($this->_object, 'midcom_db_topic')
             && !is_a($this->_object, 'midcom_db_article')) {
             throw new midcom_error_notfound("Moving only topics and articles is supported.");
         }
@@ -75,7 +75,7 @@ 
             $folder = midcom_core_context::get()->get_key(MIDCOM_CONTEXT_ROOTTOPIC);
         }
 
-        if (   is_a($this->_object, 'midcom_db_topic')
+        if (is_a($this->_object, 'midcom_db_topic')
             && $folder->up == $this->_object->id) {
             $tree_disabled = true;
         }
@@ -88,7 +88,7 @@ 
             $selected = ' checked="checked"';
         }
 
-        if (   !is_a($this->_object, 'midcom_db_topic')
+        if (!is_a($this->_object, 'midcom_db_topic')
             && $folder->component !== $this->_request_data['current_folder']->component) {
             // Non-topic objects may only be moved under folders of same component
             $class = 'wrong_component';

Braces +2 added lines, -1 removed lines

@@ -46,7 +46,8 @@
                 $target = new midcom_db_topic((int) $_POST['move_to']);
                 $this->_move_object($target);
                 midcom::get()->uimessages->add($this->_l10n->get($this->_component), sprintf($this->_l10n->get('moved %s to %s'), $this->_topic->get_label(), $target->get_label()));
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 midcom::get()->uimessages->add($this->_l10n->get($this->_component), $e->getMessage(), 'error');
             }
         }

lib/midcom/services/rcs/handler.php

Spacing +5 added lines, -5 removed lines

@@ -46,7 +46,7 @@ 
     {
         $this->object = midcom::get()->dbfactory->get_object_by_guid($guid);
 
-        if (   !midcom::get()->config->get('midcom_services_rcs_enable')
+        if (!midcom::get()->config->get('midcom_services_rcs_enable')
             || !$this->object->_use_rcs) {
             throw new midcom_error_notfound("Revision control not supported for " . get_class($this->object) . ".");
         }
@@ -183,8 +183,8 @@ 
     public function _handler_history($handler_id, array $args, array &$data)
     {
         // Check if the comparison request is valid
-        if (    !empty($_GET['first']) && !empty($_GET['last'])
-            && $_GET['first']  !== $_GET['last']) {
+        if (!empty($_GET['first']) && !empty($_GET['last'])
+            && $_GET['first'] !== $_GET['last']) {
             return new midcom_response_relocate($this->url_prefix . "diff/{$args[0]}/{$_GET['first']}/{$_GET['last']}/");
         }
 
@@ -218,7 +218,7 @@ 
     {
         $this->load_object($args[0]);
 
-        if (   !$this->backend->version_exists($args[1])
+        if (!$this->backend->version_exists($args[1])
             || !$this->backend->version_exists($args[2])) {
             throw new midcom_error_notfound("One of the revisions {$args[1]} or {$args[2]} does not exist.");
         }
@@ -292,7 +292,7 @@ 
         $this->object->require_do('midgard:update');
         // TODO: set another privilege for restoring?
 
-        if (   $this->backend->version_exists($args[1])
+        if ($this->backend->version_exists($args[1])
             && $this->backend->restore_to_revision($args[1])) {
             midcom::get()->uimessages->add($this->_l10n->get('midcom.admin.rcs'), sprintf($this->_l10n->get('restore to version %s successful'), $args[1]));
             return new midcom_response_relocate($this->get_object_url());

lib/midgard/admin/asgard/plugin.php

Spacing +3 added lines, -3 removed lines

@@ -148,7 +148,7 @@ 
         }
         $data['default_mode'] = 'view';
 
-        if (   !midgard_admin_asgard_plugin::get_preference('edit_mode')
+        if (!midgard_admin_asgard_plugin::get_preference('edit_mode')
             && midcom_baseclasses_components_configuration::get('midgard.admin.asgard', 'config')->get('edit_mode') == 1) {
             $data['default_mode'] = 'edit';
         } elseif (midgard_admin_asgard_plugin::get_preference('edit_mode') == 1) {
@@ -189,7 +189,7 @@ 
 
         $parent = $object->get_parent();
 
-        if (   is_a($object, 'midcom_db_parameter')
+        if (is_a($object, 'midcom_db_parameter')
             && !empty($parent->guid)) {
             // Add "parameters" list to breadcrumb if we're in a param
             $breadcrumb[] = array(
@@ -199,7 +199,7 @@ 
         }
 
         $i = 0;
-        while (   !empty($parent->guid)
+        while (!empty($parent->guid)
                && $i < 10) {
             $i++;
             $parent_reflector = midcom_helper_reflector::get($parent);

lib/org/openpsa/projects/task/resource.php

Spacing +4 added lines, -4 removed lines

@@ -26,12 +26,12 @@
     private function find_duplicates()
     {
         $qb = org_openpsa_projects_task_resource_dba::new_query_builder();
-        $qb->add_constraint('person', '=', (int)$this->person);
-        $qb->add_constraint('task', '=', (int)$this->task);
-        $qb->add_constraint('orgOpenpsaObtype', '=', (int)$this->orgOpenpsaObtype);
+        $qb->add_constraint('person', '=', (int) $this->person);
+        $qb->add_constraint('task', '=', (int) $this->task);
+        $qb->add_constraint('orgOpenpsaObtype', '=', (int) $this->orgOpenpsaObtype);
 
         if ($this->id) {
-            $qb->add_constraint('id', '<>', (int)$this->id);
+            $qb->add_constraint('id', '<>', (int) $this->id);
         }
 
         return ($qb->count() > 0);

lib/midcom/core/query.php

Spacing +2 added lines, -2 removed lines

@@ -128,7 +128,7 @@ 
 
     protected function _add_visibility_checks()
     {
-        if (   $this->hide_invisible
+        if ($this->hide_invisible
             && !$this->_visibility_checks_added) {
             if (!midcom::get()->config->get('show_hidden_objects')) {
                 $this->add_constraint('metadata.hidden', '=', false);
@@ -194,7 +194,7 @@ 
         // Deal with empty arrays, which would produce invalid queries
         // This is done here to avoid repetitive code in callers, and because
         // it's easy enough to generalize: IN empty set => always false, NOT IN empty set => always true
-        if (   is_array($value)
+        if (is_array($value)
             && empty($value)) {
             if ($operator == 'NOT IN') {
                 return true;

lib/midcom/core/querybuilder.php

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 
         $this->_add_visibility_checks();
 
-        if (   empty($this->_limit)
+        if (empty($this->_limit)
             && empty($this->_offset)) {
             // No point to do windowing
             $newresult = $this->_execute_and_check_privileges();
@@ -150,7 +150,7 @@ 
         }
         $this->_query->set_limit($window_size);
 
-        while (    ($resultset = $this->_execute_and_check_privileges())
+        while (($resultset = $this->_execute_and_check_privileges())
                 || $this->denied > $denied) {
             $size = count($resultset);
             $total_size = $size + ($this->denied - $denied);

Braces +2 added lines, -1 removed lines

@@ -58,7 +58,8 @@
             $classname = $this->_real_class;
             try {
                 $newresult[] = new $classname($object);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 if ($e->getCode() == MIDCOM_ERRFORBIDDEN) {
                     $this->denied++;
                 }

lib/midcom/helper/datamanager2/ajax/autocomplete.php

Indentation +2 added lines, -2 removed lines

@@ -244,8 +244,8 @@
             }
         } elseif (   $item_name == 'username'
                   && $object instanceof midcom_db_person) {
-          $account = new midcom_core_account($object);
-          return $account->get_username();
+            $account = new midcom_core_account($object);
+            return $account->get_username();
         }
         return $object->$item_name;
     }

Spacing +5 added lines, -5 removed lines

@@ -52,7 +52,7 @@ 
     {
         $qb = call_user_func(array($this->_request['class'], 'new_query_builder'));
 
-        if (   !empty($this->_request['constraints'])
+        if (!empty($this->_request['constraints'])
             && is_array($this->_request['constraints'])) {
             $this->_apply_constraints($qb, $this->_request['constraints']);
         }
@@ -64,7 +64,7 @@ 
             $qb->end_group();
         }
 
-        if (   !empty($this->_request['orders'])
+        if (!empty($this->_request['orders'])
             && is_array($this->_request['orders'])) {
             ksort($this->_request['orders']);
             foreach ($this->_request['orders'] as $data) {
@@ -83,7 +83,7 @@ 
 
         ksort($constraints);
         foreach ($constraints as $key => $data) {
-            if (   !array_key_exists('value', $data)
+            if (!array_key_exists('value', $data)
                 || empty($data['field'])
                 || empty($data['op'])) {
                 debug_add("Constraint #{$key} is not correctly defined, skipping", MIDCOM_LOG_WARN);
@@ -156,7 +156,7 @@ 
     {
         $query = $this->_request["term"];
         $wildcard_query = $query;
-        if (   isset($this->_request['auto_wildcards'])
+        if (isset($this->_request['auto_wildcards'])
             && strpos($query, '%') === false) {
             switch ($this->_request['auto_wildcards']) {
                 case 'start':
@@ -242,7 +242,7 @@ 
                     }
                     break;
             }
-        } elseif (   $item_name == 'username'
+        } elseif ($item_name == 'username'
                   && $object instanceof midcom_db_person) {
           $account = new midcom_core_account($object);
           return $account->get_username();