intraface / intraface.dk

src/Intraface/modules/product/ProductDetail.php

Braces +15 added lines, -5 removed lines

@@ -137,8 +137,12 @@ 
         $validator->isNumeric($array_var['pic_id'], 'Fejl i billedid', 'allow_empty');
         $validator->isNumeric($array_var['weight'], 'Fejl i vægt - skal være et helt tal', 'allow_empty');
 
-        if (isset($array_var['price'])) $validator->isNumeric($array_var['price'], 'Fejl i pris', 'allow_empty');
-        if (isset($array_var['before_price'])) $validator->isNumeric($array_var['before_price'], 'Fejl i førpris', 'allow_empty');
+        if (isset($array_var['price'])) {
+            $validator->isNumeric($array_var['price'], 'Fejl i pris', 'allow_empty');
+        }
+        if (isset($array_var['before_price'])) {
+            $validator->isNumeric($array_var['before_price'], 'Fejl i førpris', 'allow_empty');
+        }
 
         if ($this->product->error->isError()) {
             return false;
@@ -236,11 +240,17 @@ 
             $do_update = 1;
             $sql       = '';
             // we make sure that unit is set to a valid unit.
-            if (empty($array_var['unit'])) $array_var['unit'] = 1;
+            if (empty($array_var['unit'])) {
+                $array_var['unit'] = 1;
+            }
             $sql .= "unit = ".intval($array_var['unit']).", ";
 
-            if (!isset($array_var['name'])) $array_var['name'] = '';
-            if (!isset($array_var['description'])) $array_var['description'] = '';
+            if (!isset($array_var['name'])) {
+                $array_var['name'] = '';
+            }
+            if (!isset($array_var['description'])) {
+                $array_var['description'] = '';
+            }
 
             foreach ($this->fields as $field) {
                 if (!array_key_exists($field, $array_var)) {

src/Intraface/modules/product/Variation/Gateway.php

Braces +6 added lines, -2 removed lines

@@ -72,7 +72,9 @@ 
         $query = $this->variation->getTable()->createQuery();
         
         $select = get_class($this->variation).'.*, detail.*, a1.*, a1_attribute.*, a1_attribute_group.*';
-        if (count($this->groups) == 2) $select .= ', a2.*, a2_attribute.*, a2_attribute_group.*';
+        if (count($this->groups) == 2) {
+            $select .= ', a2.*, a2_attribute.*, a2_attribute_group.*';
+        }
         $query = $query->select($select)
             ->leftJoin(get_class($this->variation).'.detail detail')
             ->innerJoin(get_class($this->variation).'.attribute1 a1 WITH a1.attribute_number = 1')
@@ -184,7 +186,9 @@ 
         $query = $this->variation->getTable()->createQuery();
         
         $select = get_class($this->variation).'.*, detail.*, a1.*, a1_attribute.*, a1_attribute_group.*';
-        if (count($this->groups) == 2) $select .= ', a2.*, a2_attribute.*, a2_attribute_group.*';
+        if (count($this->groups) == 2) {
+            $select .= ', a2.*, a2_attribute.*, a2_attribute_group.*';
+        }
         
         $query = $query->select($select)
             ->leftJoin(get_class($this->variation).'.detail detail')

src/Intraface/modules/product/Controller/AttributeGroups/Attribute.php

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
             try {
                 $attribute->save();
                 return new k_SeeOther($this->url());
-            }
-            catch (Doctrine_Validator_Exception $e) {
+            } catch (Doctrine_Validator_Exception $e) {
                 $this->attribute = $attribute;
                 $this->getError()->attachErrorStack($attribute->getErrorStack());
             }

src/Intraface/modules/product/Controller/Index.php

Braces +26 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
             return 'Intraface_modules_product_Controller_AttributeGroups';
         } elseif ($name == 'batchedit') {
             return 'Intraface_modules_product_Controller_BatchEdit';
-        }  elseif ($name == 'batchprice') {
+        } elseif ($name == 'batchprice') {
             return 'Intraface_modules_product_Controller_BatchPriceChanger';
         }
     }
@@ -90,15 +90,31 @@ 
         $product->getDetails()->Translation['da']->name = $_POST['name'];
         $product->getDetails()->Translation['da']->description = $_POST['description'];
         $product->getDetails()->price = new Ilib_Variable_Float($_POST['price'], 'da_dk');
-        if (isset($_POST['before_price'])) $product->getDetails()->before_price = new Ilib_Variable_Float($_POST['before_price'], 'da_dk');
-        if (isset($_POST['weight'])) $product->getDetails()->weight = new Ilib_Variable_Float($_POST['weight'], 'da_dk');
-        if (isset($_POST['unit'])) $product->getDetails()->unit = $_POST['unit'];
-        if (isset($_POST['vat'])) $product->getDetails()->vat = $_POST['vat'];
-        if (isset($_POST['do_show'])) $product->do_show = $_POST['do_show'];
-        if (isset($_POST['state_account_id'])) $product->getDetails()->state_account_id = (int)$_POST['state_account_id'];
-
-        if (isset($_POST['has_variation'])) $product->has_variation = $_POST['has_variation'];
-        if (isset($_POST['stock'])) $product->stock = $_POST['stock'];
+        if (isset($_POST['before_price'])) {
+            $product->getDetails()->before_price = new Ilib_Variable_Float($_POST['before_price'], 'da_dk');
+        }
+        if (isset($_POST['weight'])) {
+            $product->getDetails()->weight = new Ilib_Variable_Float($_POST['weight'], 'da_dk');
+        }
+        if (isset($_POST['unit'])) {
+            $product->getDetails()->unit = $_POST['unit'];
+        }
+        if (isset($_POST['vat'])) {
+            $product->getDetails()->vat = $_POST['vat'];
+        }
+        if (isset($_POST['do_show'])) {
+            $product->do_show = $_POST['do_show'];
+        }
+        if (isset($_POST['state_account_id'])) {
+            $product->getDetails()->state_account_id = (int)$_POST['state_account_id'];
+        }
+
+        if (isset($_POST['has_variation'])) {
+            $product->has_variation = $_POST['has_variation'];
+        }
+        if (isset($_POST['stock'])) {
+            $product->stock = $_POST['stock'];
+        }
 
         try {
             $product->save();

src/Intraface/modules/product/Controller/Productattributegroup.php

Braces +3 added lines, -1 removed lines

@@ -48,7 +48,9 @@
 

             $existing_groups = array();

             $new_groups = array();

-            foreach ($product->getAttributeGroups() AS $group) $existing_groups[] = $group['id'];

+            foreach ($product->getAttributeGroups() AS $group) {
+                $existing_groups[] = $group['id'];
+            }
 

             if (count($existing_groups) > 0) {

                 try {

src/Intraface/modules/modulepackage/ShopExtension.php

Braces +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
             } else {
                 return array();
             }
-        }  elseif (is_int($product_id)) {
+        } elseif (is_int($product_id)) {
             if (intval($product_id) == 0) {
                 return array();
             }

src/Intraface/modules/modulepackage/Controller/Postform.php

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
         if (substr($url, 0, 7) != 'http://' && substr($url, 0, 8) != 'https://') {
             $form_action = '';
-        }  else {
+        } else {
             $form_action = $url;
         }
 

src/Intraface/modules/modulepackage/Action.php

Braces +5 added lines, -10 removed lines

@@ -92,8 +92,7 @@ 
                 if ($action['action'] == 'add') {
                     if (isset($action['start_date']) && $action['start_date'] != '' && isset($action['end_date']) && $action['end_date'] != '') {
                         $description = date('d-m-Y', strtotime($action['start_date'])).' - '.date('d-m-Y', strtotime($action['end_date']));
-                    }
-                    else {
+                    } else {
                         $description = '';
                     }
 
@@ -101,8 +100,7 @@ 
                         'product_id' => $action['product_id'],
                         'description' => $description,
                         'quantity' => (int)$action['month']);
-                }
-                elseif (($action['action'] == 'terminate' || $action['action'] == 'delete')
+                } elseif (($action['action'] == 'terminate' || $action['action'] == 'delete')
                         && isset($action['product_id']) && $action['product_id'] != 0
                         && isset($action['product_detail_id']) && $action['product_detail_id'] != 0) {
                     // we only substract the price id we are able to find a product detail.
@@ -179,16 +177,14 @@ 
                     }
                 }
 
-            }
-            elseif ($action['action'] == 'terminate') {
+            } elseif ($action['action'] == 'terminate') {
                 $manager = new Intraface_modules_modulepackage_Manager($intranet, (int)$action['intranet_module_package_id']);
                 if (!$manager->terminate()) {
                     throw new Exception('There was an error terminating the intranet module package '.$action['intranet_module_package_id']);
                     $this->error->set("an error appeared when removing your old modulepackage. we have been noticed.");
 
                 }
-            }
-            elseif ($action['action'] == 'delete') {
+            } elseif ($action['action'] == 'delete') {
                 $manager = new Intraface_modules_modulepackage_Manager($intranet, (int)$action['intranet_module_package_id']);
                 if (!$manager->delete()) {
                     throw new Exception('There was an error deleting the intranet module package '.$action['intranet_module_package_id']);
@@ -199,8 +195,7 @@ 
 
         if ($this->error->isError()) {
             return false;
-        }
-        else {
+        } else {
             return true;
         }
     }

src/Intraface/modules/cms/section/Picture.php

Braces +10 added lines, -5 removed lines

@@ -24,7 +24,9 @@ 
         $this->cmspage->kernel->useModule('filemanager');

         $this->value['picture'] = array();

 

-        if ($this->value['pic_id'] == 0) return;

+        if ($this->value['pic_id'] == 0) {
+            return;
+        }
 

 

         $filemanager = new FileHandler($this->cmspage->kernel, $this->value['pic_id']);

@@ -32,8 +34,7 @@ 
         if ($filemanager->get('id') > 0) {

             if ($size == 'original') {

                 $this->value['picture'] = $filemanager->get();

-            }

-            else {

+            } else {

                 $filemanager->createInstance($size);

                 $this->value['picture'] = $filemanager->instance->get();

 

@@ -43,7 +44,9 @@ 
 

     function validate_section(& $var) {

         $validator = new Intraface_Validator($this->error);

-        if (!empty($var['pic_id'])) $validator->isNumeric($var['pic_id'], 'error in pic_id', 'allow_empty');

+        if (!empty($var['pic_id'])) {
+            $validator->isNumeric($var['pic_id'], 'error in pic_id', 'allow_empty');
+        }
 

         if ($this->error->isError()) {

             return 0;

@@ -91,7 +94,9 @@ 
             $var['pic_id'] = $this->parameter->get('pic_id');

         }

         */

-        if (!empty($var['pic_id'])) $this->addParameter('pic_id', $var['pic_id']);

+        if (!empty($var['pic_id'])) {
+            $this->addParameter('pic_id', $var['pic_id']);
+        }
         return 1;

 

     }