flack / openpsa

lib/midcom/helper/datamanager2/widget/privilege.php

Spacing +6 added lines, -6 removed lines

@@ -41,12 +41,12 @@ 
      */
     public function add_elements_to_form($attributes)
     {
-        if (   $this->_type->storage->object
+        if ($this->_type->storage->object
             && !$this->_type->storage->object->can_do('midgard:privileges')) {
             return;
         }
         $effective_value = $this->_type->get_effective_value();
-        if (   $this->_type->get_value() === MIDCOM_PRIVILEGE_INHERIT
+        if ($this->_type->get_value() === MIDCOM_PRIVILEGE_INHERIT
             || ($this->_type->get_value() !== MIDCOM_PRIVILEGE_DENY) !== $effective_value) {
             $effective_value = $effective_value ? 'allow' : 'deny';
             $inherit_label = sprintf($this->_l10n->get('widget privilege: inherit %s'), $this->_l10n->get('widget privilege: ' . $effective_value));
@@ -102,7 +102,7 @@ 
      */
     public function sync_type_with_widget($results)
     {
-        if (   $this->_type->storage->object
+        if ($this->_type->storage->object
             && !$this->_type->storage->object->can_do('midgard:privileges')) {
             return;
         }
@@ -112,7 +112,7 @@ 
 
     public function is_frozen()
     {
-        if (    (   $this->_type->storage->object
+        if (($this->_type->storage->object
                  && !$this->_type->storage->object->can_do('midgard:privileges'))
              || !$this->_elements) {
             return false;
@@ -122,7 +122,7 @@ 
 
     public function freeze()
     {
-        if (    (   $this->_type->storage->object
+        if (($this->_type->storage->object
                  && !$this->_type->storage->object->can_do('midgard:privileges'))
              || !$this->_elements) {
             return;
@@ -135,7 +135,7 @@ 
 
     public function unfreeze()
     {
-        if (    (   $this->_type->storage->object
+        if (($this->_type->storage->object
                  && !$this->_type->storage->object->can_do('midgard:privileges'))
              || !$this->_elements) {
             return;

lib/midcom/helper/datamanager2/schema.php

Spacing +7 added lines, -7 removed lines

@@ -184,7 +184,7 @@ 
 
             if ($path === $schemadb) {
                 // Infinite loop, set an UI message and stop executing
-                if (   !isset($schema['extends']['name'])
+                if (!isset($schema['extends']['name'])
                     || $schema['extends']['name'] === $schema_name) {
                     $snippet_path = $this->_get_snippet_link($path);
                     midcom::get()->uimessages->add($this->_l10n->get('midcom.helper.datamanager2'), sprintf($this->_l10n->get('schema %s:%s extends itself'), $snippet_path, $schema_name), 'error');
@@ -282,7 +282,7 @@ 
             return $schemadb;
         }
         debug_print_r('Passed schema db was:', $schemadb);
-        throw new midcom_error( 'Failed to access the schema database: Invalid variable type while constructing.');
+        throw new midcom_error('Failed to access the schema database: Invalid variable type while constructing.');
     }
 
     /**
@@ -300,7 +300,7 @@ 
         if (!array_key_exists($name, $this->_raw_schemadb)) {
             throw new midcom_error("The schema {$name} was not found in the schema database.");
         }
-        $this->_raw_schema =& $this->_raw_schemadb[$name];
+        $this->_raw_schema = & $this->_raw_schemadb[$name];
 
         // Populate the l10n_schema member
         if (array_key_exists('l10n_db', $this->_raw_schema)) {
@@ -334,7 +334,7 @@ 
             $this->append_field($name, $data);
         }
 
-        if (   $this->_config->get('include_metadata_required')
+        if ($this->_config->get('include_metadata_required')
             && $this->_schemadb_path
             && $this->_schemadb_path != midcom::get()->config->get('metadata_schema')) {
             // Include required fields from metadata schema to the schema
@@ -446,11 +446,11 @@ 
             }
         }
 
-        if (   !array_key_exists('type_config', $config)
+        if (!array_key_exists('type_config', $config)
             || !is_array($config['type_config'])) {
             $config['type_config'] = array();
         }
-        if (   !array_key_exists('widget_config', $config)
+        if (!array_key_exists('widget_config', $config)
             || !is_array($config['type_config'])) {
             $config['widget_config'] = array();
         }
@@ -470,7 +470,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.");
             }

lib/midcom/helper/datamanager2/datamanager.php

Spacing +8 added lines, -8 removed lines

@@ -93,7 +93,7 @@ 
     public function __construct(array &$schemadb)
     {
         parent::__construct();
-        $this->_schemadb =& $schemadb;
+        $this->_schemadb = & $schemadb;
     }
 
     /**
@@ -119,7 +119,7 @@ 
             return false;
         }
 
-        $this->schema =& $this->_schemadb[$name];
+        $this->schema = & $this->_schemadb[$name];
         $this->schema_name = $name;
 
         return $this->_load_types();
@@ -239,7 +239,7 @@ 
         }
 
         if (!$this->set_schema($schema)) {
-            if (   $strict
+            if ($strict
                 || $schema == null) {
                 return false;
             }
@@ -462,7 +462,7 @@ 
         echo "<div class=\"midcom_helper_datamanager2_view\">\n";
         $fieldset_count = 0;
         foreach ($this->schema->field_order as $name) {
-            $config =& $this->schema->fields[$name];
+            $config = & $this->schema->fields[$name];
             if (!empty($config['hidden'])) {
                 continue;
             }
@@ -490,17 +490,17 @@ 
                     }
 
                     echo "    <h2{$class}>\n";
-                    echo "        ". $this->schema->translate_schema_string($fieldset['title']) ."\n";
+                    echo "        " . $this->schema->translate_schema_string($fieldset['title']) . "\n";
                     echo "    </h2>\n";
                 }
                 if (isset($fieldset['description'])) {
-                    echo "<p>". $this->schema->translate_schema_string($fieldset['description']) . "</p>\n";
+                    echo "<p>" . $this->schema->translate_schema_string($fieldset['description']) . "</p>\n";
                 }
                 $fieldset_count++;
             }
 
             $field_value = $values[$name];
-            if (   !$skip_empty
+            if (!$skip_empty
                 || trim($field_value) !== '') {
                 echo "<div class=\"field\">\n";
                 echo '<div class="title">' . $this->schema->translate_schema_string($this->schema->fields[$name]['title']) . "</div>\n";
@@ -512,7 +512,7 @@ 
                 echo "</div>\n";
             }
 
-            if (   !isset($config['end_fieldset'])
+            if (!isset($config['end_fieldset'])
                 || $fieldset_count <= 0) {
                 // No more fieldsets to close
                 continue;

lib/midcom/helper/datamanager2/formmanager.php

Spacing +15 added lines, -15 removed lines

@@ -125,7 +125,7 @@ 
         parent::__construct();
 
         $this->_schema = $schema;
-        $this->_types =& $types;
+        $this->_types = & $types;
         $this->state = $state;
     }
 
@@ -260,7 +260,7 @@ 
     private function _load_field_default($name, $config)
     {
         $field_default = $this->widgets[$name]->get_default();
-        if (   null === $field_default
+        if (null === $field_default
             && !empty($config['default'])) {
             // Empty value from widget, run defaults
             $field_default = $config['default'];
@@ -296,7 +296,7 @@ 
                 $accesskey = '';
                 if ($operation == 'save') {
                     $accesskey = 's';
-                    $class .= ' save_'.$key;
+                    $class .= ' save_' . $key;
                 } elseif ($operation == 'cancel') {
                     $accesskey = 'c';
                 }
@@ -394,12 +394,12 @@ 
                 }
 
                 $html .= "    <legend{$class}>\n";
-                $html .= "        ". $this->_translate($fieldset['title']) ."\n";
+                $html .= "        " . $this->_translate($fieldset['title']) . "\n";
                 $html .= "    </legend>\n";
             }
 
             if (isset($fieldset['description'])) {
-                $html .= "<p>". $this->_translate($fieldset['description']) . "</p>\n";
+                $html .= "<p>" . $this->_translate($fieldset['description']) . "</p>\n";
             }
 
             $set = $this->form->createElement('static', "__fieldset_start_{$name}_{$key}", "");
@@ -418,7 +418,7 @@ 
      */
     private function _end_fieldset($name, $config)
     {
-        if (   !isset($config['end_fieldset'])
+        if (!isset($config['end_fieldset'])
             || $this->_fieldsets <= 0) {
             return;
         }
@@ -494,11 +494,11 @@ 
         }
 
         if ($config['read_privilege'] !== null) {
-            if (   array_key_exists('group', $config['read_privilege'])
+            if (array_key_exists('group', $config['read_privilege'])
                 && !midcom::get()->auth->is_group_member($config['read_privilege']['group'])) {
                 return false;
             }
-            if (   array_key_exists('privilege', $config['read_privilege'])
+            if (array_key_exists('privilege', $config['read_privilege'])
                 && !$this->_types[$name]->can_do($config['read_privilege']['privilege'])) {
                 return false;
             }
@@ -543,11 +543,11 @@ 
             $widget->freeze();
         }
         if ($config['write_privilege'] !== null) {
-            if (   array_key_exists('group', $config['write_privilege'])
+            if (array_key_exists('group', $config['write_privilege'])
                 && !midcom::get()->auth->is_group_member($config['write_privilege']['group'])) {
                 $widget->freeze();
             }
-            if (   array_key_exists('privilege', $config['write_privilege'])
+            if (array_key_exists('privilege', $config['write_privilege'])
                 && !$this->_types[$name]->can_do($config['write_privilege']['privilege'])) {
                 $widget->freeze();
             }
@@ -601,7 +601,7 @@ 
      */
     function display_form()
     {
-        if (   !$this->renderer
+        if (!$this->renderer
             ||  (is_string($this->renderer) && $this->renderer == 'none')) {
             echo $this->form->toHtml();
         } else {
@@ -642,7 +642,7 @@ 
         $this->form->getSubmitValues(true);
         $exitcode = self::get_clicked_button();
 
-        if (   $exitcode == 'save'
+        if ($exitcode == 'save'
             || $exitcode == 'next') {
             // Validate the form.
             if (!$this->form->validate()) {
@@ -661,7 +661,7 @@ 
      */
     function get_submit_values()
     {
-        return $this->form->getSubmitValues( true );
+        return $this->form->getSubmitValues(true);
     }
 
     /**
@@ -703,14 +703,14 @@ 
 
         // Check if we were really submitted, if yes, trigger the on_submit event
         // on the widgets as well:
-        if (   $exitcode != 'cancel'
+        if ($exitcode != 'cancel'
             && $exitcode != 'previous') {
             foreach ($this->widgets as $name => $copy) {
                 $this->widgets[$name]->on_submit($results);
             }
         }
 
-        if (   $exitcode == 'save'
+        if ($exitcode == 'save'
             || $exitcode == 'next'
             || $exitcode == 'preview') {
             // Iterate over the widgets and tell them to re-synchronize with their

lib/midcom/helper/datamanager2/renderer/default.php

Spacing +2 added lines, -2 removed lines

@@ -198,7 +198,7 @@ 
     public function finishForm(&$form)
     {
         // add a required note if needed
-        if (   !empty($form->_required)
+        if (!empty($form->_required)
             && !$form->_freezeAll) {
             $this->_html .= str_replace('{requiredNote}', $form->getRequiredNote(), $this->_required_note_template);
         }
@@ -346,7 +346,7 @@ 
     public function renderHeader(&$header)
     {
         $name = $header->getName();
-        if (   !empty($name)
+        if (!empty($name)
             && isset($this->_templates[$name])) {
             $this->_html .= str_replace('{header}', $header->toHtml(), $this->_templates[$name]);
         } else {

lib/midcom/helper/datamanager2/type/text.php

Braces +2 added lines, -1 removed lines

@@ -205,7 +205,8 @@
         // FIXME figure out why this always tries to put something to the default cache dir (it does put stuff to the defined one as well)
         try {
             $ret = $purifier->purify($content);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             debug_add("HTML Purifier failed to purify contents of field {$this->name}: " . $e->getMessage(), MIDCOM_LOG_WARN);
         }
 

Spacing +9 added lines, -9 removed lines

@@ -146,7 +146,7 @@ 
             $this->purify_markdown_on_output = $this->_config->get('html_purify_markdown');
         }
 
-        if (   !empty($this->forbidden_patterns)
+        if (!empty($this->forbidden_patterns)
             && !empty($this->allowed_patterns)) {
             debug_add('Both allowed and forbidden patterns are set, allowed has precedence', MIDCOM_LOG_ERROR);
             $this->forbidden_patterns = null;
@@ -160,7 +160,7 @@ 
 
     function purify_string($content)
     {
-        if (   isset($this->purify_config['Cache']['SerializerPath'])
+        if (isset($this->purify_config['Cache']['SerializerPath'])
             && !file_exists($this->purify_config['Cache']['SerializerPath'])) {
             mkdir($this->purify_config['Cache']['SerializerPath']);
         }
@@ -184,16 +184,16 @@ 
 
         // Load custom element/attribute definitions
         $config_defs = $this->_config->get('html_purify_HTMLDefinition');
-        if (   is_array($config_defs)
+        if (is_array($config_defs)
             && !empty($config_defs)
             && $def = $purifier_config_object->maybeGetRawHTMLDefinition(true)) {
-            if (   !empty($config_defs['addAttribute'])
+            if (!empty($config_defs['addAttribute'])
                 && is_array($config_defs['addAttribute'])) {
                 foreach (array_filter($config_defs['addAttribute'], 'is_array') as $attrdef) {
                     call_user_func_array(array($def, 'addAttribute'), $attrdef);
                 }
             }
-            if (   !empty($config_defs['addElement'])
+            if (!empty($config_defs['addElement'])
                 && is_array($config_defs['addElement'])) {
                 foreach (array_filter($config_defs['addElement'], 'is_array') as $elemdef) {
                     call_user_func_array(array($def, 'addElement'), $elemdef);
@@ -247,7 +247,7 @@ 
      */
     public function _on_validate()
     {
-        if (   is_array($this->value)
+        if (is_array($this->value)
             || is_object($this->value)) {
             $this->validation_error = $this->_l10n->get('type text: value may not be array or object');
             return false;
@@ -259,7 +259,7 @@ 
             $this->purify_content();
         }
 
-        if (   $this->maxlength > 0
+        if ($this->maxlength > 0
             && strlen($this->value) > $this->maxlength) {
             $this->validation_error = sprintf($this->_l10n->get('type text: value is longer than %d characters'),
                 $this->maxlength);
@@ -283,7 +283,7 @@ 
 
     public function validate_allowed_patterns($fields)
     {
-        if (   !empty($this->allowed_patterns)
+        if (!empty($this->allowed_patterns)
             && is_array($this->allowed_patterns)) {
             foreach ($this->allowed_patterns as $condition) {
                 if (!isset($condition['explanation'])) {
@@ -365,7 +365,7 @@ 
                 return midcom_helper_formatter::format($this->value, 'F');
 
             case 'markdown':
-                if (   !$this->purify
+                if (!$this->purify
                     || !$this->purify_markdown_on_output) {
                     // Return the Markdown straight away
                     return MarkdownExtra::defaultTransform($this->value);

lib/midcom/helper/datamanager2/type/select.php

Spacing +11 added lines, -11 removed lines

@@ -186,11 +186,11 @@ 
      */
     public function _on_initialize()
     {
-        if (   !is_array($this->options)
+        if (!is_array($this->options)
             && $this->option_callback === null) {
             throw new midcom_error("Either 'options' or 'option_callback' must be defined for the field {$this->name}");
         }
-        if (   !empty($this->options)
+        if (!empty($this->options)
             && $this->option_callback !== null) {
             throw new midcom_error("Both 'options' and 'option_callback' was defined for the field {$this->name}");
         }
@@ -231,13 +231,13 @@ 
     private function _get_name_from_object($key)
     {
         $widget_config = $this->storage->_schema->fields[$this->name]['widget_config'];
-        if (   empty($widget_config['class'])
+        if (empty($widget_config['class'])
             || empty($widget_config['titlefield'])
             || !$key) {
             return null;
         }
 
-        if (   !empty($widget_config['component'])
+        if (!empty($widget_config['component'])
             && !midcom::get()->componentloader->is_loaded($widget_config['component'])) {
             // Ensure the corresponding component is loaded
             midcom::get()->componentloader->load($widget_config['component']);
@@ -275,7 +275,7 @@ 
             return array_key_exists($key, $this->options);
         }
 
-        if (   isset($this->_callback)
+        if (isset($this->_callback)
             && method_exists($this->_callback, 'key_exists')) {
             return $this->_callback->key_exists($key);
         }
@@ -305,7 +305,7 @@ 
         $this->selection = array();
         $this->others = array();
 
-        if (   $source === false
+        if ($source === false
             || $source === null) {
             // We are fine at this point.
             return;
@@ -361,7 +361,7 @@ 
         if ($this->allow_multiple) {
             return $this->_convert_multiple_to_storage();
         }
-        if (   $this->allow_other
+        if ($this->allow_other
             && !empty($this->others)) {
             return $this->others[0];
         }
@@ -384,7 +384,7 @@ 
         switch ($this->multiple_storagemode) {
             case 'serialized':
             case 'array':
-                if (   !is_array($source)
+                if (!is_array($source)
                     && empty($source)) {
                     $source = array();
                 }
@@ -507,20 +507,20 @@ 
      */
     public function _on_validate()
     {
-        if (   !$this->allow_other
+        if (!$this->allow_other
             && $this->others) {
             $this->validation_error = $this->_l10n->get('type select: other selection not allowed');
             return false;
         }
 
-        if (   !$this->allow_multiple
+        if (!$this->allow_multiple
             && count($this->selection) > 1) {
             $this->validation_error = $this->_l10n->get('type select: multiselect not allowed');
             return false;
         }
 
         $field = $this->_datamanager->schema->fields[$this->name];
-        if (   $field['required']
+        if ($field['required']
             && count($this->selection) == 0) {
             $this->validation_error = sprintf($this->_l10n->get('field %s is required'), $field['title']);
             return false;

lib/midcom/helper/datamanager2/type/mnrelation.php

Spacing +4 added lines, -4 removed lines

@@ -215,7 +215,7 @@ 
      */
     public function _on_initialize()
     {
-        if (   !$this->mapping_class_name
+        if (!$this->mapping_class_name
             || !$this->master_fieldname
             || !$this->member_fieldname) {
             throw new midcom_error(
@@ -255,7 +255,7 @@ 
         $qb = midcom::get()->dbfactory->new_query_builder($this->mapping_class_name);
         $qb->add_constraint($this->master_fieldname, '=', $this->_get_master_foreign_key());
 
-        if (   $this->sortable
+        if ($this->sortable
             && preg_match('/^(ASC|DESC)/i', $this->sortable_sort_order, $regs)) {
             $order = strtoupper($regs[1]);
             $qb->add_order('metadata.score', $order);
@@ -302,7 +302,7 @@ 
 
         foreach ($this->_membership_objects as $member) {
             $key = $member->{$this->member_fieldname};
-            if (   !$this->require_corresponding_option
+            if (!$this->require_corresponding_option
                 || $this->key_exists($key)) {
                 $this->selection[] = $key;
             } else {
@@ -357,7 +357,7 @@ 
     {
         $new_membership_objects = array();
         // Cache the total quantity of items and get the order if the field is supposed to store the member order
-        if (   $this->sortable
+        if ($this->sortable
             && isset($this->sorted_order)) {
             $count = count($this->sorted_order);
 

lib/midcom/helper/datamanager2/type/image.php

Spacing +8 added lines, -8 removed lines

@@ -235,7 +235,7 @@ 
      */
     function recreate_main_image()
     {
-        if (   !$this->_prepare_recreate()
+        if (!$this->_prepare_recreate()
             || !$this->_auto_convert_to_web_type()
             || !$this->_save_image('main', $this->filter_chain)) {
             return false;
@@ -268,14 +268,14 @@ 
      */
     protected function _prepare_recreate($force = false)
     {
-        if (   (   !empty($this->auto_thumbnail)
+        if ((!empty($this->auto_thumbnail)
                 || !empty($this->filter_chain)
                 || !empty($this->derived_images))
             && !$this->imagemagick_available()) {
-            throw new midcom_error( 'DM2 type image requires ImageMagick for manipulation operations, see debug log for details');
+            throw new midcom_error('DM2 type image requires ImageMagick for manipulation operations, see debug log for details');
         }
 
-        if (   !empty($this->_original_tmpname)
+        if (!empty($this->_original_tmpname)
             && !$force) {
             // We have prepared.
             return true;
@@ -407,11 +407,11 @@ 
      */
     protected function _set_image($filename, $tmpname, $title, $force_pending_attachments = false)
     {
-        if (   (   !empty($this->auto_thumbnail)
+        if ((!empty($this->auto_thumbnail)
                 || !empty($this->filter_chain)
                 || !empty($this->derived_images))
             && !$this->imagemagick_available()) {
-            throw new midcom_error( 'DM2 type image requires ImageMagick for manipulation operations, see debug log for details');
+            throw new midcom_error('DM2 type image requires ImageMagick for manipulation operations, see debug log for details');
         }
 
         if (empty($filename)) {
@@ -435,7 +435,7 @@ 
         $this->_original_tmpname = $tmpname;
 
         // 1st step: original image storage and auto-conversion
-        if (   !$this->_save_original()
+        if (!$this->_save_original()
             || !$this->_filter->set_file($tmpname)
             || !$this->_auto_convert_to_web_type()) {
             // TODO: Raise uimessage
@@ -452,7 +452,7 @@ 
         }
         $this->_add_thumbnail_to_derived_images();
         // Prepare all other images
-        if (   !$this->_save_image('main', $this->filter_chain)
+        if (!$this->_save_image('main', $this->filter_chain)
             || !$this->_save_derived_images()) {
             // TODO: Raise uimessage
 

Braces +6 added lines, -3 removed lines

@@ -364,7 +364,8 @@ 
         $filter = new midcom_helper_imagefilter($this->attachments[$identifier]);
         try {
             $filter->process_chain($filterchain);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             midcom::get()->uimessages->add('midcom.helper.imagefilter', $e->getMessage(), 'error');
             $e->log();
             return false;
@@ -529,7 +530,8 @@ 
             if ($filter_chain) {
                 try {
                     $this->_filter->process_chain($filter_chain);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     midcom::get()->uimessages->add('midcom.helper.imagefilter', $e->getMessage(), 'error');
                     $e->log();
                     return false;
@@ -620,7 +622,8 @@ 
 
         try {
             $this->_filter->convert($conversion);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $e->log();
             return false;
         }