flack / openpsa

src/midcom/datamanager/storage/parameter.php

Indentation +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
      * Converts the selected options according to the multiple_storagemode setting.
      *
      * @return mixed The data converted to the final data storage.
-    */
+     */
     function convert_multiple_to_storage()
     {
         switch ($this->config['type_config']['multiple_storagemode']) {

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
     {
         //workaround for weird mgd API behavior where setting falsy (i.e. deleting) a nonexistent parameter
         //returns an error
-        if (   !$this->value
+        if (!$this->value
             && $this->load() === null) {
             return true;
         }
@@ -63,7 +63,7 @@ 
         switch ($this->config['type_config']['multiple_storagemode']) {
             case 'serialized':
             case 'array':
-                if (   !is_array($source)
+                if (!is_array($source)
                     && empty($source)) {
                     $source = array();
                 }

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

src/midcom/datamanager/schema.php

Spacing +7 added lines, -7 removed lines

@@ -144,15 +144,15 @@ 
             'validation' => array()
         ));
 
-        $normalize_widget = function (Options $options, $value) {
-            if (   $value == 'images'
+        $normalize_widget = function(Options $options, $value) {
+            if ($value == 'images'
                 || $value == 'downloads') {
                 return 'subform';
             }
             return $value;
         };
 
-        $normalize_storage = function (Options $options, $value) use ($name) {
+        $normalize_storage = function(Options $options, $value) use ($name) {
             $default = array(
                 'location' => 'parameter',
                 'domain' => 'midcom.helper.datamanager2',
@@ -163,7 +163,7 @@ 
             }
             if ($value === null) {
 
-                if($options['type'] === 'privilege')
+                if ($options['type'] === 'privilege')
                 {
                     return array(
                         'location' => 'privilege',
@@ -193,9 +193,9 @@ 
             return $value;
         };
 
-        $normalize_validation = function (Options $options, $config) {
+        $normalize_validation = function(Options $options, $config) {
             $validation = array();
-            if (array_key_exists('validation',(array) $config)) {
+            if (array_key_exists('validation', (array) $config)) {
                 $validation = (array) $config['validation'];
             }
 
@@ -204,7 +204,7 @@ 
                     $rule = array('type' => $rule);
                 } elseif (!array_key_exists('type', $rule)) {
                     throw new midcom_error("Missing validation rule type for rule {$key} on field {$config['name']}, this is a required option.");
-                } elseif (   $rule['type'] == 'compare'
+                } elseif ($rule['type'] == 'compare'
                           && !array_key_exists('compare_with', $rule)) {
                     throw new midcom_error("Missing compare_with option for compare type rule {$key} on field {$config['name']}, this is a required option.");
                 }

Braces +1 added lines, -2 removed lines

@@ -163,8 +163,7 @@
             }
             if ($value === null) {
 
-                if($options['type'] === 'privilege')
-                {
+                if($options['type'] === 'privilege') {
                     return array(
                         'location' => 'privilege',
                         'name' => $name

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

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setNormalizer('widget_config', function (Options $options, $value) {
+        $resolver->setNormalizer('widget_config', function(Options $options, $value) {
             $widget_defaults = array(
                 'creation_mode_enabled' => false,
                 'class' => null,
@@ -61,7 +61,7 @@ 
 
             return helper::resolve_options($widget_defaults, $value);
         });
-        $resolver->setNormalizer('type_config', function (Options $options, $value) {
+        $resolver->setNormalizer('type_config', function(Options $options, $value) {
             $type_defaults = array(
                 'options' => array(),
                 'allow_other' => false,

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

Spacing +8 added lines, -8 removed lines

@@ -45,7 +45,7 @@ 
     public function configureOptions(OptionsResolver $resolver)
     {
         $this->res = $resolver;
-        $map_privilege = function (Options $options) {
+        $map_privilege = function(Options $options) {
             $return_options = $this->defaultChoices;
             return $return_options;
         };
@@ -66,21 +66,21 @@ 
         $view->vars['type_conf'] = $options['type_config'];
     }
 
-    public function get_effective_value(array $options,$object = null)
+    public function get_effective_value(array $options, $object = null)
     {
         if (!$object)
         {
             $defaults = midcom::get()->auth->acl->get_default_privileges();
             return(($defaults[$options['privilege_name']] === MIDCOM_PRIVILEGE_ALLOW));
         }
-        if ($options['assignee']== 'SELF') {
+        if ($options['assignee'] == 'SELF') {
             if ($object instanceof midcom_db_group) {
                 //There's no sane way to query group privileges in auth right now, so we only return defaults
                 $defaults = midcom::get()->auth->acl->get_default_privileges();
                 return(($defaults[$options['privilege_name']] === MIDCOM_PRIVILEGE_ALLOW));
             }
             return(midcom::get()->auth->can_user_do($options['privilege_name'],
-                    new midcom_core_user($object->__object->id),$options['classname']));
+                    new midcom_core_user($object->__object->id), $options['classname']));
         }
         if ($principal = midcom::get()->auth->get_assignee($options['assignee'])) {
             return $object->can_do($options['privilege_name'], $principal);
@@ -88,21 +88,21 @@ 
         return $object->can_do($options['privilege_name'], $options['assignee']);
     }
 
-    public function render_choices(array $options,$object = null)
+    public function render_choices(array $options, $object = null)
     {
             $l10n = midcom::get()->i18n->get_l10n('midcom.datamanager');
-            $inherit = $this->get_effective_value($options,$object);
+            $inherit = $this->get_effective_value($options, $object);
             $allow = 'widget privilege: allow';
             $deny = 'widget privilege: deny';
 
             if ($inherit === true) {
                 $base = $l10n->get('widget privilege: inherit %s');
                 $allow = $l10n->get($allow);
-                $d = sprintf($base,$allow);
+                $d = sprintf($base, $allow);
             } elseif ($inherit === false) {
                 $base = $l10n->get('widget privilege: inherit %s');
                 $deny = $l10n->get($deny);
-                $d = sprintf($base,$deny);
+                $d = sprintf($base, $deny);
             }
             return $d;
     }

Braces +2 added lines, -4 removed lines

@@ -68,8 +68,7 @@ 
 
     public function get_effective_value(array $options,$object = null)
     {
-        if (!$object)
-        {
+        if (!$object) {
             $defaults = midcom::get()->auth->acl->get_default_privileges();
             return(($defaults[$options['privilege_name']] === MIDCOM_PRIVILEGE_ALLOW));
         }
@@ -112,8 +111,7 @@ 
         $object_found = false;
         $help_obj = $object;
 
-        while (!$object_found)
-        {
+        while (!$object_found) {
             if ($help_obj instanceof dbacontainer) {
                 $object_found = true;
                 return $help_obj->get_value();

src/midcom/datamanager/storage/privilege.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
                     $this->config['type_config']['privilege_name'],
                     $this->config['type_config']['assignee'],
                     $this->config['type_config']['classname']
-                  );
+                    );
 
         return $source->__get('value');
     }

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     {
         //workaround for weird mgd API behavior where setting falsy (i.e. deleting) a nonexistent parameter
         //returns an error
-        if (  !$this->value
+        if (!$this->value
             && $this->load() === null) {
             return true;
         }

src/midcom/datamanager/template/form.php

Spacing +13 added lines, -13 removed lines

@@ -36,7 +36,7 @@ 
     {
         $string = '';
         foreach ($view as $child) {
-            if (    array_key_exists('start_fieldset', $child->vars)
+            if (array_key_exists('start_fieldset', $child->vars)
                 && $child->vars['start_fieldset'] !== null) {
                 $string .= '<fieldset class="fieldset">';
                 if (!empty($child->vars['start_fieldset']['title'])) {
@@ -44,7 +44,7 @@ 
                 }
             }
             $string .= $this->renderer->row($child);
-            if (    array_key_exists('end_fieldset', $child->vars)
+            if (array_key_exists('end_fieldset', $child->vars)
                 && $child->vars['end_fieldset'] !== null) {
                 $end_fieldsets = max(1, (int) $child->vars['end_fieldset']);
                 for ($i = 0; $i < $end_fieldsets; $i++) {
@@ -58,7 +58,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);
         }
@@ -143,7 +143,7 @@ 
     public function form_widget_simple(FormView $view, array $data)
     {
         $type = isset($data['type']) ? $data['type'] : 'text';
-        if (   $type == 'text'
+        if ($type == 'text'
             || $type == 'password'
             || $type == 'email') {
             $view->vars['attr']['class'] = 'shorttext';
@@ -151,7 +151,7 @@ 
 
         $string = '<input type="' . $type . '"';
         $string .= $this->renderer->block($view, 'widget_attributes');
-        if (   !empty($data['value'])
+        if (!empty($data['value'])
             || is_numeric($data['value'])) {
             $string .= ' value="' . $this->escape($data['value']) . '"';
         }
@@ -184,7 +184,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);
@@ -219,7 +219,7 @@ 
     public function choice_widget_collapsed(FormView $view, array $data)
     {
         $string = '<select';
-        if (   $data['required']
+        if ($data['required']
             && null === $data['empty_value']
             && $data['empty_value_in_choices'] === false
             && $data['multiple'] === false) {
@@ -233,7 +233,7 @@ 
         $string .= '>';
         if (null !== $data['empty_value']) {
             $string .= '<option value=""';
-            if (   $data['required']
+            if ($data['required']
                 && empty($data['value'])
                 && "0" !== $data['value']) {
                 $string .= ' selected="selected"';
@@ -255,7 +255,7 @@ 
         if (!empty($data['form']->vars['privilege'])) {
             $obj = $data['form'];
             $obj = $data['form']->vars['privilege']->search_for_object($obj);
-            $new_label = $data['form']->vars['privilege']->render_choices($data['form']->vars['type_conf'],$obj);
+            $new_label = $data['form']->vars['privilege']->render_choices($data['form']->vars['type_conf'], $obj);
             $view->children[2]->vars['label'] = $new_label;
         }
         return $this->choice_widget_expanded($view, $data);
@@ -309,7 +309,7 @@ 
         $string .= $this->renderer->widget($view['date']);
 
         if (isset($view['time'])) {
-            $string .= ' '. $this->renderer->widget($view['time']);
+            $string .= ' ' . $this->renderer->widget($view['time']);
         }
         $string .= $data['jsinit'];
         return $string . '</fieldset>';
@@ -323,7 +323,7 @@ 
         if (!empty($data['value'])) {
             $string .= '<a href="' . $view->vars['value']['url'] . '" target="_new"><img src="' . $view->vars['value']['url'] . '" class="preview-image">';
 
-            if (   $data['value']['size_x']
+            if ($data['value']['size_x']
                 && $data['value']['size_y']) {
                 $size = "{$data['value']['size_x']}&times;{$data['value']['size_y']}";
             } else {
@@ -362,7 +362,7 @@ 
         if (!empty($values)) {
             $string .= '<ul>';
             foreach ($values as $identifier => $info) {
-                if (   $info['size_x']
+                if ($info['size_x']
                     && $info['size_y']) {
                     $size = "{$info['size_x']}x{$info['size_y']}";
                 } else {
@@ -380,7 +380,7 @@ 
         $string .= '<label class="midcom_datamanager_photo_lable">' . $this->renderer->humanize('delete photo') . ' ' . $this->renderer->widget($data['form']['delete']) . '</label>';
         $string .= '</td></tr></table></div>';
 
-        return $string . $this->jsinit('init_photo_widget("' . $view->vars['id'] .'");');
+        return $string . $this->jsinit('init_photo_widget("' . $view->vars['id'] . '");');
     }
 
     public function subform_widget(FormView $view, array $data)