flack / openpsa

lib/org/openpsa/core/siteconfig.php

Spacing +1 added lines, -1 removed lines

@@ -174,7 +174,7 @@
         }
         if (!midcom::get()->auth->admin) {
             $user_id = midcom::get()->auth->acl->get_user_id();
-            if (   !$this->data[$type . '_guid']
+            if (!$this->data[$type . '_guid']
                 || !midcom::get()->auth->acl->can_do_byguid('midgard:read', $this->data[$type . '_guid'], 'midcom_db_topic', $user_id)) {
                 return null;
             }

lib/org/openpsa/products/midcom/interfaces.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
      */
     public function _on_reindex($topic, $config, &$indexer)
     {
-        if (   !$config->get('index_products')
+        if (!$config->get('index_products')
             && !$config->get('index_groups')) {
             debug_add("No indexing to groups and products, skipping", MIDCOM_LOG_WARN);
             return true;

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

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 
         // Set all given values into DM2
         foreach ($productdata as $key => $value) {
-            if (   array_key_exists($key, $this->_datamanager->types)
+            if (array_key_exists($key, $this->_datamanager->types)
                 && !in_array($key, $this->_request_data['fields_to_skip'])) {
                 $this->_datamanager->types[$key]->convert_from_csv($value);
             }
@@ -140,7 +140,7 @@ 
         }
 
         // Map products without group to the "new products" group
-        if (   empty($product->productGroup)
+        if (empty($product->productGroup)
             && !empty($data['new_products_product_group'])) {
             $product->productGroup = $data['new_products_product_group'];
         }
@@ -244,7 +244,7 @@ 
 
             if ($percentage >= $this->_config->get('import_csv_data_percentage')) {
                 $read_rows++;
-                if (   $limit > 0
+                if ($limit > 0
                     && $read_rows > ($limit + $offset)) {
                     break;
                 }
@@ -320,15 +320,15 @@ 
                 if ($field_matching = $_POST['org_openpsa_products_import_csv_field'][$field]) {
                     $schema_field = $field_matching;
 
-                    if (   !array_key_exists($schema_field, $data['schemadb_product'][$data['schema']]->fields)
+                    if (!array_key_exists($schema_field, $data['schemadb_product'][$data['schema']]->fields)
                         && $schema_field != 'org_openpsa_products_import_parent_group') {
                         // Invalid matching, skip
                         continue;
                     }
 
-                    if (   $value == ''
+                    if ($value == ''
                         || $value == 'NULL'
-                        || preg_match('/^#+$/',  $value)) {
+                        || preg_match('/^#+$/', $value)) {
                         // No value, skip
                         continue;
                     }

Braces +2 added lines, -1 removed lines

@@ -107,7 +107,8 @@
         if (!empty($productdata['GUID'])) {
             try {
                 $product = new org_openpsa_products_product_dba($productdata['GUID']);
-            } catch (midcom_error $e) {
+            }
+            catch (midcom_error $e) {
                 $e->log();
             }
         }

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

Spacing +1 added lines, -1 removed lines

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

lib/org/openpsa/products/handler/group/csvimport.php

Spacing +3 added lines, -3 removed lines

@@ -135,7 +135,7 @@ 
                 $handle = fopen($_FILES['org_openpsa_products_import_upload']['tmp_name'], 'r');
                 $separator = $data['separator'];
                 $total_columns = 0;
-                while (   $read_rows < 2
+                while ($read_rows < 2
                        && $csv_line = fgetcsv($handle, 1000, $separator)) {
                     if ($total_columns == 0) {
                         $total_columns = count($csv_line);
@@ -226,13 +226,13 @@ 
                 if ($field_matching = $_POST['org_openpsa_products_import_csv_field'][$field]) {
                     $schema_field = $field_matching;
 
-                    if (   !array_key_exists($schema_field, $data['schemadb_group']['default']->fields)
+                    if (!array_key_exists($schema_field, $data['schemadb_group']['default']->fields)
                         && $schema_field != 'org_openpsa_products_import_parent_group') {
                         // Invalid matching, skip
                         continue;
                     }
 
-                    if (   $value == ''
+                    if ($value == ''
                         || $value == 'NULL') {
                         // No value, skip
                         continue;

lib/org/openpsa/products/product/group.php

Spacing +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
         }
 
         $result_cache[$cache_key] = array();
-        $ret =& $result_cache[$cache_key];
+        $ret = & $result_cache[$cache_key];
 
         if (empty($up)) {
             // TODO: use reflection to see what kind of property this is ?
@@ -94,14 +94,14 @@ 
             $value_properties[] = $keyproperty;
         }
         foreach ($label_fields as $fieldname) {
-            if (   $fieldname != 'id'
+            if ($fieldname != 'id'
                 && $fieldname != $keyproperty) {
                 $value_properties[] = $fieldname;
                 continue;
             }
         }
 
-        $mc = org_openpsa_products_product_group_dba::new_collector('up', (int)$up);
+        $mc = org_openpsa_products_product_group_dba::new_collector('up', (int) $up);
         if ($order_by_score) {
             $mc->add_order('metadata.score', 'DESC');
         }

lib/org/openpsa/products/viewer.php

Spacing +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@
         $object = $dm->storage->object;
 
         $document = $indexer->new_document($dm);
-        if (   $config->get('enable_scheduling')
+        if ($config->get('enable_scheduling')
             && midcom::get()->dbfactory->is_a($object, 'org_openpsa_products_product_dba')) {
             // Check start/end for products
-            if (   $object->start > time()
-                || (   $object->end != 0
+            if ($object->start > time()
+                || ($object->end != 0
                     && $object->end < time())) {
                 // Not in market, remove from index
                 $indexer->delete($document->RI);

lib/org/openpsa/products/exec/import-images.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 midcom::get()->auth->require_admin_user();
 
-if (   !isset($_POST['address'])
+if (!isset($_POST['address'])
     || !strstr($_POST['address'], '__PRODUCT_CODE__')) {
     ?>
     <h1>Import product images</h1>

lib/org/openpsa/directmarketing/midcom/interfaces.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
     public function _on_watched_dba_delete($object)
     {
         $qb = org_openpsa_directmarketing_campaign_member_dba::new_query_builder();
-        if (   is_a($object, 'midcom_db_person')
+        if (is_a($object, 'midcom_db_person')
             || is_a($object, 'org_openpsa_contacts_person_dba')) {
             $qb->add_constraint('person', '=', $object->id);
         } elseif (is_a($object, 'org_openpsa_directmarketing_campaign_dba')) {
@@ -43,7 +43,7 @@ 
      */
     public function background_send_message(array $args, midcom_baseclasses_components_cron_handler $handler)
     {
-        if (   !isset($args['url_base'])
+        if (!isset($args['url_base'])
             || !isset($args['batch'])) {
             $handler->print_error('url_base or batch number not set, aborting');
             return false;

Braces +4 added lines, -2 removed lines

@@ -57,7 +57,8 @@ 
         try {
             midcom::get()->dynamic_load($batch_url);
             $ret = true;
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $ret = $e->getMessage();
         }
         ob_end_clean();
@@ -83,7 +84,8 @@ 
         midcom::get()->auth->request_sudo($this->_component);
         try {
             $campaign = new org_openpsa_directmarketing_campaign_dba($args['campaign_guid']);
-        } catch (midcom_error $e) {
+        }
+        catch (midcom_error $e) {
             $handler->print_error("{$args['campaign_guid']} is not a valid campaign GUID");
             return false;
         }