intraface / intraface.dk

src/Intraface/modules/onlinepayment/provider/QuickPay.php

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
      *
      * @param string $action Which action to perform?
      *
-     * @return void
+     * @return boolean
      */
     function transactionAction($action)
     {

Indentation +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 
         return $this->eval;
     }
-    **/
+     **/
 
     /**
      * @todo does what?

Spacing +5 added lines, -5 removed lines

@@ -60,7 +60,7 @@ 
         $this->quickpay = new quickpay;
         $this->quickpay->set_md5checkword($this->settings['md5_secret']);
         $this->quickpay->set_merchant($this->settings['merchant_id']);
-        $this->quickpay->set_curl_certificate(dirname(__FILE__) . '/../../../certificates/cacert.pem');
+        $this->quickpay->set_curl_certificate(dirname(__FILE__).'/../../../certificates/cacert.pem');
 
         // hvordan bliver disse sat - og hvad er det n�jagtigt?
         $this->quickpay->set_posc($this->posc);
@@ -107,7 +107,7 @@ 
 
             // henter bel�bene fra denne onlinebetaling
             $this->quickpay->set_transaction($this->get('transaction_number'));
-            $this->quickpay->set_amount(round($this->get('amount') * 100));
+            $this->quickpay->set_amount(round($this->get('amount')*100));
 
             $this->eval = $this->quickpay->capture();
 
@@ -135,7 +135,7 @@ 
                 return true;
 
             } else {
-                $this->error->set('Betalingen kunne ikke tilbagebetales: ' . $this->eval['qpstatmsg']);
+                $this->error->set('Betalingen kunne ikke tilbagebetales: '.$this->eval['qpstatmsg']);
                 return false;
 
             }
@@ -191,8 +191,8 @@ 
      */
     function getSettings()
     {
-        $this->value['md5_secret'] = 	$this->kernel->setting->get('intranet', 'onlinepayment.quickpay.md5_secret');
-        $this->value['merchant_id'] = 	$this->kernel->setting->get('intranet', 'onlinepayment.quickpay.merchant_id');
+        $this->value['md5_secret'] = $this->kernel->setting->get('intranet', 'onlinepayment.quickpay.md5_secret');
+        $this->value['merchant_id'] = $this->kernel->setting->get('intranet', 'onlinepayment.quickpay.merchant_id');
         return $this->value;
     }
 

src/Intraface/modules/procurement/Procurement.php

Doc Comments +2 added lines, -2 removed lines

@@ -689,7 +689,7 @@ 
      *
      * @todo: duplicate in Procurement class
      *
-     * @return array status types
+     * @return string[] status types
      */
     private function getStatusTypes()
     {
@@ -704,7 +704,7 @@ 
      * returns the possible regions where procurement is bought
      * @todo: duplicate in Procurement class
      *
-     * @return array possible regions
+     * @return string[] possible regions
      */
     public function getRegionTypes()
     {

Indentation +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 
     function loadItem($id = 0)
     {
-         $this->item = new ProcurementItem($this, (int)$id);
+            $this->item = new ProcurementItem($this, (int)$id);
     }
 
     function update($input)

Spacing +24 added lines, -24 removed lines

@@ -102,13 +102,13 @@ 
         $this->value["from_region"] = $region_types[$db->f("from_region_key")];
 
         $this->value["price_items"] = $db->f("price_items");
-        $this->value["dk_price_items"] = number_format($db->f("price_items"), 2, ",",".");
+        $this->value["dk_price_items"] = number_format($db->f("price_items"), 2, ",", ".");
         $this->value["price_shipment_etc"] = $db->f("price_shipment_etc");
-        $this->value["dk_price_shipment_etc"] = number_format($this->value["price_shipment_etc"], 2, ",",".");
+        $this->value["dk_price_shipment_etc"] = number_format($this->value["price_shipment_etc"], 2, ",", ".");
         $this->value["vat"] = $db->f("vat");
-        $this->value["dk_vat"] = number_format($db->f("vat"), 2, ",",".");
+        $this->value["dk_vat"] = number_format($db->f("vat"), 2, ",", ".");
         $this->value["total_price"] = round($this->value["price_items"] + $this->value["price_shipment_etc"] + $this->value["vat"], 2);
-        $this->value["dk_total_price"] = number_format($this->value["total_price"], 2, ",",".");
+        $this->value["dk_total_price"] = number_format($this->value["total_price"], 2, ",", ".");
 
         $this->value["status_key"] = $db->f("status_key");
         $types = $this->getStatusTypes();
@@ -258,7 +258,7 @@ 
             throw new Exception("Ugyldigt status: ".$status);
         }
 
-        switch($status) {
+        switch ($status) {
             case "ordered":
                 $sql = "";
                 break;
@@ -415,7 +415,7 @@ 
         }
 
 
-        $text = $translation->get('procurement').'# ' . $this->get('number') . ': ' . $this->get('description');
+        $text = $translation->get('procurement').'# '.$this->get('number').': '.$this->get('description');
         require_once 'Intraface/modules/accounting/Voucher.php';
         $voucher = Voucher::factory($year, $voucher_number);
         $voucher->save(array(
@@ -434,7 +434,7 @@ 
             $credit_total += $amount;
 
             if (!empty($line['text'])) {
-                $line_text = $text. ' - ' . $line['text'];
+                $line_text = $text.' - '.$line['text'];
             } else {
                 $line_text = $text;
             }
@@ -489,7 +489,7 @@ 
             $voucher_date->convert2db();
         }
 
-        $db->query("UPDATE procurement SET date_stated = '".$voucher_date->get()."', voucher_id = ".intval($voucher_number)." WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("UPDATE procurement SET date_stated = '".$voucher_date->get()."', voucher_id = ".intval($voucher_number)." WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         return 1;
     }
 
@@ -572,16 +572,16 @@ 
         $total = 0;
         $vat = 0;
         foreach ($debet_accounts AS $key => $debet_account) {
-            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', 'greater_than_zero')) {
+            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje '.($key + 1).' "'.$debet_account['text'].'"', 'greater_than_zero')) {
 
                 $amount = new Intraface_Amount($debet_account['amount']);
                 $amount->convert2db();
                 $total += $amount->get();
 
-                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', '', 'allow_empty');
+                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje '.($key + 1).' "'.$debet_account['text'].'"', '', 'allow_empty');
 
-                if (empty($debet_account['state_account_id']) ) {
-                    $this->error->set('Linje ' . ($key + 1) . ' "' . $debet_account['text'] . '" ved ikke hvor den skal bogføres');
+                if (empty($debet_account['state_account_id'])) {
+                    $this->error->set('Linje '.($key + 1).' "'.$debet_account['text'].'" ved ikke hvor den skal bogføres');
                 } else {
                     require_once 'Intraface/modules/accounting/Account.php';
                     $account = Account::factory($year, $debet_account['state_account_id']);
@@ -589,9 +589,9 @@ 
                     // @todo check this. I changed it to make sure that we are able to state varekøb til videresalg
                     // || $account->get('type') != 'operating'
                     if ($account->get('id') == 0) {
-                        $this->error->set('Ugyldig konto for bogføring af linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"');
+                        $this->error->set('Ugyldig konto for bogføring af linje '.($key + 1).' "'.$debet_account['text'].'"');
                     } elseif ($account->get('vat') == 'in') {
-                        $vat += $amount->get() / 100 * $account->get('vat_percent');
+                        $vat += $amount->get()/100*$account->get('vat_percent');
                     }
                 }
             }
@@ -608,8 +608,8 @@ 
             }
 
             if (round($vat, 2) != $this->get('vat')) {
-                $expected = number_format($this->get('vat') * 4, 2, ',', '.');
-                $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede '.number_format($vat, 2, ',', '.').' i moms og det samlede beløb burde have været ' . $expected . '). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
+                $expected = number_format($this->get('vat')*4, 2, ',', '.');
+                $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede '.number_format($vat, 2, ',', '.').' i moms og det samlede beløb burde have været '.$expected.'). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
             }
         }
 
@@ -638,16 +638,16 @@ 
         $total = 0;
         $vat = 0;
         foreach ($debet_accounts AS $key => $debet_account) {
-            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', 'greater_than_zero')) {
+            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje '.($key + 1).' "'.$debet_account['text'].'"', 'greater_than_zero')) {
 
                 $amount = new Intraface_Amount($debet_account['amount']);
                 $amount->convert2db();
                 $total += $amount->get();
 
-                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', '', 'allow_empty');
+                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje '.($key + 1).' "'.$debet_account['text'].'"', '', 'allow_empty');
 
-                if (empty($debet_account['state_account_id']) ) {
-                    $this->error->set('Linje ' . ($key + 1) . ' "' . $debet_account['text'] . '" ved ikke hvor den skal bogføres');
+                if (empty($debet_account['state_account_id'])) {
+                    $this->error->set('Linje '.($key + 1).' "'.$debet_account['text'].'" ved ikke hvor den skal bogføres');
                 } else {
                     require_once 'Intraface/modules/accounting/Account.php';
                     $account = Account::factory($year, $debet_account['state_account_id']);
@@ -655,9 +655,9 @@ 
                     // @todo check this. I changed it to make sure that we are able to state varekøb til videresalg
                     // || $account->get('type') != 'operating'
                     if ($account->get('id') == 0) {
-                        $this->error->set('Ugyldig konto for bogføring af linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"');
+                        $this->error->set('Ugyldig konto for bogføring af linje '.($key + 1).' "'.$debet_account['text'].'"');
                     } elseif ($account->get('vat') == 'in') {
-                        $vat += $amount->get() / 100 * $account->get('vat_percent');
+                        $vat += $amount->get()/100*$account->get('vat_percent');
                     }
                 }
             }
@@ -674,8 +674,8 @@ 
 
         if (round($vat, 2) != $this->get('vat')) {
             $expected_vat = number_format($vat, 2, ',', '.');
-            $expected_value = number_format($this->get('vat') * 4, 2, ',', '.');
-            $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede ' . $expected_vat . ' i moms og det samlede beløb burde have været ' . $expected_value . '). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
+            $expected_value = number_format($this->get('vat')*4, 2, ',', '.');
+            $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede '.$expected_vat.' i moms og det samlede beløb burde have været '.$expected_value.'). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
         }
         
         if ($this->error->isError()) {

src/Intraface/modules/procurement/ProcurementGateway.php

Doc Comments +2 added lines, -2 removed lines

@@ -182,7 +182,7 @@ 
      * returns possible status types
      * @todo: duplicate in Procurement class
      *
-     * @return array status types
+     * @return string[] status types
      */
     public function getStatusTypes()
     {
@@ -197,7 +197,7 @@ 
      * returns the possible regions where procurement is bought
      * @todo: duplicate in Procurement class
      *
-     * @return array possible regions
+     * @return string[] possible regions
      */
     public function getRegionTypes()
     {

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
     function setNewContactId($old_id, $new_id)
     {
         $db = MDB2::singleton();
-        $db->query('UPDATE procurement SET contact_id = ' . $new_id . ' WHERE contact_id = ' . $old_id);
+        $db->query('UPDATE procurement SET contact_id = '.$new_id.' WHERE contact_id = '.$old_id);
     }
 
     function find()
@@ -81,7 +81,7 @@ 
                 $this->dbquery->setCondition("status_key < 1 OR (status_key = 1 AND paid_date = \"0000-00-00\")");
             } else {
                 if ($this->dbquery->checkFilter("to_date")) {
-                    switch($this->dbquery->getFilter("status")) {
+                    switch ($this->dbquery->getFilter("status")) {
                         case "0":
                             $to_date_field = "date_created";
                             break;
@@ -146,7 +146,7 @@ 
 
             $list[$i]["contact_id"] = $db->f("contact_id");
 
-            $list[$i]["total_price"] = round($db->f("price_items") + $db->f("price_shipment_etc") + $db->f("vat"), 2);;
+            $list[$i]["total_price"] = round($db->f("price_items") + $db->f("price_shipment_etc") + $db->f("vat"), 2); ;
 
             $i++;
         }
@@ -157,14 +157,14 @@ 
     function any()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM procurement WHERE intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT id FROM procurement WHERE intranet_id = ".$this->kernel->intranet->get('id'));
         return $db->numRows();
     }
 
     function anyByContact($contact_id)
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM procurement WHERE intranet_id = " . $this->kernel->intranet->get('id')." AND contact_id = ".$contact_id." AND active = 1");
+        $db->query("SELECT id FROM procurement WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND contact_id = ".$contact_id." AND active = 1");
         return $db->numRows();
     }
 
@@ -213,7 +213,7 @@ 
     {
         $sql = "SELECT id
                 FROM procurement
-                WHERE intranet_id = " . $this->kernel->intranet->get("id") . "
+                WHERE intranet_id = " . $this->kernel->intranet->get("id")."
                     AND contact_id = ".(int)$contact_id."
                     AND active = 1";
 

src/Intraface/modules/procurement/ProcurementItem.php

Doc Comments +4 added lines, -2 removed lines

@@ -57,7 +57,9 @@ 
      * Constructor

      *

      * @param object Procurement

-     * @param integer item id

+     * @param integer item id
+     * @param Procurement $procurement
+     * @param integer $id

      * @return void

      */

     public function __construct($procurement, $id)

@@ -201,7 +203,7 @@ 
     /**

      * Gets the tax percent on the individual product

      *

-     * @return float

+     * @return integer

      */

     public function getProductTaxPercent()

     {

Indentation +2 added lines, -2 removed lines

@@ -234,7 +234,7 @@ 
             $product = new Product($this->procurement->kernel, $input["product_id"], $input['product_detail_id']);

 

             if (!is_object($product) || $product->get('id') == 0) {

-                 $this->error->set("Ugyldigt produkt");

+                    $this->error->set("Ugyldigt produkt");

             } else {

                 $product_detail_id = $product->get("detail_id");

             }

@@ -346,7 +346,7 @@ 
         $product = new Product($this->procurement->kernel, $product_id);

 

         if (!is_object($product) || $product->get('id') == 0) {

-             throw new Excetion('Invalid product id');

+                throw new Excetion('Invalid product id');

         } else {

             $product_detail_id = $product->get("detail_id");

         }

Spacing +25 added lines, -25 removed lines

@@ -64,7 +64,7 @@ 
     {

         $this->procurement = $procurement;

         $this->error = new Intraface_Error;

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

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

 

         if ($this->id > 0) {

             $this->load();

@@ -86,7 +86,7 @@ 
 

         $db->query("SELECT procurement_item.* FROM procurement_item

                     INNER JOIN procurement ON procurement_item.procurement_id = procurement.id

-                    WHERE procurement_item.id = " . $this->id . " AND procurement.id = " . $this->procurement->get('id') . " AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id"));

+                    WHERE procurement_item.id = " . $this->id." AND procurement.id = ".$this->procurement->get('id')." AND procurement_item.intranet_id = ".$this->procurement->kernel->intranet->get("id"));

         if ($db->nextRecord()) {

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

             $this->value["product_id"] = $db->f("product_id");

@@ -282,20 +282,20 @@ 
             exit;

         }

 

-        $sql = "product_id = " . $product->getId() . ",

-                product_detail_id = " . $product_detail_id . ",

-                product_variation_id = " . $variation_id . ",

-                product_variation_detail_id = " . $variation_detail_id . ",

-                quantity = " . $input["quantity"] . ",

+        $sql = "product_id = ".$product->getId().",

+                product_detail_id = " . $product_detail_id.",

+                product_variation_id = " . $variation_id.",

+                product_variation_detail_id = " . $variation_detail_id.",

+                quantity = " . $input["quantity"].",

                 unit_purchase_price = " . $input["unit_purchase_price"];

 

         $db = new DB_Sql;

 

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

-            $db->query("INSERT INTO procurement_item SET " . $sql . ", intranet_id = " . $this->procurement->kernel->intranet->get("id") . ", procurement_id = " . $this->procurement->get("id") . ", active = 1");

+            $db->query("INSERT INTO procurement_item SET ".$sql.", intranet_id = ".$this->procurement->kernel->intranet->get("id").", procurement_id = ".$this->procurement->get("id").", active = 1");

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

         } else {

-            $db->query("UPDATE procurement_item SET " . $sql . " WHERE id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id") . " AND intranet_id = " . $this->procurement->kernel->intranet->get("id"));

+            $db->query("UPDATE procurement_item SET ".$sql." WHERE id = ".$this->id." AND procurement_id = ".$this->procurement->get("id")." AND intranet_id = ".$this->procurement->kernel->intranet->get("id"));

         }

 

         return $this->id;

@@ -322,10 +322,10 @@ 
             return false;

         }

 

-        $sql = "unit_purchase_price = " . $unit_purchase_price->get();

+        $sql = "unit_purchase_price = ".$unit_purchase_price->get();

 

         $db = new DB_Sql;

-        $db->query("UPDATE procurement_item SET " . $sql . " WHERE id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id") . " AND intranet_id = " . $this->procurement->kernel->intranet->get("id"));

+        $db->query("UPDATE procurement_item SET ".$sql." WHERE id = ".$this->id." AND procurement_id = ".$this->procurement->get("id")." AND intranet_id = ".$this->procurement->kernel->intranet->get("id"));

         return true;

     }

 

@@ -375,7 +375,7 @@ 
             product_variation_detail_id = ".$variation_detail_id;

 

         $db = new DB_Sql;

-        $db->query("UPDATE procurement_item SET " . $sql . " WHERE id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id") . " AND intranet_id = " . $this->procurement->kernel->intranet->get("id"));

+        $db->query("UPDATE procurement_item SET ".$sql." WHERE id = ".$this->id." AND procurement_id = ".$this->procurement->get("id")." AND intranet_id = ".$this->procurement->kernel->intranet->get("id"));

 

         return true;

     }

@@ -387,7 +387,7 @@ 
     public function delete()

     {

         $db = new DB_Sql;

-        $db->query("UPDATE procurement_item SET active = 0 WHERE intranet_id = " . $this->procurement->kernel->intranet->get('id') . " AND id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id"));

+        $db->query("UPDATE procurement_item SET active = 0 WHERE intranet_id = ".$this->procurement->kernel->intranet->get('id')." AND id = ".$this->id." AND procurement_id = ".$this->procurement->get("id"));

         $this->id = 0;

 

         return 1;

@@ -401,13 +401,13 @@ 
     public function getList()

     {

         $db = new DB_Sql;

-        $db->query("SELECT * FROM procurement_item WHERE active = 1 AND intranet_id = " . $this->procurement->kernel->intranet->get("id") . " AND procurement_id = " . $this->procurement->get("id") . " ORDER BY id ASC");

+        $db->query("SELECT * FROM procurement_item WHERE active = 1 AND intranet_id = ".$this->procurement->kernel->intranet->get("id")." AND procurement_id = ".$this->procurement->get("id")." ORDER BY id ASC");

         $i = 0;

-        $item = array ();

+        $item = array();

 

         if ($this->procurement->get("price_items") > 0) {

             // calculates shipment etc per item price kr

-            $calculated = $this->procurement->get("price_shipment_etc") / $this->procurement->get("price_items");

+            $calculated = $this->procurement->get("price_shipment_etc")/$this->procurement->get("price_items");

         } else {

             $calculated = 0;

         }

@@ -423,17 +423,17 @@ 
                 $item[$i]["unit"] = $unit['plural'];

             }

             $item[$i]["unit_purchase_price"] = $db->f("unit_purchase_price");

-            $item[$i]["calculated_unit_price"] = $db->f("unit_purchase_price") + $db->f("unit_purchase_price") * $calculated;

+            $item[$i]["calculated_unit_price"] = $db->f("unit_purchase_price") + $db->f("unit_purchase_price")*$calculated;

             $item[$i]["quantity"] = $db->f("quantity");

             $item[$i]["vat"] = $product->get("vat");

             $item[$i]["product_id"] = $product->get("id");

-            $item[$i]["amount"] = $db->f("quantity") * $db->f("unit_purchase_price");

+            $item[$i]["amount"] = $db->f("quantity")*$db->f("unit_purchase_price");

 

             if ($product->get('has_variation')) {

                 $variation = $product->getVariation($db->f('product_variation_id'));

                 $detail = $variation->getDetail($db->f('product_variation_detail_id'));

                 $item[$i]["name"] = $product->get("name").' - '.$variation->getName();

-                $item[$i]["number"]= $product->get("number").'.'.$variation->getNumber();

+                $item[$i]["number"] = $product->get("number").'.'.$variation->getNumber();

                 $item[$i]["price"] = $detail->getPrice($product);

 

             } else {

@@ -452,7 +452,7 @@ 
      */

     public function getQuantity($status, $product_id, $product_variation_id, $from_date = "")

     {

-        if (!in_array($status, array (

+        if (!in_array($status, array(

                 'ordered',

                 'delivered'

             ))) {

@@ -466,8 +466,8 @@ 
                         FROM procurement_item INNER JOIN procurement

                             ON procurement_item.procurement_id = procurement.id

                         WHERE procurement_item.active = 1 AND procurement.active = 1

-                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id") . " AND procurement.intranet_id = " . $this->procurement->kernel->intranet->get("id") . "

-                            AND procurement_item.product_id = " . $product_id . " AND procurement.status_key = 0

+                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id")." AND procurement.intranet_id = ".$this->procurement->kernel->intranet->get("id")."

+                            AND procurement_item.product_id = " . $product_id." AND procurement.status_key = 0

                             AND procurement_item.product_variation_id = ".$product_variation_id);

             $db->nextRecord(); // a post will always be present

             return intval($db->f("on_order"));

@@ -477,11 +477,11 @@ 
                         FROM procurement_item INNER JOIN procurement

                             ON procurement_item.procurement_id = procurement.id

                         WHERE procurement_item.active = 1 AND procurement.active = 1

-                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id") . " AND procurement.intranet_id = " . $this->procurement->kernel->intranet->get("id") . "

-                            AND procurement_item.product_id = " . $product_id . "

+                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id")." AND procurement.intranet_id = ".$this->procurement->kernel->intranet->get("id")."

+                            AND procurement_item.product_id = " . $product_id."

                             AND procurement_item.product_variation_id = ".$product_variation_id."

                             AND procurement.status_key = 1

-                            AND procurement.date_recieved > \"" . $from_date . "\"");

+                            AND procurement.date_recieved > \"" . $from_date."\"");

             $db->nextRecord(); // a post will always be present

             return intval($db->f("stock_in"));

         }

src/Intraface/modules/product/Attribute/Group/Gateway.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      * @todo $doctrine should not be optional
      * 
      * @param object $doctrine Doctrine_Connection 
-     * @return void
+     * @return integer
      */
     public function __construct($doctrine = NULL) 
     {

src/Intraface/modules/product/Gateway.php

Doc Comments +1 added lines, -3 removed lines

@@ -36,7 +36,6 @@ 
     /**
      * Constructor
      *
-     * @param object  $user                Userobject
      *
      * @return void
      */
@@ -77,9 +76,8 @@ 
     /**
      * Finds a product with an id
      *
-     * @param integer $id product id
      *
-     * @return object
+     * @return Product
      */
     function getById($product_id, $old_product_detail_id = 0)
     {

Indentation +1 added lines, -2 removed lines

@@ -51,7 +51,6 @@ 
 
     /**
      * Creates the dbquery object
-
      * @return void
      */
     public function getDBQuery()
@@ -168,7 +167,7 @@ 
             case 'all': // fall through
             default:
                 $sql = '';
-             break;
+                break;
         }
 
         $i        = 0; // til at give arrayet en key

Spacing +3 added lines, -3 removed lines

@@ -138,8 +138,8 @@ 
                 'INNER',
                 'ilib_category',
                 'ilib_category_append.category_id = ilib_category.id',
-                'ilib_category.intranet_id = '.$this->kernel->intranet->getId(). ' ' .
-                    'AND ilib_category.belong_to = '.$category_type->getBelongTo().' ' .
+                'ilib_category.intranet_id = '.$this->kernel->intranet->getId().' '.
+                    'AND ilib_category.belong_to = '.$category_type->getBelongTo().' '.
                     'AND ilib_category.belong_to_id = '.$category_type->getBelongToId());
 
             $this->getDBQuery()->setCondition('ilib_category.id = '.$this->getDBQuery()->getFilter("category"));
@@ -207,7 +207,7 @@ 
 
             // den her skal vist lige kigges igennem, for den tager jo alt med p� nettet?
             // 0 = only stock
-            if ($this->kernel->setting->get('intranet', 'webshop.show_online') == 0 AND $which=='webshop') { // only stock
+            if ($this->kernel->setting->get('intranet', 'webshop.show_online') == 0 AND $which == 'webshop') { // only stock
                 if (array_key_exists('for_sale', $products[$i]['stock_status']) AND $products[$i]['stock_status']['for_sale'] <= 0) {
                     continue;
                 }

src/Intraface/modules/product/Product.php

Doc Comments +3 added lines, -4 removed lines

@@ -594,7 +594,7 @@ 
      *
      * @deprecated
      *
-     * @return object
+     * @return Keyword
      */
     public function getKeywords()
     {
@@ -604,7 +604,7 @@ 
     /**
      * Get keywords object
      *
-     * @return object
+     * @return Keyword
      */
     public function getKeyword()
     {
@@ -660,7 +660,6 @@ 
     /**
      * Delete all related product
      *
-     * @param integer $id     Product id to relate to this product
      *
      * @return boolean
      */
@@ -1040,7 +1039,7 @@ 
     /**
      * Gets the details
      *
-     * @return object
+     * @return ProductDetail
      */
     function getDetails()
     {

Indentation +3 added lines, -4 removed lines

@@ -115,7 +115,6 @@ 
 
     /**
      * Creates the dbquery object
-
      * @return void
      */
     public function getDBQuery()
@@ -223,7 +222,7 @@ 
 
     function getKernel()
     {
-    	return $this->kernel;
+        return $this->kernel;
     }
 
     /**
@@ -572,7 +571,7 @@ 
         $product_number = (int)$product_number;
 
         $db = new DB_Sql;
-         $sql = "SELECT product.id FROM product
+            $sql = "SELECT product.id FROM product
           INNER JOIN product_detail detail
             ON product.id = detail.product_id
             WHERE detail.number = '" . $product_number . "'
@@ -814,7 +813,7 @@ 
                     "AND product_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " .
                 "WHERE product_x_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " .
                     "AND product_x_attribute_group.product_id=" . $this->getId()  . " " .
-                 "ORDER BY product_attribute_group.id");
+                    "ORDER BY product_attribute_group.id");
 
         if (PEAR::isError($result)) {
             throw new Exception('Error in query :'.$result->getUserInfo());

Spacing +31 added lines, -31 removed lines

@@ -146,8 +146,8 @@ 
     public function load()
     {
         $this->db->query("SELECT id, active, locked, changed_date, ".implode(',', $this->fields)." FROM product
-                WHERE intranet_id = " . $this->kernel->intranet->getId() . "
-                    AND id = " . $this->id . " LIMIT 1");
+                WHERE intranet_id = " . $this->kernel->intranet->getId()."
+                    AND id = " . $this->id." LIMIT 1");
 
         if (!$this->db->nextRecord()) {
             $this->value['id'] = 0;
@@ -399,13 +399,13 @@ 
 
         if ($this->id > 0) {
             $sql_type = "UPDATE ";
-            $sql_end  = " WHERE id = " . $this->id . " AND intranet_id = " . $this->intranet->getId();
+            $sql_end  = " WHERE id = ".$this->id." AND intranet_id = ".$this->intranet->getId();
         } else {
             $sql_type = "INSERT INTO";
-            $sql_end  = ", intranet_id = " . $this->intranet->getId();
+            $sql_end  = ", intranet_id = ".$this->intranet->getId();
         }
 
-        $this->db->query($sql_type . " product SET ".$sql." changed_date = NOW()"	 . $sql_end);
+        $this->db->query($sql_type." product SET ".$sql." changed_date = NOW()".$sql_end);
 
         if (empty($this->id)) {
             $this->id = $this->db->insertedId();
@@ -438,7 +438,7 @@ 
 
         $new_id = $product->save(
             array(
-                'name' => $this->get('name') . ' (kopi)',
+                'name' => $this->get('name').' (kopi)',
                 'description' => $this->get('description'),
                 'price' => amountToForm($this->get('price')), // make sure that this is formatted to local format
                 'weight' => (float)$this->get('weight'),
@@ -508,8 +508,8 @@ 
         $db = new Db_Sql;
         $sql = "UPDATE product
             SET active = 0
-            WHERE id = " . $this->id. "
-                AND intranet_id = " . $this->intranet->getId() . "
+            WHERE id = " . $this->id."
+                AND intranet_id = " . $this->intranet->getId()."
                 AND locked = 0";
         $db->query($sql);
 
@@ -532,7 +532,7 @@ 
         $db = new Db_Sql;
         $sql = "UPDATE product
             SET active = 1
-            WHERE id = " . $this->id. "
+            WHERE id = " . $this->id."
                 AND intranet_id = " . $this->intranet->getId();
         $db->query($sql);
         $this->value['active'] = 1;
@@ -551,7 +551,7 @@ 
             FROM product
             INNER JOIN product_detail
                 ON product_detail.product_id = product.id
-            WHERE product.intranet_id = " . $this->intranet->getId() . "
+            WHERE product.intranet_id = " . $this->intranet->getId()."
             ORDER BY product_detail.number DESC LIMIT 1";
         $db->query($sql);
         if (!$db->nextRecord()) {
@@ -575,8 +575,8 @@ 
          $sql = "SELECT product.id FROM product
           INNER JOIN product_detail detail
             ON product.id = detail.product_id
-            WHERE detail.number = '" . $product_number . "'
-                AND detail.product_id <> " . $this->id . "
+            WHERE detail.number = '" . $product_number."'
+                AND detail.product_id <> " . $this->id."
                 AND detail.active = 1
                 AND product.active=1
                 AND product.intranet_id = ".$this->intranet->getId()." LIMIT 1";
@@ -632,13 +632,13 @@ 
         $db = new DB_Sql;
 
         if ($status == 'relate') {
-            $db->query("SELECT * FROM product_related WHERE product_id=" . $this->id  . " AND related_product_id = " . (int)$id . " AND intranet_id =" .$this->intranet->getId());
+            $db->query("SELECT * FROM product_related WHERE product_id=".$this->id." AND related_product_id = ".(int)$id." AND intranet_id =".$this->intranet->getId());
             if ($db->nextRecord()) return true;
             if ($id == $this->id) return false;
-            $db->query("INSERT INTO product_related SET product_id = " . $this->id . ", related_product_id = " . (int)$id . ", intranet_id = " . $this->intranet->getId());
+            $db->query("INSERT INTO product_related SET product_id = ".$this->id.", related_product_id = ".(int)$id.", intranet_id = ".$this->intranet->getId());
             return true;
         } else {
-            $db->query("DELETE FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId() . " AND related_product_id = " . (int)$id);
+            $db->query("DELETE FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId()." AND related_product_id = ".(int)$id);
             return true;
         }
     }
@@ -653,7 +653,7 @@ 
     public function deleteRelatedProduct($id)
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId() . " AND related_product_id = " . (int)$id);
+        $db->query("DELETE FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId()." AND related_product_id = ".(int)$id);
         return true;
     }
 
@@ -667,7 +667,7 @@ 
     public function deleteRelatedProducts()
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId());
+        $db->query("DELETE FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId());
         return true;
     }
 
@@ -682,12 +682,12 @@ 
         $key      = 0;
         $ids      = array();
         $db       = new DB_Sql;
-        $sql      = "SELECT related_product_id FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId();
+        $sql      = "SELECT related_product_id FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId();
         $db->query($sql);
 
         // r�kkef�lgen er vigtig - f�rst hente fra product og bagefter tilf�je nye v�rdier til arrayet
         while ($db->nextRecord()) {
-            $product                      = new Product($this->kernel, $db->f('related_product_id'));
+            $product = new Product($this->kernel, $db->f('related_product_id'));
             if ($product->get('id') == 0 || $product->get('active') == 0 || ($show == 'webshop' && $product->get('do_show') == 0)) {
                 CONTINUE;
             }
@@ -722,7 +722,7 @@ 
             }
             // den her skal vist lige kigges igennem, for den tager jo alt med p� nettet?
             // 0 = only stock
-            if ($this->kernel->setting->get('intranet', 'webshop.show_online') == 0 AND !empty($which) AND $which=='webshop') { // only stock
+            if ($this->kernel->setting->get('intranet', 'webshop.show_online') == 0 AND !empty($which) AND $which == 'webshop') { // only stock
                 if (array_key_exists('for_sale', $products[$key]['stock_status']) AND $products[$key]['stock_status']['for_sale'] <= 0) {
                     continue;
                 }
@@ -752,13 +752,13 @@ 
         }
 
         $db = MDB2::singleton(DB_DSN);
-        $result = $db->query("SELECT id FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=" . $this->getId()  . " AND product_attribute_group_id = " . (int)$id );
+        $result = $db->query("SELECT id FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=".$this->getId()." AND product_attribute_group_id = ".(int)$id);
         if (PEAR::isError($result)) {
             throw new Exception('Error in query :'.$result->getUserInfo());
         }
 
         if ($result->numRows() > 0) return true;
-        $result = $db->exec("INSERT INTO product_x_attribute_group SET product_id = " . $this->getId() . ", product_attribute_group_id = " . (int)$id . ", intranet_id = " . $this->intranet->getId());
+        $result = $db->exec("INSERT INTO product_x_attribute_group SET product_id = ".$this->getId().", product_attribute_group_id = ".(int)$id.", intranet_id = ".$this->intranet->getId());
         if (PEAR::isError($result)) {
             throw new Exception('Error in insert :'.$result->getUserInfo());
         }
@@ -780,7 +780,7 @@ 
         }
 
         $db = MDB2::singleton(DB_DSN);
-        $result = $db->exec("DELETE FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=" . $this->getId()  . " AND product_attribute_group_id = " . (int)$id );
+        $result = $db->exec("DELETE FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=".$this->getId()." AND product_attribute_group_id = ".(int)$id);
         if (PEAR::isError($result)) {
             throw new Exception('Error in query :'.$result->getUserInfo());
         }
@@ -808,12 +808,12 @@ 
         // NOTE: Very important that it is ordered by product_attribute_group.id so the groups
         // does always get attached to the correct attribute number on the variation. Se above todo in method doc
         $db = MDB2::singleton(DB_DSN);
-        $result = $db->query("SELECT product_attribute_group.* FROM product_x_attribute_group " .
-                "INNER JOIN product_attribute_group " .
-                    "ON product_x_attribute_group.product_attribute_group_id = product_attribute_group.id " .
-                    "AND product_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " .
-                "WHERE product_x_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " .
-                    "AND product_x_attribute_group.product_id=" . $this->getId()  . " " .
+        $result = $db->query("SELECT product_attribute_group.* FROM product_x_attribute_group ".
+                "INNER JOIN product_attribute_group ".
+                    "ON product_x_attribute_group.product_attribute_group_id = product_attribute_group.id ".
+                    "AND product_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." ".
+                "WHERE product_x_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." ".
+                    "AND product_x_attribute_group.product_id=".$this->getId()." ".
                  "ORDER BY product_attribute_group.id");
 
         if (PEAR::isError($result)) {
@@ -867,7 +867,7 @@ 
     public function isFilledIn()
     {
         $db = new DB_Sql;
-        $db->query("SELECT count(*) AS antal FROM product WHERE intranet_id = " . $this->intranet->getId());
+        $db->query("SELECT count(*) AS antal FROM product WHERE intranet_id = ".$this->intranet->getId());
         if ($db->nextRecord()) {
             return $db->f('antal');
         }
@@ -882,7 +882,7 @@ 
     public function any()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM product WHERE intranet_id = " . $this->intranet->getId()." AND active = 1");
+        $db->query("SELECT id FROM product WHERE intranet_id = ".$this->intranet->getId()." AND active = 1");
         return $db->numRows();
     }
 

Braces +12 added lines, -4 removed lines

@@ -627,14 +627,20 @@ 
      */
     public function setRelatedProduct($id, $status = 'relate')
     {
-        if (empty($status)) $status = 'remove';
+        if (empty($status)) {
+            $status = 'remove';
+        }
 
         $db = new DB_Sql;
 
         if ($status == 'relate') {
             $db->query("SELECT * FROM product_related WHERE product_id=" . $this->id  . " AND related_product_id = " . (int)$id . " AND intranet_id =" .$this->intranet->getId());
-            if ($db->nextRecord()) return true;
-            if ($id == $this->id) return false;
+            if ($db->nextRecord()) {
+                return true;
+            }
+            if ($id == $this->id) {
+                return false;
+            }
             $db->query("INSERT INTO product_related SET product_id = " . $this->id . ", related_product_id = " . (int)$id . ", intranet_id = " . $this->intranet->getId());
             return true;
         } else {
@@ -757,7 +763,9 @@ 
             throw new Exception('Error in query :'.$result->getUserInfo());
         }
 
-        if ($result->numRows() > 0) return true;
+        if ($result->numRows() > 0) {
+            return true;
+        }
         $result = $db->exec("INSERT INTO product_x_attribute_group SET product_id = " . $this->getId() . ", product_attribute_group_id = " . (int)$id . ", intranet_id = " . $this->intranet->getId());
         if (PEAR::isError($result)) {
             throw new Exception('Error in insert :'.$result->getUserInfo());

src/Intraface/modules/product/Product/Details.php

Doc Comments +2 added lines, -2 removed lines

@@ -207,7 +207,7 @@ 
      * Returns the price of the product in given currency
      *
      * @param object $currency Intraface_modules_currency_Currency
-     * @param integer $exchange_rage_id
+     * @param integer $exchange_rate_id
      *
      * @return obejct Ilib_Variable_Float with price of the variation in given currency
      */
@@ -257,7 +257,7 @@ 
      * Returns the before price of the product in given currency
      *
      * @param object $currency Intraface_modules_currency_Currency
-     * @param integer $exchange_rage_id
+     * @param integer $exchange_rate_id
      *
      * @return obejct Ilib_Variable_Float with price of the variation in given currency
      */

Indentation +12 added lines, -12 removed lines

@@ -319,23 +319,23 @@
     {
         $units = array(
             1 => array('singular' => '',
-                      'plural' => '',
-                      'combined' => ''),
+                        'plural' => '',
+                        'combined' => ''),
             2 => array('singular' => 'unit',
-                      'plural' => 'units',
-                      'combined' => 'unit(s)'),
+                        'plural' => 'units',
+                        'combined' => 'unit(s)'),
             3 => array('singular' => 'day',
-                      'plural' => 'days',
-                      'combined' => 'day(s)'),
+                        'plural' => 'days',
+                        'combined' => 'day(s)'),
             4 => array('singular' => 'month (singular)',
-                      'plural' => 'month (plural)',
-                      'combined' => 'month (combined)'),
+                        'plural' => 'month (plural)',
+                        'combined' => 'month (combined)'),
             5 => array('singular' => 'year',
-                      'plural' => 'years',
-                      'combined' => 'year(s)'),
+                        'plural' => 'years',
+                        'combined' => 'year(s)'),
             6 => array('singular' => 'hour',
-                      'plural' => 'hours',
-                      'combined' => 'hour(s)')
+                        'plural' => 'hours',
+                        'combined' => 'hour(s)')
         );
 
         if ($key === null) {

Spacing +10 added lines, -10 removed lines

@@ -74,15 +74,15 @@ 
             //->innerJoin('Intraface_modules_product_ProductDoctrine.details AS details')
             //->addWhere('active = 1')
             ->addWhere('active = 1')
-            ->addWhere('number = ' . $this->number)
-            ->addWhere('intranet_id = ' . $this->intranet_id)
-            ->addWhere('product_id <> ' . $product_id);
+            ->addWhere('number = '.$this->number)
+            ->addWhere('intranet_id = '.$this->intranet_id)
+            ->addWhere('product_id <> '.$product_id);
 
         // not necessary to execute query when counting
         //$collection = $dql->execute();
 
         if ($dql->count() > 0) {
-            $this->getErrorStack()->add('number', $this->number . ' has already been added');
+            $this->getErrorStack()->add('number', $this->number.' has already been added');
         }
 
         return true;
@@ -213,7 +213,7 @@ 
      */
     public function getPriceInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->getPrice()->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100) , 2));
+        return new Ilib_Variable_Float(round($this->getPrice()->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2));
     }
 
     /**
@@ -223,7 +223,7 @@ 
      */
     public function getPriceIncludingVat()
     {
-        return new Ilib_Variable_Float($this->getPrice()->getAsIso(2) * (1 + $this->getVatPercent()->getAsIso()/100));
+        return new Ilib_Variable_Float($this->getPrice()->getAsIso(2)*(1 + $this->getVatPercent()->getAsIso()/100));
     }
 
     /**
@@ -235,7 +235,7 @@ 
      */
     public function getPriceIncludingVatInCurrency($currency, $exchange_rate_id)
     {
-        return new Ilib_Variable_Float($this->getPriceIncludingVat()->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100));
+        return new Ilib_Variable_Float($this->getPriceIncludingVat()->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100));
     }
 
     public function setBeforePrice(Ilib_Variable_Float $value)
@@ -263,7 +263,7 @@ 
      */
     public function getBeforePriceInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->getBeforePrice($product)->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100) , 2));
+        return new Ilib_Variable_Float(round($this->getBeforePrice($product)->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2));
     }
 
     /**
@@ -273,7 +273,7 @@ 
      */
     public function getBeforePriceIncludingVat()
     {
-        return new Ilib_Variable_Float($this->getBeforePrice()->getAsIso(2) * (1 + $this->getVatPercent()->getAsIso()/100));
+        return new Ilib_Variable_Float($this->getBeforePrice()->getAsIso(2)*(1 + $this->getVatPercent()->getAsIso()/100));
     }
 
     /**
@@ -285,7 +285,7 @@ 
      */
     public function getBeforePriceIncludingVatInCurrency($currency, $exchange_rate_id)
     {
-        return new Ilib_Variable_Float($this->getBeforePriceIncludingVat()->getAsIso() / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100));
+        return new Ilib_Variable_Float($this->getBeforePriceIncludingVat()->getAsIso()/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100));
     }
 
     /**

src/Intraface/modules/product/ProductDetail.php

Doc Comments +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
     /**
      * Constructor
      *
-     * @param object  $product       Product object
+     * @param Product  $product       Product object
      * @param integer $old_detail_id Only used with old product details
      *
      * @return void
@@ -155,7 +155,7 @@ 
      *
      * @param array $array_var An array with data to save, @see $this->fields
      *
-     * @return integer
+     * @return boolean
      */
     public function save($array_var)
     {

Indentation +18 added lines, -18 removed lines

@@ -332,24 +332,24 @@
     public static function getUnits($key = null)
     {
         $units = array(1 => array('singular' => '',
-                                  'plural' => '',
-                                  'combined' => ''),
-                       2 => array('singular' => 'unit',
-                                  'plural' => 'units',
-                                  'combined' => 'unit(s)'),
-                       3 => array('singular' => 'day',
-                                  'plural' => 'days',
-                                  'combined' => 'day(s)'),
-                       4 => array('singular' => 'month (singular)',
-                                  'plural' => 'month (plural)',
-                                  'combined' => 'month (combined)'),
-                       5 => array('singular' => 'year',
-                                  'plural' => 'years',
-                                  'combined' => 'year(s)'),
-                       6 => array('singular' => 'hour',
-                                  'plural' => 'hours',
-                                  'combined' => 'hour(s)')
-                 );
+                                    'plural' => '',
+                                    'combined' => ''),
+                        2 => array('singular' => 'unit',
+                                    'plural' => 'units',
+                                    'combined' => 'unit(s)'),
+                        3 => array('singular' => 'day',
+                                    'plural' => 'days',
+                                    'combined' => 'day(s)'),
+                        4 => array('singular' => 'month (singular)',
+                                    'plural' => 'month (plural)',
+                                    'combined' => 'month (combined)'),
+                        5 => array('singular' => 'year',
+                                    'plural' => 'years',
+                                    'combined' => 'year(s)'),
+                        6 => array('singular' => 'hour',
+                                    'plural' => 'hours',
+                                    'combined' => 'hour(s)')
+                    );
 
         if ($key === null) {
             return $units;

Spacing +15 added lines, -15 removed lines

@@ -77,14 +77,14 @@ 
 
         $sql = "SELECT product_detail.id, product_detail.unit AS unit_key,".implode(',', $this->fields).", product_detail_translation.name, product_detail_translation.description FROM product_detail
             LEFT JOIN product_detail_translation ON product_detail.id = product_detail_translation.id AND product_detail_translation.lang = 'da'
-            WHERE ".$sql . "
-            AND product_id = " . $this->product->get('id') . ' AND intranet_id = ' . $this->product->intranet->getId();
+            WHERE ".$sql."
+            AND product_id = " . $this->product->get('id').' AND intranet_id = '.$this->product->intranet->getId();
         $this->db->query($sql);
         if ($this->db->numRows() > 1) {
             throw new Exception('Der er mere end en aktiv produktdetalje');
         } elseif ($this->db->nextRecord()) {
             // hardcoded udtr�k af nogle vigtige oplysnigner, som vi ikke kan have i feltlisten
-            for ($i = 0, $max = count($this->fields); $i<$max; $i++) {
+            for ($i = 0, $max = count($this->fields); $i < $max; $i++) {
                 $this->value[$this->fields[$i]] = $this->db->f($this->fields[$i]);
             }
             $this->value['name'] = $this->db->f('name');
@@ -100,13 +100,13 @@ 
                 exit;
             }
 
-            $this->value['unit_id']   = $this->db->f('unit_key');
-            $this->value['unit']     = $unit;
+            $this->value['unit_id'] = $this->db->f('unit_key');
+            $this->value['unit'] = $unit;
 
             // udregne moms priser ud fra prisen, men kun hvis der er moms p� den
             if ($this->db->f('vat') == 1) {
                 $this->value['vat_percent'] = 25;
-                $this->value['price_incl_vat'] = round((float)$this->db->f('price') + ((float)$this->db->f('price') * 0.25), 2);
+                $this->value['price_incl_vat'] = round((float)$this->db->f('price') + ((float)$this->db->f('price')*0.25), 2);
             } else {
                 $this->value['vat_percent'] = 0;
                 $this->value['price_incl_vat'] = round((float)$this->db->f('price'), 2);
@@ -262,8 +262,8 @@ 
         } else {
 
             // vi opdaterer produktet
-            $this->db->query("UPDATE product_detail SET active = 0 WHERE product_id = " . $this->product->get('id'));
-            $this->db->query("INSERT INTO product_detail SET ".$sql." active = 1, changed_date = NOW(), product_id = " . $this->product->get('id') . ", intranet_id = " . $this->product->intranet->getId());
+            $this->db->query("UPDATE product_detail SET active = 0 WHERE product_id = ".$this->product->get('id'));
+            $this->db->query("INSERT INTO product_detail SET ".$sql." active = 1, changed_date = NOW(), product_id = ".$this->product->get('id').", intranet_id = ".$this->product->intranet->getId());
             $this->detail_id = $this->db->insertedId();
             $this->db->query("INSERT INTO product_detail_translation SET name = \"".$array_var['name']."\", description = \"".$array_var['description']."\", lang = 'da', id = ".$this->detail_id);
 
@@ -284,17 +284,17 @@ 
 
     public function getPriceInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2), 'iso');
     }
 
     public function getPriceIncludingVat()
     {
-        return new Ilib_Variable_Float(round($this->get('price') * (1 + $this->getVatPercent()->getAsIso()/100), 2));
+        return new Ilib_Variable_Float(round($this->get('price')*(1 + $this->getVatPercent()->getAsIso()/100), 2));
     }
 
     public function getPriceIncludingVatInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100) * (1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100)*(1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
     }
 
     public function getBeforePrice()
@@ -304,17 +304,17 @@ 
 
     public function getBeforePriceInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2), 'iso');
     }
 
     public function getBeforePriceIncludingVat()
     {
-        return new Ilib_Variable_Float(round($this->get('before_price') * (1 + $this->getVatPercent()->getAsIso()/100), 2));
+        return new Ilib_Variable_Float(round($this->get('before_price')*(1 + $this->getVatPercent()->getAsIso()/100), 2));
     }
 
     public function getBeforePriceIncludingVatInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('before_price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100) * (1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('before_price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100)*(1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
     }
 
     public function getVatPercent()
@@ -365,7 +365,7 @@ 
     function setStateAccountId($id)
     {
         $db = new DB_Sql;
-        $db->query('UPDATE product_detail SET state_account_id = ' . $id . ' WHERE id = ' . $this->detail_id);
+        $db->query('UPDATE product_detail SET state_account_id = '.$id.' WHERE id = '.$this->detail_id);
         $this->load();
         $this->product->load();
         return true;

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)) {