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

src/midcom/datamanager/template/form.php

Spacing +8 added lines, -8 removed lines

@@ -84,7 +84,7 @@ 
     public function form_end(FormView $view, array $data)
     {
         $string = '';
-        if (   !isset($data['render_rest'])
+        if (!isset($data['render_rest'])
             || $data['render_rest']) {
             $string .= $this->renderer->rest($view);
         }
@@ -223,7 +223,7 @@ 
             $data['attr']['class'] = 'shorttext';
         }
 
-        if (   !empty($data['value'])
+        if (!empty($data['value'])
             || is_numeric($data['value'])) {
             $data['attr']['value'] = $data['value'];
         }
@@ -265,7 +265,7 @@ 
     {
         if ($view->vars['readonly']) {
             $string = $this->get_view_renderer()->autocomplete_widget($view, $data);
-            return $string .  $this->renderer->widget($view['selection']);
+            return $string . $this->renderer->widget($view['selection']);
         }
 
         autocomplete::add_head_elements($data['handler_options']['creation_mode_enabled'], $data['handler_options']['sortable']);
@@ -275,7 +275,7 @@ 
         $jsinit .= "midcom_helper_datamanager2_autocomplete.create_dm2_widget('{$element_id}_search_input', {$data['min_chars']});\n";
 
         $string = '<fieldset ' . $this->renderer->block($view, 'widget_container_attributes') . '>';
-        $string .=  $this->renderer->widget($view['selection']);
+        $string .= $this->renderer->widget($view['selection']);
         $string .= ' ' . $this->renderer->widget($view['search_input']);
         $string .= '</fieldset>';
         return $string . $this->jsinit($jsinit);
@@ -324,7 +324,7 @@ 
         }
 
         $string = '<select ';
-        if (   $data['required']
+        if ($data['required']
             && null === $data['placeholder']
             && $data['placeholder_in_choices'] === false
             && $data['multiple'] === false) {
@@ -338,7 +338,7 @@ 
         $string .= $this->renderer->block($view, 'widget_attributes', $data) . '>';
         if (null !== $data['placeholder']) {
             $string .= '<option value=""';
-            if (   $data['required']
+            if ($data['required']
                 && empty($data['value'])
                 && "0" !== $data['value']) {
                 $string .= ' selected="selected"';
@@ -499,7 +499,7 @@ 
             $string .= '<label class="midcom_datamanager_photo_label">' . $this->renderer->humanize('delete photo') . ' ' . $this->renderer->widget($data['form']['delete']) . '</label>';
             $string .= '<ul>';
             foreach ($objects as $identifier => $info) {
-                if (   $info['size_x']
+                if ($info['size_x']
                     && $info['size_y']) {
                     $size = "{$info['size_x']}&times;{$info['size_y']}";
                 } else {
@@ -524,7 +524,7 @@ 
         $string .= '</td></tr></table></div>';
         $string .= $this->renderer->row($data['form']['identifier']);
 
-        return $string . $this->jsinit('init_image_widget("' . $view->vars['id'] .'");');
+        return $string . $this->jsinit('init_image_widget("' . $view->vars['id'] . '");');
     }
 
     public function subform_widget(FormView $view, array $data)

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

@@ -74,7 +74,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);
@@ -158,7 +159,8 @@ 
 
         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.");

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;

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;
             }