flack / openpsa

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

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/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/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/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);

lib/midcom/helper/reflector/nameresolver.php

Spacing +7 added lines, -7 removed lines

@@ -36,13 +36,13 @@ 
         if (is_null($name_property)) {
             $name_property = midcom_helper_reflector::get_name_property($this->_object);
         }
-        if (    empty($name_property)
+        if (empty($name_property)
             || !midcom_helper_reflector::get($this->_object)->property_exists($name_property)) {
             // Could not resolve valid property
             return false;
         }
         // Make copy via typecast, very important or we might accidentally manipulate the given object
-        return (string)$this->_object->{$name_property};
+        return (string) $this->_object->{$name_property};
     }
 
     /**
@@ -129,7 +129,7 @@ 
     public function name_is_unique_or_empty()
     {
         $name_copy = $this->get_object_name();
-        if (   empty($name_copy)
+        if (empty($name_copy)
             && $name_copy !== false) {
             // Allow empty string name
             return true;
@@ -210,7 +210,7 @@ 
 
             $qb->add_constraint($child_name_property, '=', $name_copy);
             if ($qb->count()) {
-                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')" );
+                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')");
                 return false;
             }
         }
@@ -241,7 +241,7 @@ 
 
             $qb->add_constraint($child_name_property, '=', $name_copy);
             if ($qb->count()) {
-                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')" );
+                debug_add("Name clash in sibling class {$schema_type} for " . get_class($this->_object) . " #{$this->_object->id} (path '" . midcom_helper_reflector_tree::resolve_path($this->_object, '/') . "')");
                 return false;
             }
         }
@@ -274,7 +274,7 @@ 
         $name_prop = midcom_helper_reflector::get_name_property($this->_object);
 
         if (!empty($original_name)) {
-            $current_name = (string)$original_name;
+            $current_name = (string) $original_name;
         } else {
             // Empty name, try to generate from title
             $title_copy = midcom_helper_reflector::get_object_title($this->_object, $title_property);
@@ -319,7 +319,7 @@ 
         } while (!$this->name_is_unique());
 
         // Get a copy of the current, usable name
-        $ret = (string)$this->_object->{$name_prop};
+        $ret = (string) $this->_object->{$name_prop};
         // Restore the original name
         $this->_object->{$name_prop} = $original_name;
         return $ret;

lib/midcom/helper/reflector/main.php

Spacing +8 added lines, -8 removed lines

@@ -431,7 +431,7 @@ 
 
         $label_prop = $this->get_label_property();
 
-        if (    is_string($label_prop)
+        if (is_string($label_prop)
              && $label_prop != 'guid'
              && $this->_mgd_reflector->property_exists($label_prop)) {
             $search_properties[$label_prop] = true;
@@ -492,7 +492,7 @@ 
                 continue;
             }
 
-            if (   !$ref->is_link($property)
+            if (!$ref->is_link($property)
                 && $ref->get_midgard_type($property) != MGD_TYPE_GUID) {
                 continue;
             }
@@ -556,7 +556,7 @@ 
                 return $schema_type;
             }
         }
-        if (   isset($extends[$schema_type])
+        if (isset($extends[$schema_type])
             && class_exists($extends[$schema_type])) {
             return $extends[$schema_type];
         }
@@ -576,7 +576,7 @@ 
     {
         $one = self::resolve_baseclass($class_one);
         $two = self::resolve_baseclass($class_two);
-        return (   $one == $two
+        return ($one == $two
                 || self::class_rewrite($one) == $two
                 || $one == self::class_rewrite($two));
     }
@@ -635,7 +635,7 @@ 
         // Check for decorators first
         if (!empty($class_instance->__mgdschema_class_name__)) {
             $parent_class = $class_instance->__mgdschema_class_name__;
-            if (   !empty($class_instance->__object)
+            if (!empty($class_instance->__object)
                 && !$class_instance->__object instanceof $class_instance->__mgdschema_class_name__) {
                 $parent_class = get_class($class_instance->__object);
                 debug_add('mgdschema object class ' . $parent_class . ' is not an instance of ' . $class_instance->__mgdschema_class_name__, MIDCOM_LOG_INFO);
@@ -670,7 +670,7 @@ 
         $name_exceptions = $this->_config->get('name_exceptions');
         foreach ($name_exceptions as $class => $property) {
             if (midcom::get()->dbfactory->is_a($object, $class)) {
-                if (   $property !== false
+                if ($property !== false
                     && !$this->_mgd_reflector->property_exists($property)) {
                     debug_add("Matched class '{$key}' to '{$class}' via is_a but property '{$property}' does not exist", MIDCOM_LOG_ERROR);
                     self::$_cache['name'][$key] = false;
@@ -726,7 +726,7 @@ 
         if (is_null($title_property)) {
             $title_property = self::get_title_property($object);
         }
-        if (   empty($title_property)
+        if (empty($title_property)
             || !self::get($object)->property_exists($title_property)) {
             // Could not resolve valid property
             return false;
@@ -773,7 +773,7 @@ 
 
         foreach ($title_exceptions as $class => $property) {
             if (midcom::get()->dbfactory->is_a($object, $class)) {
-                if (   $property !== false
+                if ($property !== false
                     && !$this->_mgd_reflector->property_exists($property)) {
                     debug_add("Matched class '{$key}' to '{$class}' via is_a but property '{$property}' does not exist", MIDCOM_LOG_ERROR);
                     self::$_cache['title'][$key] = false;

lib/midcom/services/i18n/formatter.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
     public function number($value, $precision = 2)
     {
-        if (   is_float($value)
+        if (is_float($value)
             && version_compare(Intl::getIcuVersion(), '49', '<')) {
             // workaround for http://bugs.icu-project.org/trac/ticket/8561
             if ($precision == 0) {