intraface / intraface.dk

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

Doc Comments +6 added lines, -6 removed lines

@@ -75,7 +75,7 @@ 
      *
      * @param object Product
      *
-     * @return object Ilib_Variable_Float with price
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price
      */
     public function getPrice($product)
     {
@@ -92,10 +92,10 @@ 
      * @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
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price of the variation in given currency
      */
     public function getPriceInCurrency($currency, $exchange_rate_id = 0, $product)
     {
@@ -109,7 +109,7 @@ 
      *
      * @param object $product Product
      *
-     * @return object Ilib_Variable_Float with price including vat
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price including vat
      */
     public function getPriceIncludingVat($product)
     {
@@ -129,7 +129,7 @@ 
      * @param integer $exchange_rate_id
      * @param object product Product
      *
-     * @return object Ilib_Variable_Float with price including vat in given currency
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price including vat in given currency
      */
     public function getPriceIncludingVatInCurrency($currency, $exchange_rate_id, $product)
     {
@@ -143,7 +143,7 @@ 
      *
      * @param object Product
      *
-     * @return object Ilib_Variable_Float with price
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price
      */
     public function getWeight($product)
     {

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

Doc Comments +4 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
      *
      * @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
      *
      * @return void
@@ -104,7 +104,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 +122,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
      */
@@ -530,7 +531,7 @@ 
     /**
      * Gets the total weight of the basket
      *
-     * @return float
+     * @return integer
      */
     public function getTotalWeight()
     {

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()) {
@@ -574,9 +574,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;
@@ -627,16 +627,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'];
                 }
             }
 
@@ -665,10 +665,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();
 
@@ -687,8 +687,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;
     }

src/Intraface/modules/shop/BasketEvaluation.php

Doc Comments +3 added lines, -1 removed lines

@@ -34,7 +34,6 @@ 
     /**
      * Constructor
      *
-     * @param object $kernel Kernel registry
      * @param int    $id     Id of the BasketEvaluation
      *
      * @return void
@@ -106,6 +105,9 @@ 
         return true;
     }
 
+    /**
+     * @param Struct $input
+     */
     function validate($input)
     {
         $validator = new Intraface_Validator($this->error);

Indentation +9 added lines, -9 removed lines

@@ -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 +19 added lines, -19 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,35 +146,35 @@ 
             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;
             }
         } else {
             $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());
             }
         }
 
@@ -190,7 +190,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;
@@ -203,10 +203,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;

src/Intraface/modules/shop/DiscountCampaignGateway.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)

src/Intraface/modules/shop/Shop.php

Doc Comments +3 added lines

@@ -87,6 +87,9 @@
         return 'Create';
     }
 
+    /**
+     * @return string
+     */
     function getType()
     {
         return $this->context->context->getType();

src/Intraface/modules/todo/TodoItem.php

Doc Comments +2 added lines, -2 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
@@ -159,7 +159,7 @@ 
      *
      * @param object $db Database object
      *
-     * @return object
+     * @return Ilib_Position
      */
     public function getPosition($db)
     {

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');
@@ -103,20 +103,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();
@@ -135,7 +135,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;
     }
 
@@ -150,7 +150,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;
     }
 

src/Intraface/modules/todo/TodoList.php

Doc Comments +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
      *
      * @param integer $id Id for specific item
      *
-     * @return array
+     * @return TodoItem
      */
     public function getItem($id = 0)
     {
@@ -124,7 +124,7 @@ 
      *
      * @deprecated
      *
-     * @return array
+     * @return TodoItem
      */
     private function loadItem($id = 0)
     {

Spacing +14 added lines, -14 removed lines

@@ -34,7 +34,7 @@ 
         }
 
         $this->kernel = $kernel;
-        $this->id = (int) $id;
+        $this->id = (int)$id;
 
         if ($this->id > 0) {
             $this->load();
@@ -59,7 +59,7 @@ 
         }
 
         $db = new DB_Sql;
-        $db->query("SELECT * FROM todo_item WHERE " . $sql_status . " todo_list_id =" . (int)$this->getId() . "  AND active = 1 ORDER BY status ASC, position ASC");
+        $db->query("SELECT * FROM todo_item WHERE ".$sql_status." todo_list_id =".(int)$this->getId()."  AND active = 1 ORDER BY status ASC, position ASC");
         $ids = array();
         $i = 0;
         while ($db->nextRecord()) {
@@ -100,7 +100,7 @@ 
     public function setAllItemsUndone()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE todo_item SET status = 0 WHERE todo_list_id = " . $this->getId());
+        $db->query("UPDATE todo_item SET status = 0 WHERE todo_list_id = ".$this->getId());
         return true;
     }
 
@@ -140,7 +140,7 @@ 
     public function deleteAllItems()
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM todo_item WHERE todo_list_id = " . $this->id. " AND active = 1 AND status = 0");
+        $db->query("DELETE FROM todo_item WHERE todo_list_id = ".$this->id." AND active = 1 AND status = 0");
         return true;
     }
 
@@ -152,7 +152,7 @@ 
     private function load()
     {
         $db = new Db_Sql;
-        $db->query("SELECT * FROM todo_list WHERE id = " . $this->id . " LIMIT 1");
+        $db->query("SELECT * FROM todo_list WHERE id = ".$this->id." LIMIT 1");
         if ($db->nextRecord()) {
             $this->value['id'] = $db->f('id');
             $this->value['list_name'] = $db->f('name');
@@ -218,13 +218,13 @@ 
 
         if ($this->id == 0) {
             $sql_type = "INSERT INTO ";
-            $sql_end = ", date_created = NOW(), public_key = '" .$this->kernel->randomKey(10) . "'";
+            $sql_end = ", date_created = NOW(), public_key = '".$this->kernel->randomKey(10)."'";
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         }
         $db = new DB_Sql;
-        $db->query($sql_type. " todo_list SET description = '".$var['list_description']."', name = '".$var['list_name']."', date_changed=NOW(),intranet_id = " . $this->kernel->intranet->get('id') . $sql_end);
+        $db->query($sql_type." todo_list SET description = '".$var['list_description']."', name = '".$var['list_name']."', date_changed=NOW(),intranet_id = ".$this->kernel->intranet->get('id').$sql_end);
 
         if ($this->id == 0) {
             $this->id = $db->insertedId();
@@ -246,12 +246,12 @@ 
         $db->query("SELECT * FROM todo_list
             WHERE intranet_id = " . $this->kernel->intranet->get('id'));
         $ids = array();
-        $i=0;
+        $i = 0;
         while ($db->nextRecord()) {
             $todo = new TodoList($this->kernel, $db->f('id'));
             if ($type == 'done' and $todo->howManyLeft() > 0) {
                 continue;
-            } elseif ($type != 'done'  and $todo->howManyLeft() == 0) {
+            } elseif ($type != 'done' and $todo->howManyLeft() == 0) {
                 continue;
             }
             $ids[$i]['id'] = $db->f('id');
@@ -270,7 +270,7 @@ 
     public function howManyLeft()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM todo_item WHERE status = 0 AND active = 1 AND todo_list_id = " . $this->id);
+        $db->query("SELECT * FROM todo_item WHERE status = 0 AND active = 1 AND todo_list_id = ".$this->id);
         return $db->numRows();
     }
 
@@ -283,11 +283,11 @@ 
     {
         $id = (int)$id;
         $db = new DB_Sql;
-        $db->query("SELECT * FROM todo_contact WHERE contact_id = " . $id);
+        $db->query("SELECT * FROM todo_contact WHERE contact_id = ".$id);
         if ($db->nextRecord()) {
             return true;
         }
-        $db->query("INSERT INTO todo_contact SET contact_id = " . $id . ", list_id = ".$this->get('id').", intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("INSERT INTO todo_contact SET contact_id = ".$id.", list_id = ".$this->get('id').", intranet_id = ".$this->kernel->intranet->get('id'));
         return true;
     }
 
@@ -301,7 +301,7 @@ 
         $db = new DB_Sql;
         $i = 0;
         $contacts = array();
-        $db->query("SELECT * FROM todo_contact WHERE intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT * FROM todo_contact WHERE intranet_id = ".$this->kernel->intranet->get('id'));
         while ($db->nextRecord()) {
             $contacts[$i] = $db->f('contact_id');
             $i++;

src/Intraface/modules/webshop/BasketEvaluation.php

Doc Comments +3 added lines

@@ -112,6 +112,9 @@
         return true;
     }
 
+    /**
+     * @param Struct $input
+     */
     function validate($input)
     {
         $validator = new Intraface_Validator($this->error);

Indentation +9 added lines, -9 removed lines

@@ -153,15 +153,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->kernel->intranet->get('id')." AND id = ".$this->id);

Spacing +16 added lines, -16 removed lines

@@ -55,7 +55,7 @@ 
             die($this->db->getMessage());
         }
 
-        $this->value['settings'] = array (
+        $this->value['settings'] = array(
             'evaluate_target' => array(
                 0 => 'price',
                 1 => 'weight',
@@ -94,7 +94,7 @@ 
         $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->db->quote($this->kernel->intranet->get('id'), '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());
         }
 
         if ($result->numRows() == 0) {
@@ -152,35 +152,35 @@ 
             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->kernel->intranet->get('id')." AND id = ".$this->id);
 
             if (PEAR::isError($result)) {
-                throw new Exception($result->getMessage() . $result->getUserInfo());
+                throw new Exception($result->getMessage().$result->getUserInfo());
                 return false;
             }
         } else {
             $result = $this->db->query("INSERT INTO webshop_basket_evaluation SET ".$sql.", intranet_id = ".$this->kernel->intranet->get('id').", id = ".$this->id);
 
             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());
             }
         }
 
@@ -196,7 +196,7 @@ 
     {
         $result = $this->db->exec("UPDATE webshop_basket_evaluation SET active = 0 WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = ".$this->id);
         if (PEAR::isError($result)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
             return false;
         }
         return true;
@@ -212,7 +212,7 @@ 
         $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->kernel->intranet->get('id').' 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;

src/Intraface/modules/webshop/Webshop.php

Doc Comments +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
     /**
      * Construktor
      *
-     * @param object $kernel     Kernel object
+     * @param Intraface_Kernel $kernel     Kernel object
      * @param string $session_id Unikt session id
      *
      * @return void
@@ -79,7 +79,7 @@ 
     /**
      * Convenience method to create the basket
      *
-     * @return object
+     * @return Basket
      */
     private function createBasket()
     {
@@ -325,9 +325,9 @@ 
      * @param integer $order_id
      * @param integer $transaction_number
      * @param integer $transaction_status
-     * @param float   $transaction_amount
+     * @param integer $amount
      *
-     * @return boolean
+     * @return integer
      */
     public function addOnlinePayment($order_id, $transaction_number, $transaction_status, $amount)
     {

Spacing +4 added lines, -4 removed lines

@@ -186,14 +186,14 @@ 
             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'];
         }
 
 
@@ -301,8 +301,8 @@ 
         $email = new Email($this->kernel);
 
         if (!$email->save(array('contact_id' => $this->contact->get('id'),
-                                'subject' => 'Bekræftelse på bestilling #' . $order_id,
-                                'body' => $this->kernel->setting->get('intranet', 'webshop.confirmation_text') . "\n" . $this->contact->getLoginUrl() . "\n\nVenlig hilsen\n" . $this->kernel->intranet->address->get('name'),
+                                'subject' => 'Bekræftelse på bestilling #'.$order_id,
+                                'body' => $this->kernel->setting->get('intranet', 'webshop.confirmation_text')."\n".$this->contact->getLoginUrl()."\n\nVenlig hilsen\n".$this->kernel->intranet->address->get('name'),
                                 'from_email' => $this->kernel->intranet->address->get('email'),
                                 'from_name' => $this->kernel->intranet->address->get('name'),
                                 'type_id' => 12, // webshop