flack / openpsa

src/midcom/datamanager/validation/imageValidator.php

Spacing +3 added lines, -3 removed lines

@@ -12,10 +12,10 @@
 {
     public function validate($value, Constraint $constraint)
     {
-        if (   empty($value)
+        if (empty($value)
             || !empty($value['delete'])
-            || (   empty($value['file'])
-                && (   (empty($constraint->config['do_not_save_archival']) && empty($value['archival']))
+            || (empty($value['file'])
+                && ((empty($constraint->config['do_not_save_archival']) && empty($value['archival']))
                     || (!empty($constraint->config['do_not_save_archival']) && empty($value['main']))))) {
             $this->context->buildViolation('This value should not be blank.')
                 ->addViolation();

lib/org/openpsa/calendar/handler/event/create.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         if ($query->has('start')) {
             $defaults['start'] = strtotime(substr($query->get('start'), 0, 19)) + 1;
             if ($query->has('end')) {
-                $defaults['end']= strtotime(substr($query->get('end'), 0, 19));
+                $defaults['end'] = strtotime(substr($query->get('end'), 0, 19));
             } else {
                 $defaults['end'] = $defaults['start'] + 3600;
             }

src/midcom/routing/resolver.php

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
         $prefix = $this->context->get_key(MIDCOM_CONTEXT_ANCHORPREFIX);
 
         // Check if we need to start up a plugin.
-        if (   count($argv) > 1
+        if (count($argv) > 1
             && $config = plugin::get_config($argv[0], $argv[1])) {
             $namespace = array_shift($argv);
             $name = array_shift($argv);

Braces +6 added lines, -3 removed lines

@@ -69,7 +69,8 @@ 
 
             try {
                 $result = $router->match($url);
-            } catch (ResourceNotFoundException $e) {
+            }
+            catch (ResourceNotFoundException $e) {
                 throw new midcom_error_notfound('This URL method is unknown.');
             }
             $this->request->attributes->add($result);
@@ -151,11 +152,13 @@ 
 
         try {
             $result = $router->match($url);
-        } catch (ResourceNotFoundException $e) {
+        }
+        catch (ResourceNotFoundException $e) {
             // No match
             debug_add("Component {$viewer->_component} in {$viewer->_topic->name} declared unable to handle request.", MIDCOM_LOG_INFO);
             throw new midcom_error_notfound("This page is not available on this server.");
-        } catch (MethodNotAllowedException $e) {
+        }
+        catch (MethodNotAllowedException $e) {
             debug_add("Component {$viewer->_component} in {$viewer->_topic->name} declared unable to handle request (method not allowed).", MIDCOM_LOG_INFO);
             throw new midcom_error_forbidden($e->getMessage(), Response::HTTP_METHOD_NOT_ALLOWED);
         }

src/midcom/console/command/exec.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
             require $basedir . $file;
         }
 
-        midcom::get()->auth->drop_sudo();#
+        midcom::get()->auth->drop_sudo(); #
         return 0;
     }
 

Braces +2 added lines, -1 removed lines

@@ -80,7 +80,8 @@
 
         try {
             require $basedir . $file;
-        } catch (\midcom_error_forbidden $e) {
+        }
+        catch (\midcom_error_forbidden $e) {
             $dialog = $this->getHelperSet()->get('question');
             $this->login($dialog, $input, $output);
             require $basedir . $file;

lib/midcom/db/topic.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     public function _on_loaded()
     {
         // if we are missing the component, use the nullcomponent.
-        if (   !$this->component
+        if (!$this->component
             || !midcom::get()->componentloader->is_installed($this->component)) {
             debug_add("Topic {$this->id} has no component assigned to it, using 'midcom.core.nullcomponent'.",
             MIDCOM_LOG_INFO);

src/midcom/events/watcher.php

Braces +2 added lines, -1 removed lines

@@ -72,7 +72,8 @@
             $component = key($watch);
             try {
                 $interface = $this->loader->get_interface_class($component);
-            } catch (\midcom_error $e) {
+            }
+            catch (\midcom_error $e) {
                 debug_add("Failed to load the component {$component}: " . $e->getMessage(), MIDCOM_LOG_INFO);
                 continue;
             }

lib/midcom/services/i18n/main.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
         $rawdata = base64_decode($request->cookies->get('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 false;

Braces +4 added lines, -2 removed lines

@@ -155,7 +155,8 @@ 
     {
         try {
             Locales::getName($lang);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("Language {$lang} not found:" . $e->getMessage(), MIDCOM_LOG_ERROR);
             return false;
         }
@@ -236,7 +237,8 @@ 
     {
         try {
             return $this->get_l10n($component)->get($stringid);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log(MIDCOM_LOG_WARN);
             return $stringid;
         }

lib/org/openpsa/directmarketing/handler/campaign/rules.php

Braces +2 added lines, -1 removed lines

@@ -99,7 +99,8 @@
         if ($request->request->has('midcom_helper_datamanager2_save')) {
             try {
                 $rules = $this->_load_rules($request);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 midcom::get()->uimessages->add('org.openpsa.directmarketing', $this->_l10n->get($e->getMessage()), 'error');
                 return;
             }

lib/midcom/helper/reflector/nameresolver.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
         if ($name_property === null) {
             $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 null;
@@ -132,7 +132,7 @@ 
 
             $qb->add_constraint($child_name_property, '=', $name);
             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;
             }
         }
@@ -209,7 +209,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;