intraface / intraface.dk

src/Intraface/modules/payment/Controller/templates/index.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         <?php if ($payment['is_stated']) : ?>
         <td><?php e(t('Yes')); ?></td>
         <?php else : ?>
-        <td><a href="<?php e(url($payment['id'] . '/state')); ?>"><?php e(t('No')); ?></a></td>
+        <td><a href="<?php e(url($payment['id'].'/state')); ?>"><?php e(t('No')); ?></a></td>
         <?php endif; ?>
 
     </tr>

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

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
     function renderHtml()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
         return $smarty->render($this);
     }
 

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

Spacing +4 added lines, -4 removed lines

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

src/Intraface/modules/product/Gateway.php

Spacing +3 added lines, -3 removed lines

@@ -139,8 +139,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()
             );
 
@@ -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/Details.php

Spacing +10 added lines, -10 removed lines

@@ -73,15 +73,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;
@@ -212,7 +212,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));
     }
 
     /**
@@ -222,7 +222,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));
     }
 
     /**
@@ -234,7 +234,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)
@@ -262,7 +262,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));
     }
 
     /**
@@ -272,7 +272,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));
     }
 
     /**
@@ -284,7 +284,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/Product/X/Attribute/Group.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
         
         $this->hasOne(
             'Intraface_modules_product_Attribute_Group as attribute_group',
-            array('local' => 'product_attribute_group_id','foreign' => 'id')
+            array('local' => 'product_attribute_group_id', 'foreign' => 'id')
         );
     }
 }

src/Intraface/modules/product/Product.php

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;
@@ -396,13 +396,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();
@@ -435,7 +435,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'),
@@ -505,8 +505,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);
 
@@ -529,7 +529,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;
@@ -548,7 +548,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()) {
@@ -572,8 +572,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";
@@ -631,17 +631,17 @@ 
         $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;
         }
     }
@@ -656,7 +656,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;
     }
 
@@ -670,7 +670,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;
     }
 
@@ -685,12 +685,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;
             }
@@ -725,7 +725,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;
                 }
@@ -754,7 +754,7 @@ 
         }
 
         $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());
         }
@@ -762,7 +762,7 @@ 
         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());
         }
@@ -784,7 +784,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());
         }
@@ -812,12 +812,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)) {
@@ -871,7 +871,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');
         }
@@ -886,7 +886,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();
     }
 

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

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
         $data = array('product' => $product, 'groups' => $groups);
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/productattributegroup');
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/productattributegroup');
         return $smarty->render($this, $data);
     }
 

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

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
         $data = array('products' => $list);
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/tpl/selectproduct');
+        $smarty = $this->template->create(dirname(__FILE__).'/tpl/selectproduct');
         return $smarty->render($this, $data);
     }