flack / openpsa

src/midcom/dba/privileges.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
      */
     public function set_privilege($privilege, $assignee = null, $value = MIDCOM_PRIVILEGE_ALLOW, $classname = '')
     {
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:privileges')) {
             debug_add("Failed to set a privilege, midgard:update or midgard:privileges on the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -91,7 +91,7 @@ 
      */
     public function unset_privilege($privilege, $assignee = null, $classname = '')
     {
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:privileges')) {
             debug_add("Failed to unset a privilege, midgard:update or midgard:privileges on the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);

src/midcom/dba/parameters.php

Indentation +2 added lines, -2 removed lines

@@ -218,7 +218,7 @@ 
         if (   !$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to set parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.",
-                      MIDCOM_LOG_ERROR);
+                        MIDCOM_LOG_ERROR);
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;
         }
@@ -271,7 +271,7 @@ 
         if (   !$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to delete parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.",
-                      MIDCOM_LOG_ERROR);
+                        MIDCOM_LOG_ERROR);
             midcom_connection::set_error(MGD_ERR_ACCESS_DENIED);
             return false;
         }

Spacing +4 added lines, -4 removed lines

@@ -205,7 +205,7 @@ 
             debug_add('Cannot set parameters on a non-persistent object.', MIDCOM_LOG_WARN);
             return false;
         }
-        if (   empty($domain)
+        if (empty($domain)
             || empty($name)
             || !is_string($domain)
             || !is_string($name)) {
@@ -215,7 +215,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to set parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.",
                       MIDCOM_LOG_ERROR);
@@ -258,7 +258,7 @@ 
             debug_add('Cannot delete parameters on a non-persistent object.', MIDCOM_LOG_WARN);
             return false;
         }
-        if (   empty($domain)
+        if (empty($domain)
             || empty($name)
             || !is_string($domain)
             || !is_string($name)) {
@@ -268,7 +268,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:parameters')) {
             debug_add("Failed to delete parameters, midgard:update or midgard:parameters on the " . get_class($this) . " {$this->guid} not granted for the current user.",
                       MIDCOM_LOG_ERROR);

src/midcom/dba/attachments.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:attachments')) {
             debug_add("Failed to set parameters, midgard:update or midgard:attachments on the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -88,7 +88,7 @@ 
             return false;
         }
 
-        if (   !$this->can_do('midgard:update')
+        if (!$this->can_do('midgard:update')
             || !$this->can_do('midgard:attachments')) {
             debug_add("Failed to set parameters, midgard:update or midgard:attachments on the " . get_class($this) . " {$this->guid} not granted for the current user.",
             MIDCOM_LOG_ERROR);
@@ -102,7 +102,7 @@ 
         $attachment->parentguid = $this->guid;
 
         if (!$attachment->create()) {
-            debug_add("Could not create the attachment '{$name}' for " . get_class($this) . " {$this->guid}: "  . midcom_connection::get_error_string(),
+            debug_add("Could not create the attachment '{$name}' for " . get_class($this) . " {$this->guid}: " . midcom_connection::get_error_string(),
             MIDCOM_LOG_INFO);
             return false;
         }

src/midcom/datamanager/extension/transformer/jsdate.php

Spacing +4 added lines, -4 removed lines

@@ -33,8 +33,8 @@ 
             }
         }
 
-        if (   empty($input)
-            || (   $input instanceof DateTime
+        if (empty($input)
+            || ($input instanceof DateTime
                 && $input->format('Y-m-d H:i:s') == '0001-01-01 00:00:00')) {
             return $result;
         }
@@ -59,8 +59,8 @@ 
             throw new TransformationFailedException('Expected an array.');
         }
 
-        if (   empty($array['date'])
-            || (   $array['date'] instanceof DateTime
+        if (empty($array['date'])
+            || ($array['date'] instanceof DateTime
                 && $array['date']->format('Y-m-d H:i:s') == '0001-01-01 00:00:00')) {
             return;
         }

lib/midcom/baseclasses/components/request.php

Spacing +7 added lines, -7 removed lines

@@ -416,7 +416,7 @@ 
                 $this->_request_switch[$key]['handler'] = [&$this, $value['handler']];
             }
 
-            if (   !array_key_exists('expires', $value)
+            if (!array_key_exists('expires', $value)
                 || !is_integer($value['expires'])
                 || $value['expires'] < -1) {
                 $this->_request_switch[$key]['expires'] = -1;
@@ -446,7 +446,7 @@ 
         }
 
         // Check if we need to start up a plugin.
-        if (   count($argv) > 1
+        if (count($argv) > 1
             && array_key_exists($argv[0], self::$_plugin_namespace_config)
             && array_key_exists($argv[1], self::$_plugin_namespace_config[$argv[0]])) {
             $namespace = $argv[0];
@@ -462,7 +462,7 @@ 
                 continue;
             }
             $fixed_args_count = count($request['fixed_args']);
-            $this->_handler =& $this->_request_switch[$key];
+            $this->_handler = & $this->_request_switch[$key];
 
             $this->_handler['id'] = $key;
             $this->_handler['args'] = array_slice($argv, $fixed_args_count);
@@ -471,10 +471,10 @@ 
             $this->_prepare_handler();
 
             // If applicable, run the _can_handle check for the handler in question.
-            $handler =& $this->_handler['handler'][0];
+            $handler = & $this->_handler['handler'][0];
             $method = "_can_handle_{$this->_handler['handler'][1]}";
 
-            if (   method_exists($handler, $method)
+            if (method_exists($handler, $method)
                 && !$handler->$method($this->_handler['id'], $this->_handler['args'], $this->_request_data)) {
                 // This can_handle failed, allow next one to take over if there is one
                 continue;
@@ -491,7 +491,7 @@ 
         $variable_args_count = $request['variable_args'];
         $total_args_count = $fixed_args_count + $variable_args_count;
 
-        if (   (count($argv) != $total_args_count && ($variable_args_count >= 0))
+        if ((count($argv) != $total_args_count && ($variable_args_count >= 0))
             || $fixed_args_count > count($argv)) {
             return false;
         }
@@ -511,7 +511,7 @@ 
                 $success = false;
                 foreach ($request['validation'][$i] as $rule) {
                     // rule is a callable function, like mgd_is_guid or is_int
-                    if (   is_callable($rule)
+                    if (is_callable($rule)
                         && $success = call_user_func($rule, $param)) {
                         break;
                     }

lib/midcom/baseclasses/components/interface.php

Spacing +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
      */
     public function can_handle($current_object, array $argv, $contextid)
     {
-        $data =& $this->_context_data[$contextid];
+        $data = & $this->_context_data[$contextid];
         $loader = midcom::get()->componentloader;
         $class = $loader->path_to_prefix($this->_component) . '_' . $this->_site_class_suffix;
         $data['handler'] = new $class($current_object, $data['config']);

src/midcom/datamanager/extension/type/select.php

Spacing +6 added lines, -6 removed lines

@@ -27,12 +27,12 @@ 
     {
         parent::configureOptions($resolver);
 
-        $map_options = function (Options $options) {
+        $map_options = function(Options $options) {
             $return_options = [];
             if (!empty($options['type_config']['options'])) {
                 foreach ($options['type_config']['options'] as $key => $value) {
                     //symfony expects only strings
-                    $return_options[(string)$value] = (string)$key;
+                    $return_options[(string) $value] = (string) $key;
                 }
             } elseif (isset($options['type_config']['option_callback'])) {
                 $classname = $options['type_config']['option_callback'];
@@ -40,13 +40,13 @@ 
                 $callback = new $classname($options['type_config']['option_callback_arg']);
                 foreach ($callback->list_all() as $key => $value) {
                     //symfony expects only strings
-                    $return_options[(string)$value] = (string)$key;
+                    $return_options[(string) $value] = (string) $key;
                 }
             }
             return $return_options;
         };
 
-        $map_multiple = function (Options $options) {
+        $map_multiple = function(Options $options) {
             return !empty($options['type_config']['allow_multiple']);
         };
 
@@ -57,7 +57,7 @@ 
             'placeholder' => false
         ]);
 
-        $resolver->setNormalizer('type_config', function (Options $options, $value) {
+        $resolver->setNormalizer('type_config', function(Options $options, $value) {
             $type_defaults = [
                 'options' => [],
                 'option_callback' => null,
@@ -70,7 +70,7 @@ 
             ];
             return helper::resolve_options($type_defaults, $value);
         });
-        $resolver->setNormalizer('widget_config', function (Options $options, $value) {
+        $resolver->setNormalizer('widget_config', function(Options $options, $value) {
             $widget_defaults = [
                 'height' => 6,
                 'jsevents' => []

src/midcom/datamanager/extension/type/radiocheckselect.php

Spacing +5 added lines, -5 removed lines

@@ -25,24 +25,24 @@ 
     public function configureOptions(OptionsResolver $resolver)
     {
         parent::configureOptions($resolver);
-        $map_options = function (Options $options) {
+        $map_options = function(Options $options) {
             $return_options = [];
             if (!empty($options['type_config']['options'])) {
                 foreach ($options['type_config']['options'] as $key => $value) {
                     //symfony expects only strings
-                    $return_options[(string)$value] = (string)$key;
+                    $return_options[(string) $value] = (string) $key;
                 }
             } elseif (isset($options['type_config']['option_callback'])) {
                 $classname = $options['type_config']['option_callback'];
                 $callback = new $classname($options['type_config']['option_callback_arg']);
                 foreach ($callback->list_all() as $key => $value) {
                     //symfony expects only strings
-                    $return_options[(string)$value] = (string)$key;
+                    $return_options[(string) $value] = (string) $key;
                 }
             }
             return $return_options;
         };
-        $map_multiple = function (Options $options) {
+        $map_multiple = function(Options $options) {
             return !empty($options['type_config']['allow_multiple']);
         };
 
@@ -54,7 +54,7 @@ 
             'placeholder' => false
         ]);
 
-        $resolver->setNormalizer('type_config', function (Options $options, $value) {
+        $resolver->setNormalizer('type_config', function(Options $options, $value) {
             $type_defaults = [
                 'options' => [],
                 'option_callback' => null,

lib/midcom/core/service/implementation/urlparsertopic.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
                     return false;
                 }
                 // No topics matching path, check for attachments
-                $att_qb =  midcom_db_attachment::new_query_builder();
+                $att_qb = midcom_db_attachment::new_query_builder();
                 $att_qb->add_constraint('name', '=', $this->argv[0]);
                 $att_qb->add_constraint('parentguid', '=', $this->get_current_object()->guid);
                 if ($att_qb->count() == 0) {