flack / openpsa

lib/org/openpsa/products/viewer.php

Spacing +15 added lines, -25 removed lines

@@ -20,8 +20,7 @@ 
     {
         if ($this->_config->get('search_first'))
         {
-            $this->_request_switch['index'] = Array
-            (
+            $this->_request_switch['index'] = Array(
                 'handler' => Array('org_openpsa_products_handler_product_search', 'search_redirect'),
             );
         }
@@ -56,9 +55,9 @@ 
             if ($config->get('enable_scheduling'))
             {
                 // Check start/end for products
-                if (   (   $object->start != 0
+                if (($object->start != 0
                         && $object->start > time())
-                    || (   $object->end != 0
+                    || ($object->end != 0
                         && $object->end < time()))
                 {
                     // Not in market, remove from index
@@ -85,30 +84,27 @@ 
     private function _populate_node_toolbar()
     {
         $buttons = array();
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midgard:create'))
         {
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => 'export/product/csv/',
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('export products'),
                 MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n->get('export products'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/editshred.png',
             );
-            $buttons[] = array
-            (
+            $buttons[] = array(
                 MIDCOM_TOOLBAR_URL => 'import/product/csv/',
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n->get('import products'),
                 MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n->get('import products from csv-file'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/editshred.png',
             );
         }
-        if (   $this->_topic->can_do('midgard:update')
+        if ($this->_topic->can_do('midgard:update')
             && $this->_topic->can_do('midcom:component_config'))
         {
             $workflow = $this->get_workflow('datamanager2');
-            $buttons[] = $workflow->get_button('config/', array
-            (
+            $buttons[] = $workflow->get_button('config/', array(
                 MIDCOM_TOOLBAR_LABEL => $this->_l10n_midcom->get('component configuration'),
                 MIDCOM_TOOLBAR_HELPTEXT => $this->_l10n_midcom->get('component configuration helptext'),
                 MIDCOM_TOOLBAR_ICON => 'stock-icons/16x16/stock_folder-properties.png',
@@ -165,10 +161,8 @@ 
             {
                 foreach ($feeds as $title => $url)
                 {
-                    midcom::get()->head->add_link_head
-                    (
-                        array
-                        (
+                    midcom::get()->head->add_link_head(
+                        array(
                             'rel'   => 'alternate',
                             'type'  => 'application/rss+xml',
                             'title' => $this->_l10n->get($title),
@@ -180,10 +174,8 @@ 
         }
         else
         {
-            midcom::get()->head->add_link_head
-            (
-                array
-                (
+            midcom::get()->head->add_link_head(
+                array(
                     'rel'   => 'alternate',
                     'type'  => 'application/rss+xml',
                     'title' => $this->_l10n->get('updated products'),
@@ -197,7 +189,7 @@ 
     {
         $this->_request_data['up'] = 0;
         //Check if args[0] is a product group code.
-        if (   (int) $args[0] == 0
+        if ((int) $args[0] == 0
             && strlen($args[0]) > 1)
         {
             $qb2 = org_openpsa_products_product_group_dba::new_query_builder();
@@ -264,8 +256,7 @@ 
 
             if ($object instanceof org_openpsa_products_product_dba)
             {
-                $tmp[] = array
-                (
+                $tmp[] = array(
                     MIDCOM_NAV_URL => "product/{$object->code}/",
                     MIDCOM_NAV_NAME => $object->title,
                 );
@@ -283,8 +274,7 @@ 
                     $prefix = $parent->code ?: $parent->guid;
                     $url = "{$prefix}/" . $url;
                 }
-                $tmp[] = array
-                (
+                $tmp[] = array(
                     MIDCOM_NAV_URL => $url . '/',
                     MIDCOM_NAV_NAME => $object->title,
                 );

Braces +6 added lines, -12 removed lines

@@ -125,8 +125,7 @@ 
         if ($this->_config->get('root_group') === 0)
         {
             $this->_request_data['root_group'] = 0;
-        }
-        else
+        } else
         {
             $root_group = org_openpsa_products_product_group_dba::get_cached($this->_config->get('root_group'));
             $this->_request_data['root_group'] = $root_group->id;
@@ -177,8 +176,7 @@ 
                     );
                 }
             }
-        }
-        else
+        } else
         {
             midcom::get()->head->add_link_head
             (
@@ -217,8 +215,7 @@ 
                     $this->_request_data['up'] = $up_group[0]->id;
                 }
             }
-        }
-        else
+        } else
         {
             $this->_request_data['up'] = (int) $args[0];
         }
@@ -226,14 +223,12 @@ 
         if ($this->_request_data['up'] == 0)
         {
             midcom::get()->auth->require_user_do('midgard:create', null, 'org_openpsa_products_product_dba');
-        }
-        else
+        } else
         {
             try
             {
                 $parent = new org_openpsa_products_product_group_dba($this->_request_data['up']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 return false;
             }
@@ -269,8 +264,7 @@ 
                     MIDCOM_NAV_URL => "product/{$object->code}/",
                     MIDCOM_NAV_NAME => $object->title,
                 );
-            }
-            else
+            } else
             {
                 if ($object->guid === $root_group)
                 {

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

Spacing +7 added lines, -8 removed lines

@@ -21,8 +21,7 @@ 
         midcom::get()->auth->require_admin_user();
         $this->_request_data['type'] = 'product';
 
-        $this->_request_data['import_status'] = array
-        (
+        $this->_request_data['import_status'] = array(
             'updated' => 0,
             'created' => 0,
             'failed_create' => 0,
@@ -45,7 +44,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);
@@ -161,7 +160,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'];
@@ -298,7 +297,7 @@ 
             if ($percentage >= $this->_config->get('import_csv_data_percentage'))
             {
                 $read_rows++;
-                if (   $limit > 0
+                if ($limit > 0
                     && $read_rows > ($limit + $offset))
                 {
                     break;
@@ -391,16 +390,16 @@ 
                 {
                     $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 +6 added lines, -12 removed lines

@@ -121,8 +121,7 @@ 
             try
             {
                 $product = new org_openpsa_products_product_dba($productdata['GUID']);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $e->log();
             }
@@ -173,8 +172,7 @@ 
             {
                 $product->delete();
                 $this->_request_data['import_status']['failed_create']++;
-            }
-            else
+            } else
             {
                 $this->_request_data['import_status']['failed_update']++;
             }
@@ -186,8 +184,7 @@ 
         if ($new)
         {
             $this->_request_data['import_status']['created']++;
-        }
-        else
+        } else
         {
             $this->_request_data['import_status']['updated']++;
         }
@@ -237,8 +234,7 @@ 
         if (isset($_POST['org_openpsa_products_import_schema']))
         {
             $data['schema'] = $_POST['org_openpsa_products_import_schema'];
-        }
-        else
+        } else
         {
             $data['schema'] = 'default';
         }
@@ -324,8 +320,7 @@ 
             // Present user with the field matching form
             $data['schemadb'] = $data['schemadb_product'];
             midcom_show_style('show-import-csv-select');
-        }
-        else
+        } else
         {
             // Present user with upload form
             midcom_show_style('show-import-csv-form');
@@ -366,8 +361,7 @@ 
         if (!empty($_POST['org_openpsa_products_import_new_products_product_group']))
         {
             $data['new_products_product_group'] = $_POST['org_openpsa_products_import_new_products_product_group'];
-        }
-        else
+        } else
         {
             $data['new_products_product_group'] = 0;
         }

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

Spacing +4 added lines, -5 removed lines

@@ -31,8 +31,7 @@ 
         if ($this->_product->can_do('midgard:update'))
         {
             $workflow = $this->get_workflow('datamanager2');
-            $this->_view_toolbar->add_item($workflow->get_button("product/edit/{$this->_product->guid}/", array
-            (
+            $this->_view_toolbar->add_item($workflow->get_button("product/edit/{$this->_product->guid}/", array(
                 MIDCOM_TOOLBAR_ACCESSKEY => 'e',
             )));
         }
@@ -63,7 +62,7 @@ 
         if (midcom::get()->config->get('enable_ajax_editing'))
         {
             $data['controller'] = midcom_helper_datamanager2_controller::create('ajax');
-            $data['controller']->schemadb =& $data['schemadb_product'];
+            $data['controller']->schemadb = & $data['schemadb_product'];
             $data['controller']->set_storage($this->_product);
             $data['controller']->process_ajax();
             $data['datamanager'] = $data['controller']->datamanager;
@@ -72,7 +71,7 @@ 
         {
             $data['controller'] = null;
             $data['datamanager'] = new midcom_helper_datamanager2_datamanager($data['schemadb_product']);
-            if (! $data['datamanager']->autoset_storage($this->_product))
+            if (!$data['datamanager']->autoset_storage($this->_product))
             {
                 throw new midcom_error("Failed to create a DM2 instance for product {$this->_product->guid}.");
             }
@@ -120,7 +119,7 @@ 
 
             if (empty($groups))
             {
-                throw new midcom_error_notfound("Product group {$args[0]} not found" );
+                throw new midcom_error_notfound("Product group {$args[0]} not found");
             }
 
             $categories_mc = org_openpsa_products_product_group_dba::new_collector('up', $groups[0]->id);

Braces +8 added lines, -16 removed lines

@@ -67,8 +67,7 @@ 
             $data['controller']->set_storage($this->_product);
             $data['controller']->process_ajax();
             $data['datamanager'] = $data['controller']->datamanager;
-        }
-        else
+        } else
         {
             $data['controller'] = null;
             $data['datamanager'] = new midcom_helper_datamanager2_datamanager($data['schemadb_product']);
@@ -95,8 +94,7 @@ 
                 $productgroup = new org_openpsa_products_product_group_dba($this->_product->productGroup);
                 $title = str_replace('<PRODUCTGROUP_TITLE>', $productgroup->title, $title);
                 $title = str_replace('<PRODUCTGROUP_CODE>', $productgroup->code, $title);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 $title = str_replace(array('<PRODUCTGROUP_TITLE>', '<PRODUCTGROUP_CODE>'), '', $title);
             }
@@ -132,15 +130,13 @@ 
                  * So we can search for the application using only this group id
                  */
                 $qb->add_constraint('productGroup', 'INTREE', $groups[0]->id);
-            }
-            else
+            } else
             {
                 $categories_in[] = $groups[0]->id;
                 $qb->add_constraint('productGroup', 'IN', $categories_in);
             }
             $this->_add_identifier_constraint($qb, $args[1]);
-        }
-        else
+        } else
         {
             $this->_add_identifier_constraint($qb, $args[0]);
         }
@@ -162,14 +158,12 @@ 
         if (!empty($results))
         {
             $this->_product = $results[0];
-        }
-        else
+        } else
         {
             if (preg_match('/^view_product_intree/', $handler_id))
             {
                 $this->_product = new org_openpsa_products_product_dba($args[1]);
-            }
-            else
+            } else
             {
                 $this->_product = new org_openpsa_products_product_dba($args[0]);
             }
@@ -181,8 +175,7 @@ 
         if (mgd_is_guid($identifier))
         {
             $qb->add_constraint('guid', '=', $identifier);
-        }
-        else
+        } else
         {
             $qb->add_constraint('code', '=', $identifier);
         }
@@ -200,8 +193,7 @@ 
         {
             // For AJAX handling it is the controller that renders everything
             $data['view_product'] = $data['controller']->get_content_html();
-        }
-        else
+        } else
         {
             $data['view_product'] = $data['datamanager']->get_content_html();
         }

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

Spacing +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
             foreach ($data['products'] as $product)
             {
                 $data['product'] = $product;
-                if (! $data['datamanager_product']->autoset_storage($product))
+                if (!$data['datamanager_product']->autoset_storage($product))
                 {
                     debug_add("The datamanager for product #{$product->id} could not be initialized, skipping it.");
                     debug_print_r('Object was:', $product);
@@ -178,7 +178,7 @@ 
             foreach ($data['products'] as $product)
             {
                 $data['product'] = $product;
-                if (! $data['datamanager_product']->autoset_storage($product))
+                if (!$data['datamanager_product']->autoset_storage($product))
                 {
                     debug_add("The datamanager for product #{$product->id} could not be initialized, skipping it.");
                     debug_print_r('Object was:', $product);

Braces +3 added lines, -6 removed lines

@@ -43,8 +43,7 @@ 
                  * this group id
                  */
                 $product_qb->add_constraint('productGroup', 'INTREE', $groups[0]->id);
-            }
-            else
+            } else
             {
                 $product_qb->add_constraint('productGroup', 'IN', $categories);
             }
@@ -80,8 +79,7 @@ 
         {
             $product_group = $args[0];
             $show_products = (int) $args[1];
-        }
-        else
+        } else
         {
             $show_products = (int) $args[0];
             $product_group = '';
@@ -147,8 +145,7 @@ 
         if ($handler_id == 'updated_products_feed_intree')
         {
             $this->_list_products($this->_config->get('show_items_in_feed'), $args[0]);
-        }
-        else
+        } else
         {
             $this->_list_products($this->_config->get('show_items_in_feed'));
         }

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

Spacing +14 added lines, -20 removed lines

@@ -13,8 +13,7 @@ 
  */
 class org_openpsa_products_handler_product_search extends midcom_baseclasses_components_handler
 {
-    private $_operators = array
-    (
+    private $_operators = array(
         '<' => '<',
         'lt' => '<',
         '<=' => '<=',
@@ -76,8 +75,7 @@ 
                 unset($constraints[$key]);
                 foreach ($properties as $property)
                 {
-                    $constraints[] = array
-                    (
+                    $constraints[] = array(
                         'property'   => $property,
                         'constraint' => $constraint['constraint'],
                         'value'      => $constraint['value'],
@@ -109,7 +107,7 @@ 
 
             $constraint['constraint'] = $this->_normalize_operator($constraint['constraint']);
 
-            if (   !array_key_exists('value', $constraint)
+            if (!array_key_exists('value', $constraint)
                 || $constraint['value'] == '')
             {
                 // No value specified for this constraint, skip
@@ -205,13 +203,13 @@ 
             $storage = $this->_request_data['schemadb_product'][$this->_request_data['search_schema']]->fields[$constraint['property']]['storage'];
             debug_print_r('constraint', $constraint);
             debug_print_r('storage', $storage);
-            if (   !is_array($storage)
+            if (!is_array($storage)
                 // Do not add constraint if it's all wildcards
                 || preg_match('/^%+$/', $constraint['value']))
             {
                 continue;
             }
-            if (   $storage['location'] == 'parameter'
+            if ($storage['location'] == 'parameter'
                 || $storage['location'] == 'configuration')
             {
                 $mc = new midgard_collector('midgard_parameter', 'domain', $storage['domain']);
@@ -274,13 +272,13 @@ 
 
         // Determine search type (AND vs OR)
         $data['search_type'] = 'AND';
-        if (   !empty($_REQUEST['org_openpsa_products_search_type'])
+        if (!empty($_REQUEST['org_openpsa_products_search_type'])
             && $_REQUEST['org_openpsa_products_search_type'] == 'OR')
         {
             $data['search_type'] = 'OR';
         }
 
-        if (   array_key_exists('org_openpsa_products_search', $_REQUEST)
+        if (array_key_exists('org_openpsa_products_search', $_REQUEST)
             && is_array($_REQUEST['org_openpsa_products_search']))
         {
             // Normalize the constraints
@@ -292,7 +290,7 @@ 
                 $data['results'] = $this->_qb_search($data['search_constraints']);
             }
         }
-        else if (   array_key_exists('org_openpsa_products_list_all', $_REQUEST)
+        else if (array_key_exists('org_openpsa_products_list_all', $_REQUEST)
                  || $this->_config->get('search_default_to_all'))
         {
             // Process search
@@ -302,7 +300,7 @@ 
         // Prepare datamanager
         $data['datamanager'] = new midcom_helper_datamanager2_datamanager($data['schemadb_product']);
 
-        $this->add_stylesheet(MIDCOM_STATIC_URL."/midcom.helper.datamanager2/legacy.css");
+        $this->add_stylesheet(MIDCOM_STATIC_URL . "/midcom.helper.datamanager2/legacy.css");
 
         $this->_populate_toolbar();
 
@@ -317,10 +315,8 @@ 
         {
             $buttons = array();
             $workflow = $this->get_workflow('datamanager2');
-            $buttons[] = $workflow->get_button("create/{$this->_request_data['root_group']}/", array
-            (
-                MIDCOM_TOOLBAR_LABEL => sprintf
-                (
+            $buttons[] = $workflow->get_button("create/{$this->_request_data['root_group']}/", array(
+                MIDCOM_TOOLBAR_LABEL => sprintf(
                     $this->_l10n_midcom->get('create %s'),
                     $this->_l10n->get('product group')
                 ),
@@ -329,10 +325,8 @@ 
 
             foreach (array_keys($this->_request_data['schemadb_product']) as $name)
             {
-                $buttons[] = $workflow->get_button("product/create/{$this->_request_data['root_group']}/{$name}/", array
-                (
-                    MIDCOM_TOOLBAR_LABEL => sprintf
-                    (
+                $buttons[] = $workflow->get_button("product/create/{$this->_request_data['root_group']}/{$name}/", array(
+                    MIDCOM_TOOLBAR_LABEL => sprintf(
                         $this->_l10n_midcom->get('create %s'),
                         $this->_l10n->get($this->_request_data['schemadb_product'][$name]->description)
                     ),
@@ -371,7 +365,7 @@ 
                 $results_counter++;
                 $data['results_counter'] = $results_counter;
 
-                if (! $data['datamanager']->autoset_storage($result))
+                if (!$data['datamanager']->autoset_storage($result))
                 {
                     debug_add("The datamanager for product {$result->id} could not be initialized, skipping it.");
                     debug_print_r('Object was:', $result);

Braces +4 added lines, -8 removed lines

@@ -166,8 +166,7 @@ 
         {
             $ordering = preg_replace('/\s*reversed?\s*/', '', $ordering);
             $qb->add_order($ordering, 'DESC');
-        }
-        else
+        } else
         {
             $qb->add_order($ordering);
         }
@@ -225,8 +224,7 @@ 
                     $qb->add_constraint('guid', 'IN', array_keys($keys));
                 }
                 unset($mc, $keys);
-            }
-            else
+            } else
             {
                 // Simple field storage
                 if (is_numeric($constraint['value']))
@@ -291,8 +289,7 @@ 
                 // Process search
                 $data['results'] = $this->_qb_search($data['search_constraints']);
             }
-        }
-        else if (   array_key_exists('org_openpsa_products_list_all', $_REQUEST)
+        } else if (   array_key_exists('org_openpsa_products_list_all', $_REQUEST)
                  || $this->_config->get('search_default_to_all'))
         {
             // Process search
@@ -359,8 +356,7 @@ 
         if (count($data['results']) == 0)
         {
             midcom_show_style('product_search_noresults');
-        }
-        else
+        } else
         {
             $data['results_count'] = count($data['results']);
             $results_counter = 0;

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

Spacing +4 added lines, -5 removed lines

@@ -42,7 +42,7 @@ 
      */
     public function load_schemadb()
     {
-        $this->_schemadb =& $this->_request_data['schemadb_product'];
+        $this->_schemadb = & $this->_request_data['schemadb_product'];
 
         return $this->_schemadb;
     }
@@ -60,14 +60,14 @@ 
     /**
      * DM2 creation callback, binds to the current content topic.
      */
-    public function & dm2_create_callback (&$controller)
+    public function & dm2_create_callback(&$controller)
     {
         $this->_product = new org_openpsa_products_product_dba();
 
         $this->_request_data['up'] = $controller->formmanager->get_value('productGroup');
         $this->_product->productGroup = $this->_request_data['up'];
 
-        if (! $this->_product->create())
+        if (!$this->_product->create())
         {
             debug_print_r('We operated on this object:', $this->_product);
             throw new midcom_error("Failed to create a new product under product group #{$this->_request_data['up']}. Error: " . midcom_connection::get_error_string());
@@ -104,8 +104,7 @@ 
         $data['controller'] = $this->get_controller('create');
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n_midcom->get('create %s'), $this->_l10n->get($this->_schemadb[$this->_schema]->description)));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $data['controller'],
             'save_callback' => array($this, 'save_callback')
         ));

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
             {
                 throw new midcom_error(midcom_connection::get_error_string());
             }
-        }
-        else
+        } else
         {
             $nodes = $object_qb->execute();
             $node = $nodes[0];

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

Spacing +4 added lines, -5 removed lines

@@ -21,8 +21,7 @@ 
         midcom::get()->auth->require_admin_user();
         $this->_request_data['type'] = 'group';
 
-        $this->_request_data['import_status'] = array
-        (
+        $this->_request_data['import_status'] = array(
             'already_created' => 0,
             'created_new' => 0,
             'failed_create' => 0,
@@ -165,7 +164,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)
@@ -278,14 +277,14 @@ 
                 {
                     $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

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
             {
                 throw new midcom_error(midcom_connection::get_error_string());
             }
-        }
-        else
+        } else
         {
             $nodes = $object_qb->execute();
             $node = $nodes[0];

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

Spacing +9 added lines, -14 removed lines

@@ -102,7 +102,7 @@ 
         if (midcom::get()->config->get('enable_ajax_editing'))
         {
             $data['controller'] = midcom_helper_datamanager2_controller::create('ajax');
-            $data['controller']->schemadb =& $data['schemadb_group'];
+            $data['controller']->schemadb = & $data['schemadb_group'];
             $data['controller']->set_storage($data['group']);
             $data['controller']->process_ajax();
             $data['datamanager_group'] = $data['controller']->datamanager;
@@ -124,13 +124,13 @@ 
         // Set the active leaf
         if ($this->_config->get('display_navigation'))
         {
-            $group =& $data['group'];
+            $group = & $data['group'];
 
             // Loop as long as it is possible to get the parent group
             while ($group->guid)
             {
                 // Break to the requested level (probably the root group of the products content topic)
-                if (   $group->id === $this->_config->get('root_group')
+                if ($group->id === $this->_config->get('root_group')
                     || $group->guid === $this->_config->get('root_group'))
                 {
                     break;
@@ -187,8 +187,7 @@ 
     {
         $buttons = array();
         $workflow = $this->get_workflow('datamanager2');
-        $buttons[] = $workflow->get_button("edit/{$this->_request_data['group']->guid}/", array
-        (
+        $buttons[] = $workflow->get_button("edit/{$this->_request_data['group']->guid}/", array(
             MIDCOM_TOOLBAR_ENABLED => $this->_request_data['group']->can_do('midgard:update'),
             MIDCOM_TOOLBAR_ACCESSKEY => 'e',
         ));
@@ -197,10 +196,8 @@ 
         $allow_create_product = $this->_request_data['group']->can_do('midgard:create');
         foreach (array_keys($this->_request_data['schemadb_group']) as $name)
         {
-            $buttons[] = $workflow->get_button("create/{$this->_request_data['parent_group']}/{$name}/", array
-            (
-                MIDCOM_TOOLBAR_LABEL => sprintf
-                (
+            $buttons[] = $workflow->get_button("create/{$this->_request_data['parent_group']}/{$name}/", array(
+                MIDCOM_TOOLBAR_LABEL => sprintf(
                     $this->_l10n_midcom->get('create %s'),
                     $this->_l10n->get($this->_request_data['schemadb_group'][$name]->description)
                 ),
@@ -211,10 +208,8 @@ 
 
         foreach (array_keys($this->_request_data['schemadb_product']) as $name)
         {
-            $buttons[] = $workflow->get_button("product/create/{$this->_request_data['parent_group']}/{$name}/", array
-            (
-                MIDCOM_TOOLBAR_LABEL => sprintf
-                (
+            $buttons[] = $workflow->get_button("product/create/{$this->_request_data['parent_group']}/{$name}/", array(
+                MIDCOM_TOOLBAR_LABEL => sprintf(
                     $this->_l10n_midcom->get('create %s'),
                     $this->_l10n->get($this->_request_data['schemadb_product'][$name]->description)
                 ),
@@ -271,7 +266,7 @@ 
                 $data['groups_counter'] = $groups_counter;
 
                 $data['group'] = $group;
-                if (! $data['datamanager_group']->autoset_storage($group))
+                if (!$data['datamanager_group']->autoset_storage($group))
                 {
                     debug_add("The datamanager for group #{$group->id} could not be initialized, skipping it.");
                     debug_print_r('Object was:', $group);

Braces +5 added lines, -10 removed lines

@@ -38,13 +38,11 @@ 
             try
             {
                 $data['group'] = new org_openpsa_products_product_group_dba($args[0]);
-            }
-            catch (midcom_error $e)
+            } catch (midcom_error $e)
             {
                 return false;
             }
-        }
-        else
+        } else
         {
             $data['group'] = $results[0];
         }
@@ -106,8 +104,7 @@ 
             $data['controller']->set_storage($data['group']);
             $data['controller']->process_ajax();
             $data['datamanager_group'] = $data['controller']->datamanager;
-        }
-        else
+        } else
         {
             $data['controller'] = null;
             if (!$data['datamanager_group']->autoset_storage($data['group']))
@@ -232,8 +229,7 @@ 
         {
             $ordering = preg_replace('/\s*reversed?\s*/', '', $ordering);
             $qb->add_order($ordering, 'DESC');
-        }
-        else
+        } else
         {
             $qb->add_order($ordering);
         }
@@ -250,8 +246,7 @@ 
         if ($data['controller'])
         {
             $data['view_group'] = $data['controller']->get_content_html();
-        }
-        else
+        } else
         {
             $data['view_group'] = $data['datamanager_group']->get_content_html();
         }

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

Spacing +2 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
         $this->_group = new org_openpsa_products_product_group_dba($args[0]);
 
         $data['controller'] = midcom_helper_datamanager2_controller::create('simple');
-        $data['controller']->schemadb =& $this->_request_data['schemadb_group'];
+        $data['controller']->schemadb = & $this->_request_data['schemadb_group'];
         $data['controller']->set_storage($this->_group);
         if (!$data['controller']->initialize())
         {
@@ -41,8 +41,7 @@ 
 
         midcom::get()->head->set_pagetitle(sprintf($this->_l10n_midcom->get('edit %s'), $this->_group->title));
 
-        $workflow = $this->get_workflow('datamanager2', array
-        (
+        $workflow = $this->get_workflow('datamanager2', array(
             'controller' => $data['controller'],
             'save_callback' => array($this, 'save_callback')
         ));