intraface / intraface.dk

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

Doc Comments +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
      * @todo Product should not be given as parameter, but defined as relation. Product needs to be made in doctrine
      *
      * @param object $currency Intraface_modules_currency_Currency
-     * @param integer $exchange_rage_id
+     * @param integer $exchange_rate_id
      * @param object $product Product
      *
      * @return obejct Ilib_Variable_Float with price of the variation in given currency

Indentation +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 
     function getIntranetId()
     {
-    	return $this->intranet_id;
+        return $this->intranet_id;
     }
 
     /**

Spacing +4 added lines, -4 removed lines

@@ -99,7 +99,7 @@ 
      */
     public function getPriceInCurrency($currency, $exchange_rate_id = 0, $product)
     {
-        return new Ilib_Variable_Float(round($this->getPrice($product)->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100) , 2));
+        return new Ilib_Variable_Float(round($this->getPrice($product)->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2));
     }
 
     /**
@@ -114,9 +114,9 @@ 
     public function getPriceIncludingVat($product)
     {
         if (get_class($product) == 'Intraface_modules_product_ProductDoctrine') {
-            return new Ilib_Variable_Float($this->getPrice($product)->getAsIso(2) * (1 + $product->getDetails()->getVatPercent()->getAsIso()/100));
+            return new Ilib_Variable_Float($this->getPrice($product)->getAsIso(2)*(1 + $product->getDetails()->getVatPercent()->getAsIso()/100));
         } else {
-            return new Ilib_Variable_Float($this->getPrice($product)->getAsIso(2) * (1 + $product->get('vat_percent')/100));
+            return new Ilib_Variable_Float($this->getPrice($product)->getAsIso(2)*(1 + $product->get('vat_percent')/100));
         }
     }
 
@@ -133,7 +133,7 @@ 
      */
     public function getPriceIncludingVatInCurrency($currency, $exchange_rate_id, $product)
     {
-        return new Ilib_Variable_Float($this->getPriceIncludingVat($product)->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100));
+        return new Ilib_Variable_Float($this->getPriceIncludingVat($product)->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100));
     }
 
     /**

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

Doc Comments +1 added lines

@@ -65,6 +65,7 @@
     /**
      * Find a variation from id
      * 
+     * @param integer $id
      * @return object Intraface_modules_product_Variation_OneAttributeGroup or Intraface_modules_product_Variation_TwoAttributeGroups
      */
     public function findById($id)

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
             $this->variation = new Intraface_modules_product_Variation_OneAttributeGroup;
             
         } elseif (count($this->groups) == 2) {
-            $this->variation =  new Intraface_modules_product_Variation_TwoAttributeGroups;
+            $this->variation = new Intraface_modules_product_Variation_TwoAttributeGroups;
         } else {
             throw new Exception('At the moment the system only supports up to two attribute groups!');
         }

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/shop/Basket.php

Doc Comments +5 added lines, -3 removed lines

@@ -54,8 +54,9 @@ 
      *
      * @param object $db         The webshop object
      * @param object $intranet   The webshop object
-     * @param object $webshop    The webshop object
+     * @param object $shop    The webshop object
      * @param string $session_id A session id
+     * @param Intraface_modules_shop_Coordinator $coordinator
      *
      * @return void
      */
@@ -104,7 +105,7 @@ 
      * @param integer $product_id Product to remove
      * @param integer $quantity   How many should be removed
      *
-     * @return boelean
+     * @return boolean
      */
     public function remove($product_id, $product_variation_id = 0, $quantity = 1)
     {
@@ -122,6 +123,7 @@ 
      * @param integer $quantity         The quantity
      * @param string  $text	            To add description to product, not yet implemented
      * @param integer $basketevaluation Wheter the product is from basketevaluation
+     * @param integer $product_variation_id
      *
      * @return boolean
      */
@@ -532,7 +534,7 @@ 
     /**
      * Gets the total weight of the basket
      *
-     * @return float
+     * @return integer
      */
     public function getTotalWeight()
     {

Indentation +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
         $this->resetItemCache();
 
         $this->conditions = array(
-        	'session_id = ' . $this->db->quote($this->session_id, 'text'),
+            'session_id = ' . $this->db->quote($this->session_id, 'text'),
             'shop_id = ' . $this->db->quote($this->webshop->getId(), 'integer'),
             'intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer'));
 

Spacing +41 added lines, -41 removed lines

@@ -69,16 +69,16 @@ 
         $this->resetItemCache();
 
         $this->conditions = array(
-        	'session_id = ' . $this->db->quote($this->session_id, 'text'),
-            'shop_id = ' . $this->db->quote($this->webshop->getId(), 'integer'),
-            'intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer'));
+        	'session_id = '.$this->db->quote($this->session_id, 'text'),
+            'shop_id = '.$this->db->quote($this->webshop->getId(), 'integer'),
+            'intranet_id = '.$this->db->quote($this->intranet->getId(), 'integer'));
 
         $this->cleanUp();
     }
 
     private function cleanUp()
     {
-        return $this->db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL " . $this->db->quote(self::CLEAN_UP_AFTER, 'integer') . " HOUR) < NOW()");
+        return $this->db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL ".$this->db->quote(self::CLEAN_UP_AFTER, 'integer')." HOUR) < NOW()");
     }
 
     /**
@@ -165,23 +165,23 @@ 
                 FROM basket
                 WHERE product_id = ".$product_id."
                     AND product_variation_id = ".$product_variation_id."
-                    AND product_detail_id = " . $product_detail_id . "
-                    AND basketevaluation_product = " . $basketevaluation . "
+                    AND product_detail_id = " . $product_detail_id."
+                    AND basketevaluation_product = " . $basketevaluation."
                     AND " . $sql_extra);
 
         if ($db->nextRecord()) {
             if ($quantity == 0) {
                 $db->query("DELETE FROM basket
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
                         AND " . $sql_extra);
             } else {
                 $db->query("UPDATE basket SET
                     quantity = $quantity,
                     date_changed = NOW(),
                     text = '".$text."'
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
                         AND " . $sql_extra);
             }
             return true;
@@ -192,7 +192,7 @@ 
                         quantity = $quantity,
                         date_changed = NOW(),
                         text = '".$text."',
-                        basketevaluation_product = " . $basketevaluation . ",
+                        basketevaluation_product = " . $basketevaluation.",
                         product_id = ".$product_id.",
                         product_variation_id = ".$product_variation_id.",
                         product_detail_id = ".$product_detail_id.",
@@ -220,10 +220,10 @@ 
         settype($input['email'], 'string');
         settype($input['phone'], 'string');
 
-        $sql = "name = \"".safeToDb($input['name'])."\"," .
-            "contactperson = \"".safeToDb($input['contactperson'])."\", " .
-            "address = \"".safeToDb($input['address'])."\", " .
-            "postcode = \"".safeToDb($input['postcode'])."\", " .
+        $sql = "name = \"".safeToDb($input['name'])."\",".
+            "contactperson = \"".safeToDb($input['contactperson'])."\", ".
+            "address = \"".safeToDb($input['address'])."\", ".
+            "postcode = \"".safeToDb($input['postcode'])."\", ".
             "city = \"".safeToDb($input['city'])."\", ".
             "country = \"".safeToDb($input['country'])."\", ".
             "cvr = \"".safeToDb($input['cvr'])."\", ".
@@ -305,13 +305,13 @@ 
         $sql_extra = implode(" AND ", $this->conditions);
 
         $db = new DB_Sql;
-        $db->query("SELECT id FROM basket_details WHERE " . $sql_extra. "
+        $db->query("SELECT id FROM basket_details WHERE ".$sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if ($db->nextRecord()) {
             $db->query("UPDATE basket_details SET ".$sql.",
                 date_changed = NOW()
-                WHERE id = ".$db->f('id') . "
-                    AND " . $sql_extra . "
+                WHERE id = ".$db->f('id')."
+                    AND " . $sql_extra."
                     AND intranet_id = " . $this->intranet->getId());
             return true;
         } else {
@@ -339,7 +339,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -369,7 +369,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_coupon
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -391,7 +391,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_ean
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -413,7 +413,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_comment
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -435,7 +435,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT payment_method_key
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord() || $db->f('payment_method_key') == 0) {
             return array();
@@ -460,10 +460,10 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket
-            WHERE " . $sql_extra . "
-                AND product_id = " . $product_id . "
+            WHERE " . $sql_extra."
+                AND product_id = " . $product_id."
                 AND product_variation_id = ".$product_variation_id."
-                AND intranet_id = " . $this->intranet->getId() . "
+                AND intranet_id = " . $this->intranet->getId()."
       AND quantity > 0 LIMIT 1");
 
         if (!$db->nextRecord()) {
@@ -576,9 +576,9 @@ 
                 ON product.id = basket.product_id
             INNER JOIN product_detail
                 ON product.id = product_detail.product_id
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND product_detail.active = 1
-                AND basket.intranet_id = " . $this->intranet->getId() . "
+                AND basket.intranet_id = " . $this->intranet->getId()."
             ORDER BY product_detail.vat DESC, basket.basketevaluation_product");
 
         $i = 0;
@@ -630,16 +630,16 @@ 
 
             // basket specific
             $items[$i]['quantity'] = $db->f('quantity');
-            $items[$i]['totalweight'] = $items[$i]['weight'] * $db->f('quantity');
-            $items[$i]['totalprice'] = $db->f('quantity') * $items[$i]['price'];
-            $items[$i]['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['price_incl_vat'];
+            $items[$i]['totalweight'] = $items[$i]['weight']*$db->f('quantity');
+            $items[$i]['totalprice'] = $db->f('quantity')*$items[$i]['price'];
+            $items[$i]['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['price_incl_vat'];
 
-            $items[$i]['currency']['DKK']['totalprice'] = $db->f('quantity') * $items[$i]['currency']['DKK']['price'];
-            $items[$i]['currency']['DKK']['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['currency']['DKK']['price_incl_vat'];
+            $items[$i]['currency']['DKK']['totalprice'] = $db->f('quantity')*$items[$i]['currency']['DKK']['price'];
+            $items[$i]['currency']['DKK']['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['currency']['DKK']['price_incl_vat'];
             if (is_object($currencies) && $currencies->count() > 0) {
                 foreach ($currencies AS $currency) {
-                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice'] = $db->f('quantity') * $items[$i]['currency'][$currency->getType()->getIsoCode()]['price'];
-                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['currency'][$currency->getType()->getIsoCode()]['price_incl_vat'];
+                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice'] = $db->f('quantity')*$items[$i]['currency'][$currency->getType()->getIsoCode()]['price'];
+                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['currency'][$currency->getType()->getIsoCode()]['price_incl_vat'];
                 }
             }
 
@@ -668,10 +668,10 @@ 
     {
         $sql_extra = implode(" AND ", $this->conditions);
         $db = new DB_Sql;
-        $db->query("DELETE FROM basket " .
-                "WHERE basketevaluation_product = 1 " .
-                    "AND " . $sql_extra . " " .
-                    "AND intranet_id = " . $this->intranet->getId());
+        $db->query("DELETE FROM basket ".
+                "WHERE basketevaluation_product = 1 ".
+                    "AND ".$sql_extra." ".
+                    "AND intranet_id = ".$this->intranet->getId());
 
         $this->resetItemCache();
 
@@ -690,8 +690,8 @@ 
 
         $sql_extra = implode(" AND ", $this->conditions);
         $db = new DB_Sql;
-        $db->query("UPDATE basket SET session_id = '' WHERE " . $sql_extra . " AND intranet_id = " . $this->intranet->getId());
-        $db->query("UPDATE basket_details SET session_id = '' WHERE " . $sql_extra . " AND intranet_id = " . $this->intranet->getId());
+        $db->query("UPDATE basket SET session_id = '' WHERE ".$sql_extra." AND intranet_id = ".$this->intranet->getId());
+        $db->query("UPDATE basket_details SET session_id = '' WHERE ".$sql_extra." AND intranet_id = ".$this->intranet->getId());
 
         return true;
     }

Braces +1 added lines, -2 removed lines

@@ -485,8 +485,7 @@
         foreach ($this->getItems() AS $item) {
             if ($type == 'exclusive_vat') {
                 $price += $item['totalprice'];
-            }
-            else {
+            } else {
                 $price += $item['totalprice_incl_vat'];
             }
         }

src/Intraface/modules/shop/BasketEvaluation.php

Doc Comments -1 removed lines

@@ -34,7 +34,6 @@
     /**
      * Constructor
      *
-     * @param object $kernel Kernel registry
      * @param int    $id     Id of the BasketEvaluation
      *
      * @return void

Indentation +16 added lines, -16 removed lines

@@ -23,13 +23,13 @@ 
  */
 class Intraface_modules_shop_BasketEvaluation extends Intraface_Standard
 {
-     public $error;
-     private $db;
-     private $intranet;
-     private $shop;
-     private $id;
-     private $values;
-     private $settings;
+        public $error;
+        private $db;
+        private $intranet;
+        private $shop;
+        private $id;
+        private $values;
+        private $settings;
 
     /**
      * Constructor
@@ -147,15 +147,15 @@ 
         }
 
         $sql = "running_index = ".$this->db->quote($input['running_index'], 'integer').", " .
-                 "evaluate_target_key = ".$this->db->quote($input['evaluate_target_key'], 'integer').", " .
-                 "evaluate_method_key = ".$this->db->quote($input['evaluate_method_key'], 'integer').", " .
-                 "evaluate_value = ".$this->db->quote($input['evaluate_value'], 'text').", " .
-                 "evaluate_value_case_sensitive = ".$this->db->quote($input['evaluate_value_case_sensitive'], 'integer').", " .
-                 "go_to_index_after = ".$this->db->quote($input['go_to_index_after'], 'integer').", " .
-                 "action_action_key = ".$this->db->quote($input['action_action_key'], 'integer').", " .
-                 "action_value = ".$this->db->quote($input['action_value'], 'text').", " .
-                 "action_quantity = ".$this->db->quote($input['action_quantity'], 'integer').", " .
-                 "action_unit_key = ".$this->db->quote($input['action_unit_key'], 'integer');
+                    "evaluate_target_key = ".$this->db->quote($input['evaluate_target_key'], 'integer').", " .
+                    "evaluate_method_key = ".$this->db->quote($input['evaluate_method_key'], 'integer').", " .
+                    "evaluate_value = ".$this->db->quote($input['evaluate_value'], 'text').", " .
+                    "evaluate_value_case_sensitive = ".$this->db->quote($input['evaluate_value_case_sensitive'], 'integer').", " .
+                    "go_to_index_after = ".$this->db->quote($input['go_to_index_after'], 'integer').", " .
+                    "action_action_key = ".$this->db->quote($input['action_action_key'], 'integer').", " .
+                    "action_value = ".$this->db->quote($input['action_value'], 'text').", " .
+                    "action_quantity = ".$this->db->quote($input['action_quantity'], 'integer').", " .
+                    "action_unit_key = ".$this->db->quote($input['action_unit_key'], 'integer');
 
         if ($this->id != 0) {
             $result = $this->db->exec("UPDATE webshop_basket_evaluation SET ".$sql." WHERE intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer')  . " AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));

Spacing +23 added lines, -23 removed lines

@@ -47,7 +47,7 @@ 
         $this->shop     = $shop;
         $this->id       = (int)$id;
 
-        $this->value['settings'] = array (
+        $this->value['settings'] = array(
             'evaluate_target' => array(
                 0 => 'price',
                 1 => 'weight',
@@ -85,10 +85,10 @@ 
      */
     private function load()
     {
-        $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer') . " AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));
+        $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer')." AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));
 
         if (PEAR::isError($result)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
         }
 
         if ($result->numRows() == 0) {
@@ -146,22 +146,22 @@ 
             return false;
         }
 
-        $sql = "running_index = ".$this->db->quote($input['running_index'], 'integer').", " .
-                 "evaluate_target_key = ".$this->db->quote($input['evaluate_target_key'], 'integer').", " .
-                 "evaluate_method_key = ".$this->db->quote($input['evaluate_method_key'], 'integer').", " .
-                 "evaluate_value = ".$this->db->quote($input['evaluate_value'], 'text').", " .
-                 "evaluate_value_case_sensitive = ".$this->db->quote($input['evaluate_value_case_sensitive'], 'integer').", " .
-                 "go_to_index_after = ".$this->db->quote($input['go_to_index_after'], 'integer').", " .
-                 "action_action_key = ".$this->db->quote($input['action_action_key'], 'integer').", " .
-                 "action_value = ".$this->db->quote($input['action_value'], 'text').", " .
-                 "action_quantity = ".$this->db->quote($input['action_quantity'], 'integer').", " .
+        $sql = "running_index = ".$this->db->quote($input['running_index'], 'integer').", ".
+                 "evaluate_target_key = ".$this->db->quote($input['evaluate_target_key'], 'integer').", ".
+                 "evaluate_method_key = ".$this->db->quote($input['evaluate_method_key'], 'integer').", ".
+                 "evaluate_value = ".$this->db->quote($input['evaluate_value'], 'text').", ".
+                 "evaluate_value_case_sensitive = ".$this->db->quote($input['evaluate_value_case_sensitive'], 'integer').", ".
+                 "go_to_index_after = ".$this->db->quote($input['go_to_index_after'], 'integer').", ".
+                 "action_action_key = ".$this->db->quote($input['action_action_key'], 'integer').", ".
+                 "action_value = ".$this->db->quote($input['action_value'], 'text').", ".
+                 "action_quantity = ".$this->db->quote($input['action_quantity'], 'integer').", ".
                  "action_unit_key = ".$this->db->quote($input['action_unit_key'], 'integer');
 
         if ($this->id != 0) {
-            $result = $this->db->exec("UPDATE webshop_basket_evaluation SET ".$sql." WHERE intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer')  . " AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));
+            $result = $this->db->exec("UPDATE webshop_basket_evaluation SET ".$sql." WHERE intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer')." AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));
 
             if (PEAR::isError($result)) {
-                throw new Exception($result->getMessage() . $result->getUserInfo());
+                throw new Exception($result->getMessage().$result->getUserInfo());
                 return false;
             }
 
@@ -169,13 +169,13 @@ 
             $result = $this->db->query("INSERT INTO webshop_basket_evaluation SET ".$sql.", intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer').", id = ".$this->db->quote($this->id, 'integer').", shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));
 
             if (PEAR::isError($result)) {
-                throw new Exception($result->getMessage() . $result->getUserInfo());
+                throw new Exception($result->getMessage().$result->getUserInfo());
                 return false;
             }
 
             $this->id = $this->db->lastInsertID();
             if (PEAR::isError($this->id)) {
-                throw new Exception($result->getMessage() . $result->getUserInfo());
+                throw new Exception($result->getMessage().$result->getUserInfo());
             }
         }
 
@@ -191,7 +191,7 @@ 
     {
         $result = $this->db->exec("UPDATE webshop_basket_evaluation SET active = 0 WHERE intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer'));
         if (PEAR::isError($result)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
             return false;
         }
         return true;
@@ -204,10 +204,10 @@ 
      */
     public function getList()
     {
-        $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer'). " AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer')." ORDER BY running_index");
+        $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer')." ORDER BY running_index");
 
         if (PEAR::isError($this->id)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
         }
 
         $i = 0;
@@ -249,7 +249,7 @@ 
 
             $evaluation_result = false;
 
-            switch($evaluation['evaluate_target']) {
+            switch ($evaluation['evaluate_target']) {
                 case 'price':
                     $evaluate = (double)$basket->getTotalPrice();
                     settype($evaluation['evaluate_value'], 'double');
@@ -319,7 +319,7 @@ 
                     return false;
             }
 
-            switch($evaluation['evaluate_method']) {
+            switch ($evaluation['evaluate_method']) {
                 case 'equals':
                     if ($evaluate == $evaluation['evaluate_value']) {
                         $evaluation_result = true;
@@ -348,7 +348,7 @@ 
             if ($evaluation_result) {
                 $go_to_index = $evaluation['go_to_index_after'];
 
-                switch($evaluation['action_unit']) {
+                switch ($evaluation['action_unit']) {
                     case 'pieces':
                         $quantity = $evaluation['action_quantity'];
                         break;
@@ -363,7 +363,7 @@ 
                         return false;
                 }
 
-                switch($evaluation['action_action']) {
+                switch ($evaluation['action_action']) {
                     case 'no_action':
                         // fine nothing is done
                         break;

Braces +1 added lines, -2 removed lines

@@ -290,8 +290,7 @@
                     $countries = new Ilib_Countries('iso-8859-1');
                     if (false !== ($country = $countries->getCountryByName(trim($customer['country'])))) {
                         $evaluate = $country['region'];
-                    }
-                    else {
+                    } else {
                         $evaluate = 'unknown';
                     }
                     

src/Intraface/modules/shop/Controller/Categories.php

Doc Comments +3 added lines

@@ -82,6 +82,9 @@
         return $this->context->getKernel();
     }
 
+    /**
+     * @return integer
+     */
     function getShopId()
     {
         if ($this->query('shop_id')) {

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         $shop_gateway = $this->getShopGateway();
         $shop = $shop_gateway->findById($this->context->name());
 
-        $this->document->setTitle('Categories for shop' . $shop->getName());
+        $this->document->setTitle('Categories for shop'.$shop->getName());
         $this->document->options = array(
             $redirect->getRedirect($this->url('../')) => 'Close', $this->url('create') => 'Add new category'
         );

src/Intraface/modules/shop/Coordinator.php

Doc Comments +4 added lines, -3 removed lines

@@ -222,7 +222,6 @@ 
      *
      * @param array $input    Array with customer data
      * @param array $products Array with products
-     * @param object $mailer mailer to send e-mail
      *
      * @return integer Order id
      */
@@ -388,9 +387,8 @@ 
      * @param integer $order_id
      * @param integer $transaction_number
      * @param integer $transaction_status
-     * @param float   $transaction_amount
      *
-     * @return boolean
+     * @return integer
      */
     public function addOnlinePayment($order_id, $transaction_number, $transaction_status, $amount)
     {
@@ -430,6 +428,9 @@ 
         }
     }
 
+    /**
+     * @param integer $payment_id
+     */
     private function sendEmailOnOnlinePayment($payment_id)
     {
         $this->kernel->useShared('email');

Spacing +12 added lines, -12 removed lines

@@ -194,12 +194,12 @@ 
 
         if (isset($input['customer_coupon']) && $input['customer_coupon'] != '') {
             if ($value['message'] != '') $value['message'] .= "\n\n";
-            $value['message'] .= "Kundekupon:". $input['customer_coupon'];
+            $value['message'] .= "Kundekupon:".$input['customer_coupon'];
         }
 
         if (isset($input['customer_comment']) && $input['customer_comment'] != '') {
             if ($value['message'] != '') $value['message'] .= "\n\n";
-            $value['message'] .= "Kommentar:\n". $input['customer_comment'];
+            $value['message'] .= "Kommentar:\n".$input['customer_comment'];
         }
 
         if (isset($input['payment_method']) && is_array($input['payment_method']) && !empty($input['payment_method'])) {
@@ -324,15 +324,15 @@ 
         $email = new Email($this->kernel);
 
         if ($this->shop->getConfirmationSubject()) {
-            $subject = $this->shop->getConfirmationSubject() . ' (#' . $this->order->get('number') . ')';
+            $subject = $this->shop->getConfirmationSubject().' (#'.$this->order->get('number').')';
         } else {
-            $subject = 'Bekræftelse på bestilling (#' . $this->order->get('number') . ')';
+            $subject = 'Bekræftelse på bestilling (#'.$this->order->get('number').')';
         }
 
         $body = $this->shop->getConfirmationText();
 
         if ($this->shop->showPaymentUrl()) {
-            $body .=  "\n\n" . $this->shop->getPaymentUrl() . $this->order->getIdentifier();
+            $body .= "\n\n".$this->shop->getPaymentUrl().$this->order->getIdentifier();
         }
 
         // @todo improve this table
@@ -348,19 +348,19 @@ 
                 $currency_iso_code = 'DKK';
             }
 
-            $table->addRow(array(round($item["quantity"]), substr($item["name"], 0, 40), $currency_iso_code.' ' . $amount));
+            $table->addRow(array(round($item["quantity"]), substr($item["name"], 0, 40), $currency_iso_code.' '.$amount));
         }
 
-        $body .= "\n\n" . $table->getTable();
+        $body .= "\n\n".$table->getTable();
 
         if ($this->shop->getConfirmationGreeting()) {
-            $body .=  "\n\n" . $this->shop->getConfirmationGreeting();
+            $body .= "\n\n".$this->shop->getConfirmationGreeting();
         } else {
-            $body .= "Venlig hilsen\n".  $this->kernel->intranet->address->get('name');
+            $body .= "Venlig hilsen\n".$this->kernel->intranet->address->get('name');
         }
 
         if ($this->shop->showLoginUrl()) {
-            $body .=  "\n\n" . $this->contact->getLoginUrl();
+            $body .= "\n\n".$this->contact->getLoginUrl();
         }
 
         if (!$email->save(array('contact_id' => $this->contact->get('id'),
@@ -435,9 +435,9 @@ 
         $this->kernel->useShared('email');
         $email = new Email($this->kernel);
 
-        $subject = 'Bekræftelse på betaling (#' . $payment_id . ')';
+        $subject = 'Bekræftelse på betaling (#'.$payment_id.')';
         $body = 'Vi har modtaget din betaling. Hvis din ordre var afsendt inden kl. 12.00, sender vi den allerede i dag.';
-        $body .= "\n\nVenlig hilsen\n".  $this->kernel->intranet->address->get('name');
+        $body .= "\n\nVenlig hilsen\n".$this->kernel->intranet->address->get('name');
 
         if (!$email->save(array('contact_id' => $this->contact->get('id'),
                                 'subject' => $subject,

Braces +6 added lines, -2 removed lines

@@ -193,12 +193,16 @@
         $value['message'] = $input['message'];
 
         if (isset($input['customer_coupon']) && $input['customer_coupon'] != '') {
-            if ($value['message'] != '') $value['message'] .= "\n\n";
+            if ($value['message'] != '') {
+                $value['message'] .= "\n\n";
+            }
             $value['message'] .= "Kundekupon:". $input['customer_coupon'];
         }
 
         if (isset($input['customer_comment']) && $input['customer_comment'] != '') {
-            if ($value['message'] != '') $value['message'] .= "\n\n";
+            if ($value['message'] != '') {
+                $value['message'] .= "\n\n";
+            }
             $value['message'] .= "Kommentar:\n". $input['customer_comment'];
         }
 

src/Intraface/modules/shop/FeaturedProducts.php

Doc Comments +2 added lines, -3 removed lines

@@ -33,10 +33,9 @@
     }
 
     /**
-     * @param string $headline Headline
-     * @param object $keyword  Keyword object
+     * @param Keyword $keyword  Keyword object
      *
-     * @return integer
+     * @return boolean
      */
     function add($description, $keyword)
     {

Spacing +4 added lines, -4 removed lines

@@ -42,8 +42,8 @@ 
     {
         $result = $this->db->query('SELECT id 
                                     FROM shop_featuredproducts 
-                                    WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer') . ' 
-                                        AND shop_id = ' . $this->db->quote($this->shop->getId(), 'integer') . ' 
+                                    WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer').' 
+                                        AND shop_id = ' . $this->db->quote($this->shop->getId(), 'integer').' 
                                         AND keyword_id  = ' . $this->db->quote($keyword->getId(), 'integer'));
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
@@ -71,7 +71,7 @@ 
      */
     function delete($id)
     {
-        $result = $this->db->query('DELETE FROM shop_featuredproducts WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer') . ' AND shop_id = ' . $this->db->quote($this->shop->getId(), 'integer') . ' AND id  = ' . $this->db->quote($id, 'integer'));
+        $result = $this->db->query('DELETE FROM shop_featuredproducts WHERE intranet_id = '.$this->db->quote($this->intranet->getId(), 'integer').' AND shop_id = '.$this->db->quote($this->shop->getId(), 'integer').' AND id  = '.$this->db->quote($id, 'integer'));
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
         }
@@ -81,7 +81,7 @@ 
     function getAll()
     {
         $result = $this->db->query('SELECT * FROM shop_featuredproducts 
-                                    WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer') . ' 
+                                    WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer').' 
                                         AND shop_id = ' . $this->db->quote($this->shop->getId(), 'integer'));
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());

src/Intraface/modules/stock/Stock.php

Doc Comments +3 added lines

@@ -9,6 +9,9 @@
     public $value;

     private $kernel;

 

+    /**
+     * @param Intraface_modules_product_Variation $variation
+     */
     function __construct($product, $variation = NULL)

     {

         $this->product = $product;

src/Intraface/modules/todo/TodoItem.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     /**

      * Constructor

      *

-     * @param object  $todo Todo liste

+     * @param TodoList  $todo Todo liste

      * @param integer $id   Id for item

      *

      * @return void

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
             throw new Exception('Todo kr�ver Kernel');

         }

         $this->todo = $todo;

-        $this->id = (int) $id;

+        $this->id = (int)$id;

 

         if ($this->id > 0) {

             $this->load();

@@ -44,7 +44,7 @@ 
     private function load()

     {

         $db = new Db_Sql;

-        $db->query("SELECT * FROM todo_item WHERE id = " . $this->id);

+        $db->query("SELECT * FROM todo_item WHERE id = ".$this->id);

         if ($db->nextRecord()) {

             $this->value['id'] = $db->f('id');

             $this->value['item'] = $db->f('item');

@@ -101,20 +101,20 @@ 
         $db = new DB_Sql;

 

         if ($this->id == 0) {

-            $db->query("SELECT position FROM todo_item WHERE todo_list_id = " . $this->todo->get('id') . " ORDER BY position DESC LIMIT 1");

+            $db->query("SELECT position FROM todo_item WHERE todo_list_id = ".$this->todo->get('id')." ORDER BY position DESC LIMIT 1");

             $db->nextRecord();

             $new_position = $db->f('position') + 1;

         }

 

         if ($this->id == 0) {

             $sql_type = "INSERT INTO ";

-            $sql_end = ", date_created = NOW(), position = " . $new_position;

+            $sql_end = ", date_created = NOW(), position = ".$new_position;

         } else {

             $sql_type = "UPDATE ";

-            $sql_end = " WHERE id = " . $this->id;

+            $sql_end = " WHERE id = ".$this->id;

         }

 

-        $db->query($sql_type. " todo_item SET intranet_id = ".$this->todo->kernel->intranet->get('id').", item = '".$var."', todo_list_id = ".(int)$this->todo->get('id').", responsible_user_id = " .$user_id. " " . $sql_end);

+        $db->query($sql_type." todo_item SET intranet_id = ".$this->todo->kernel->intranet->get('id').", item = '".$var."', todo_list_id = ".(int)$this->todo->get('id').", responsible_user_id = ".$user_id." ".$sql_end);

 

         if ($this->id == 0) {

             $this->id = $db->insertedId();

@@ -133,7 +133,7 @@ 
             return false;

         }

         $db = new DB_Sql;

-        $db->query("UPDATE todo_item SET status = 1 WHERE id = " . $this->id);

+        $db->query("UPDATE todo_item SET status = 1 WHERE id = ".$this->id);

         return true;

     }

 

@@ -148,7 +148,7 @@ 
             return false;

         }

         $db = new DB_Sql;

-        $db->query("UPDATE todo_item SET active = 0 WHERE id = " . $this->id);

+        $db->query("UPDATE todo_item SET active = 0 WHERE id = ".$this->id);

         return true;

     }

 

Braces +3 added lines, -1 removed lines

@@ -94,7 +94,9 @@
      */

     public function save($var, $user_id = 0)

     {

-        if (empty($var)) return;

+        if (empty($var)) {
+            return;
+        }
         $var = safeToDb($var);

         $user_id = intval($user_id);