flack / openpsa

lib/net/nehmer/static/handler/admin.php

Spacing +2 added lines, -2 removed lines

@@ -28,10 +28,10 @@
      */
     private function load_controller()
     {
-        if (    $this->_config->get('simple_name_handling')
+        if ($this->_config->get('simple_name_handling')
              && !midcom::get()->auth->admin) {
             foreach ($this->_request_data['schemadb']->all() as $schema) {
-                $field =& $schema->get_field('name');
+                $field = & $schema->get_field('name');
                 $field['readonly'] = true;
             }
         }

lib/net/nehmer/static/handler/create.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     private function load_controller($schemaname, array $defaults)
     {
         if ($this->_config->get('simple_name_handling')) {
-            $field =& $this->_request_data['schemadb']->get($schemaname)->get_field('name');
+            $field = & $this->_request_data['schemadb']->get($schemaname)->get_field('name');
             $field['hidden'] = true;
         }
         $dm = new datamanager($this->_request_data['schemadb']);

lib/org/openpsa/products/handler/product/latest.php

Braces +4 added lines, -2 removed lines

@@ -91,7 +91,8 @@ 
                 $data['product'] = $product;
                 try {
                     $data['datamanager_product']->set_storage($product);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                     continue;
                 }
@@ -150,7 +151,8 @@ 
                 $data['product'] = $product;
                 try {
                     $data['datamanager_product']->set_storage($product);
-                } catch (midcom_error $e) {
+                }
+                catch (midcom_error $e) {
                     $e->log();
                     continue;
                 }

lib/org/openpsa/products/handler/product/csv.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 
     public function _load_data($handler_id, array &$args, array &$data)
     {
-        if (   empty($_POST)
+        if (empty($_POST)
             && $data['session']->exists('POST_data')) {
             $_POST = $data['session']->get('POST_data');
             $data['session']->remove('POST_data');

lib/midcom/baseclasses/components/handler/dataexport.php

Spacing +7 added lines, -7 removed lines

@@ -125,7 +125,7 @@ 
         foreach ($this->_datamanagers as $type => $datamanager) {
             foreach ($datamanager->get_schema($this->schemas[$type])->get('fields') as $name => $config) {
                 $title = $config['title'];
-                if (   $this->include_totals
+                if ($this->include_totals
                     && $config['type'] == 'number') {
                     $this->_totals[$type . '-' . $name] = 0;
                 }
@@ -190,18 +190,18 @@ 
                     $output = array_pad($output, $target_size, '');
                     continue;
                 }
-                $object =& $row[$type];
+                $object = & $row[$type];
 
                 $datamanager->set_storage($object, $this->schemas[$type]);
 
-                if (   $this->include_guid
+                if ($this->include_guid
                     && $type == $first_type) {
                     $output[] = $object->guid;
                 }
 
                 $csvdata = $datamanager->get_content_csv();
                 foreach ($datamanager->get_schema()->get('fields') as $fieldname => $config) {
-                    if (   $this->include_totals
+                    if ($this->include_totals
                         && $config['type'] == 'number') {
                         $this->_totals[$type . '-' . $fieldname] += $csvdata[$fieldname];
                     }
@@ -236,7 +236,7 @@ 
         if (empty($this->csv['charset'])) {
             // Default to ISO-LATIN-15 (Latin-1 with EURO sign etc)
             $this->csv['charset'] = 'ISO-8859-15';
-            if (   isset($_SERVER['HTTP_USER_AGENT'])
+            if (isset($_SERVER['HTTP_USER_AGENT'])
                 && !preg_match('/Windows/i', $_SERVER['HTTP_USER_AGENT'])) {
                 // Except when not on windows, then default to UTF-8
                 $this->csv['charset'] = 'UTF-8';
@@ -264,8 +264,8 @@ 
         }
 
         // Strings and numbers beginning with zero are quoted
-        if (   !empty($data)
-            && (   !is_numeric($data)
+        if (!empty($data)
+            && (!is_numeric($data)
                 || preg_match('/^[0+]/', $data))) {
             // Make sure we have only newlines in data
             $data = preg_replace("/\n\r|\r\n|\r/", "\n", $data);

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

Spacing +2 added lines, -2 removed lines

@@ -35,12 +35,12 @@
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $session_key = md5($builder->getForm()->getName() . '_session_key');
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($session_key) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($session_key) {
             $value = $event->getForm()->getData();
             $session = new midcom_services_session('midcom_datamanager_captcha');
             $l10n = midcom::get()->i18n->get_l10n('midcom.datamanager');
 
-            if (   !$session->exists($session_key)
+            if (!$session->exists($session_key)
                 || $value != $session->get($session_key)) {
                 $event->getForm()->addError(new FormError($l10n->get('captcha validation failed')));
             }

src/midcom/datamanager/helper/autocomplete.php

Spacing +3 added lines, -3 removed lines

@@ -88,7 +88,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);
@@ -161,7 +161,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':
@@ -308,7 +308,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();

lib/org/openpsa/directmarketing/importer/csv.php

Spacing +2 added lines, -2 removed lines

@@ -55,11 +55,11 @@
         foreach (array_filter($csv_line) as $field => $value) {
             // Process the row accordingly
             $field_matching = $this->_settings['fields'][$field];
-            if (   $field_matching
+            if ($field_matching
                 && strstr($field_matching, ':')) {
                 list($schemadb, $schema_field) = explode(':', $field_matching);
 
-                if (   !array_key_exists($schemadb, $this->_schemadbs)
+                if (!array_key_exists($schemadb, $this->_schemadbs)
                     || !$this->_schemadbs[$schemadb]->get('default')->has_field($schema_field)) {
                     // Invalid matching, skip
                     continue;

lib/org/openpsa/directmarketing/handler/import.php

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
             'campaign_member' => schemadb::from_path($this->_config->get('schemadb_campaign_member')),
             'organization' => schemadb::from_path($this->_config->get('schemadb_organization')),
             'organization_member' => schemadb::from_path($this->_config->get('schemadb_organization_member')),
-        ];;
+        ]; ;
         $this->add_stylesheet(MIDCOM_STATIC_URL . "/midcom.datamanager/default.css");
 
         midcom::get()->disable_limits();
@@ -158,7 +158,7 @@ 
         $contacts = $importer->parse($input);
         if (count($contacts) > 0) {
             $this->_request_data['import_status'] = $importer->import_subscribers($contacts, $this->_request_data['campaign']);
-            if (   $this->_request_data['import_status']['subscribed_new'] > 0
+            if ($this->_request_data['import_status']['subscribed_new'] > 0
                 || $this->_request_data['import_status']['already_subscribed'] > 0) {
                 $this->_import_success = true;
             }
@@ -196,7 +196,7 @@ 
         // Update the breadcrumb line
         $this->_update_breadcrumb($handler_id, $args);
 
-        if (   array_key_exists('org_openpsa_directmarketing_import', $_POST)
+        if (array_key_exists('org_openpsa_directmarketing_import', $_POST)
             && is_uploaded_file($_FILES['org_openpsa_directmarketing_import_upload']['tmp_name'])) {
             $importer = new org_openpsa_directmarketing_importer_vcards($this->_schemadbs);
             $this->_run_import($importer, $_FILES['org_openpsa_directmarketing_import_upload']['tmp_name']);
@@ -250,7 +250,7 @@ 
                 $read_rows = 0;
                 $handle = fopen($data['tmp_file'], 'r');
                 $total_columns = 0;
-                while (   $read_rows < 2
+                while ($read_rows < 2
                        && $csv_line = fgetcsv($handle, 1000, $data['separator'])) {
                     if ($total_columns == 0) {
                         $total_columns = count($csv_line);