intraface / intraface.dk

src/Intraface/XMLRPC/Shop/Server0004.php

Doc Comments +3 added lines, -4 removed lines

@@ -402,8 +402,6 @@ 
      *

      * @param struct  $credentials Credentials to use the server

      * @param integer $shop_id    Id for the shop

-     * @param integer $id          Product id

-     *

      * @return array

      */

     public function getRelatedProducts($credentials, $shop_id, $product_id)

@@ -578,7 +576,7 @@ 
      *

      * @param struct  $credentials       Credentials to use the server

      * @param integer $shop_id    Id for the shop

-     * @param integer $produt_id         Product id to add

+     * @param integer $product_id         Product id to add

      * @param integer $product_variation_id Product variation id to change

      * @param integer $quantity          Optional quantity

      * @param string  $text              Extra text to the itemline

@@ -621,7 +619,7 @@ 
      * @param string  $text              Extra text to the itemline

      * @param integer $product_detail_id Product detail id

      *

-     * @return mixed

+     * @return boolean

      */

     public function changeProductInBasket($credentials, $shop_id, $product_id, $product_variation_id, $quantity, $text = '', $product_detail_id = 0)

     {

@@ -1077,6 +1075,7 @@ 
     /**

      * Initialize the webshop

      *

+     * @param integer $shop_id
      * @return void

      */

     private function _factoryWebshop($shop_id)

Indentation +3 added lines, -3 removed lines

@@ -429,7 +429,7 @@ 
         return $this->prepareResponseData($this->cleanUpProductList($product->getRelatedProducts($currencies, 'webshop')));

     }

 

-   /**

+    /**

      * Gets featured products

      *

      * Method is experimental and only used by discimport.dk. If you need to use it

@@ -480,7 +480,7 @@ 
 

     }

 

-   /**

+    /**

      * Gets product keywords which can be used to sort ones webshop

      *

      *

@@ -568,7 +568,7 @@ 
                 }

                 $tmp_filehandler->__destruct();

                 unset($tmp_filehandler);

-           }

+            }

 

         return $this->prepareResponseData($pictures);

     }

Spacing +15 added lines, -15 removed lines

@@ -72,40 +72,40 @@ 
         }

 

         // sublevel has to be used so other searches are not overwritten

-        $product->getDBQuery()->storeResult('use_stored', 'webshop_' . $area . '_' .  md5($this->credentials['session_id']), 'sublevel');

+        $product->getDBQuery()->storeResult('use_stored', 'webshop_'.$area.'_'.md5($this->credentials['session_id']), 'sublevel');

         $debug2 = serialize($mixed);

         if (isset($mixed['offset']) AND is_numeric($mixed['offset']) AND $mixed['offset'] > 0) {

             $product->getDBQuery()->useStored(true);

             $product->getDBQuery()->setPagingOffset((int)$mixed['offset']);

-            $debug2 .= 'offset ' . $mixed['offset'];

+            $debug2 .= 'offset '.$mixed['offset'];

         } elseif (isset($mixed['use_stored']) AND array_key_exists('use_stored', $mixed) AND $mixed['use_stored'] == 'true') {

             $product->getDBQuery()->useStored(true);

             $debug2 .= 'use_stored true';

         } else {

             if (array_key_exists('search', $mixed) AND !empty($mixed['search'])) {

                 $product->getDBQuery()->setFilter('search', $mixed['search']);

-                $debug2 .= 'search ' . $mixed['search'];

+                $debug2 .= 'search '.$mixed['search'];

             }

 

             if (array_key_exists('keywords', $mixed) AND !empty($mixed['keywords'])) {

                 $product->getDBQuery()->setFilter('keywords', $mixed['keywords']);

-                $debug2 .= 'keyword ' . $mixed['keywords'];

+                $debug2 .= 'keyword '.$mixed['keywords'];

             }

 

             if (array_key_exists('category', $mixed) AND !empty($mixed['category'])) {

                 $product->getDBQuery()->setFilter('shop_id', $shop_id);

                 $product->getDBQuery()->setFilter('category', $mixed['category']);

-                $debug2 .= 'category ' . $mixed['category'];

+                $debug2 .= 'category '.$mixed['category'];

             }

 

             if (isset($mixed['ids']) AND array_key_exists('ids', $mixed) AND is_array($mixed['ids'])) {

                 $product->getDBQuery()->setFilter('ids', $mixed['ids']);

-                $debug2 .= 'ids ' . implode(', ', $mixed['ids']);

+                $debug2 .= 'ids '.implode(', ', $mixed['ids']);

             }

 

             if (array_key_exists('sorting', $mixed) AND !empty($mixed['sorting'])) {

                 $product->getDBQuery()->setFilter('sorting', $mixed['sorting']);

-                $debug2 .= 'sorting ' . $mixed['sorting'];

+                $debug2 .= 'sorting '.$mixed['sorting'];

             }

 

         }

@@ -142,7 +142,7 @@ 
         $search['area'] = 'category_'.$category_id;

         if ($results_per_page > 0) {

             $search['use_paging'] = 'true';

-        }else {

+        } else {

             $search['use_paging'] = 'false';

         }

 

@@ -452,7 +452,7 @@ 
 

         if (PEAR::isError($db)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException($db->getMessage() . $db->getUserInfo(), -1);

+            throw new XML_RPC2_FaultException($db->getMessage().$db->getUserInfo(), -1);

         }

 

         $featured = new Intraface_modules_shop_FeaturedProducts($this->kernel->intranet, $this->webshop->getShop(), $db);

@@ -716,7 +716,7 @@ 
 

         if (!$order_id = $this->webshop->placeOrder($values)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('order could not be placed. It returned the following error: ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('order could not be placed. It returned the following error: '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData($this->webshop->getOrderIdentifierKey());

@@ -746,7 +746,7 @@ 
 

         if (!$this->webshop->getBasket()->saveAddress($values)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -787,7 +787,7 @@ 
         $customer_coupon = $this->processRequestData($customer_coupon);

         if (!$this->webshop->getBasket()->saveCustomerCoupon($customer_coupon)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -828,7 +828,7 @@ 
         $customer_ean = $this->processRequestData($customer_ean);

         if (!$this->webshop->getBasket()->saveCustomerEan($customer_ean)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('ean could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('ean could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -870,7 +870,7 @@ 
         $customer_comment = $this->processRequestData($customer_comment);

         if (!$this->webshop->getBasket()->saveCustomerComment($customer_comment)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -929,7 +929,7 @@ 
         $payment_method = $this->processRequestData($payment_method);

         if (!$this->webshop->getBasket()->savePaymentMethod($payment_method)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

Braces +7 added lines, -3 removed lines

@@ -142,7 +142,7 @@ 
         $search['area'] = 'category_'.$category_id;

         if ($results_per_page > 0) {

             $search['use_paging'] = 'true';

-        }else {

+        } else {

             $search['use_paging'] = 'false';

         }

 

@@ -327,11 +327,15 @@ 
                 $attributes_array = $variation->getAttributesAsArray();

 

                 foreach ($attributes_array as $attribute) {

-                    if ($attribute_string != '') $attribute_string .= '-';

+                    if ($attribute_string != '') {
+                        $attribute_string .= '-';
+                    }
                     $attribute_string .= $attribute['id'];

 

                     // We calculate all products which is on stock with this attribute to be able to mark unused attributes in list.

-                    if (!isset($attribute_for_sale[$attribute['id']])) $attribute_for_sale[$attribute['id']] = 0;

+                    if (!isset($attribute_for_sale[$attribute['id']])) {
+                        $attribute_for_sale[$attribute['id']] = 0;
+                    }
                     if ($stock !== false) {

                         // If for_sale is less than zero we add zero.

                         $attribute_for_sale[$attribute['id']] += (($stock['for_sale'] < 0) ? 0 : $stock['for_sale']);

src/Intraface/XMLRPC/Shop/Server0100.php

Doc Comments +5 added lines, -5 removed lines

@@ -251,7 +251,8 @@ 
     /**

      * Formats array to return from product list from Doctrine

      *

-     * @param object $doctrine_products Doctrine_Collection

+     * @param object $doctrine_products Doctrine_Collection
+     * @param integer $attribute_id

      * @return array with products

      */

     private function createDoctrineProductsListArray($doctrine_products, $attribute_id = NULL)

@@ -568,8 +569,6 @@ 
      *

      * @param struct  $credentials Credentials to use the server

      * @param integer $shop_id    Id for the shop

-     * @param integer $id          Product id

-     *

      * @return array

      */

     public function getRelatedProducts($credentials, $shop_id, $product_id)

@@ -743,7 +742,7 @@ 
      *

      * @param struct  $credentials       Credentials to use the server

      * @param integer $shop_id    Id for the shop

-     * @param integer $produt_id         Product id to add

+     * @param integer $product_id         Product id to add

      * @param integer $product_variation_id Product variation id to change

      * @param integer $quantity          Optional quantity

      * @param string  $text              Extra text to the itemline

@@ -786,7 +785,7 @@ 
      * @param string  $text              Extra text to the itemline

      * @param integer $product_detail_id Product detail id

      *

-     * @return mixed

+     * @return boolean

      */

     public function changeProductInBasket($credentials, $shop_id, $product_id, $product_variation_id, $quantity, $text = '', $product_detail_id = 0)

     {

@@ -1240,6 +1239,7 @@ 
     /**

      * Initialize the webshop

      *

+     * @param integer $shop_id
      * @return void

      */

     private function _factoryWebshop($shop_id)

Indentation +3 added lines, -3 removed lines

@@ -595,7 +595,7 @@ 
         return $this->prepareResponseData($this->cleanUpProductList($product->getRelatedProducts($currencies, 'webshop')));

     }

 

-   /**

+    /**

      * Gets featured products

      *

      * Method is experimental and only used by discimport.dk. If you need to use it

@@ -646,7 +646,7 @@ 
 

     }

 

-   /**

+    /**

      * Gets product keywords which can be used to sort ones webshop

      *

      *

@@ -733,7 +733,7 @@ 
                 }

                 //$tmp_filehandler->__destruct();

                 unset($tmp_filehandler);

-           }

+            }

 

         return $this->prepareResponseData($pictures);

     }

Spacing +15 added lines, -15 removed lines

@@ -74,40 +74,40 @@ 
         }

 

         // sublevel has to be used so other searches are not overwritten

-        $product->getDBQuery()->storeResult('use_stored', 'webshop_' . $area . '_' .  md5($this->credentials['session_id']), 'sublevel');

+        $product->getDBQuery()->storeResult('use_stored', 'webshop_'.$area.'_'.md5($this->credentials['session_id']), 'sublevel');

         $debug2 = serialize($mixed);

         if (isset($mixed['offset']) AND is_numeric($mixed['offset']) AND $mixed['offset'] > 0) {

             $product->getDBQuery()->useStored(true);

             $product->getDBQuery()->setPagingOffset((int)$mixed['offset']);

-            $debug2 .= 'offset ' . $mixed['offset'];

+            $debug2 .= 'offset '.$mixed['offset'];

         } elseif (isset($mixed['use_stored']) AND array_key_exists('use_stored', $mixed) AND $mixed['use_stored'] == 'true') {

             $product->getDBQuery()->useStored(true);

             $debug2 .= 'use_stored true';

         } else {

             if (array_key_exists('search', $mixed) AND !empty($mixed['search'])) {

                 $product->getDBQuery()->setFilter('search', $mixed['search']);

-                $debug2 .= 'search ' . $mixed['search'];

+                $debug2 .= 'search '.$mixed['search'];

             }

 

             if (array_key_exists('keywords', $mixed) AND !empty($mixed['keywords'])) {

                 $product->getDBQuery()->setFilter('keywords', $mixed['keywords']);

-                $debug2 .= 'keyword ' . $mixed['keywords'];

+                $debug2 .= 'keyword '.$mixed['keywords'];

             }

 

             if (array_key_exists('category', $mixed) AND !empty($mixed['category'])) {

                 $product->getDBQuery()->setFilter('shop_id', $shop_id);

                 $product->getDBQuery()->setFilter('category', $mixed['category']);

-                $debug2 .= 'category ' . $mixed['category'];

+                $debug2 .= 'category '.$mixed['category'];

             }

 

             if (isset($mixed['ids']) AND array_key_exists('ids', $mixed) AND is_array($mixed['ids'])) {

                 $product->getDBQuery()->setFilter('ids', $mixed['ids']);

-                $debug2 .= 'ids ' . implode(', ', $mixed['ids']);

+                $debug2 .= 'ids '.implode(', ', $mixed['ids']);

             }

 

             if (array_key_exists('sorting', $mixed) AND !empty($mixed['sorting'])) {

                 $product->getDBQuery()->setFilter('sorting', $mixed['sorting']);

-                $debug2 .= 'sorting ' . $mixed['sorting'];

+                $debug2 .= 'sorting '.$mixed['sorting'];

             }

 

         }

@@ -144,7 +144,7 @@ 
         $search['area'] = 'category_'.$category_id;

         if ($results_per_page > 0) {

             $search['use_paging'] = 'true';

-        }else {

+        } else {

             $search['use_paging'] = 'false';

         }

 

@@ -618,7 +618,7 @@ 
 

         if (PEAR::isError($db)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException($db->getMessage() . $db->getUserInfo(), -1);

+            throw new XML_RPC2_FaultException($db->getMessage().$db->getUserInfo(), -1);

         }

 

         $featured = new Intraface_modules_shop_FeaturedProducts($this->kernel->intranet, $this->webshop->getShop(), $db);

@@ -880,7 +880,7 @@ 
 

         if (!$order_id = $this->webshop->placeOrder($values)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('order could not be placed. It returned the following error: ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('order could not be placed. It returned the following error: '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData($this->webshop->getOrderIdentifierKey());

@@ -910,7 +910,7 @@ 
 

         if (!$this->webshop->getBasket()->saveAddress($values)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -951,7 +951,7 @@ 
         $customer_coupon = $this->processRequestData($customer_coupon);

         if (!$this->webshop->getBasket()->saveCustomerCoupon($customer_coupon)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -992,7 +992,7 @@ 
         $customer_ean = $this->processRequestData($customer_ean);

         if (!$this->webshop->getBasket()->saveCustomerEan($customer_ean)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('ean could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('ean could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -1034,7 +1034,7 @@ 
         $customer_comment = $this->processRequestData($customer_comment);

         if (!$this->webshop->getBasket()->saveCustomerComment($customer_comment)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -1093,7 +1093,7 @@ 
         $payment_method = $this->processRequestData($payment_method);

         if (!$this->webshop->getBasket()->savePaymentMethod($payment_method)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

Braces +7 added lines, -3 removed lines

@@ -144,7 +144,7 @@ 
         $search['area'] = 'category_'.$category_id;

         if ($results_per_page > 0) {

             $search['use_paging'] = 'true';

-        }else {

+        } else {

             $search['use_paging'] = 'false';

         }

 

@@ -493,11 +493,15 @@ 
                 $attributes_array = $variation->getAttributesAsArray();

 

                 foreach ($attributes_array as $attribute) {

-                    if ($attribute_string != '') $attribute_string .= '-';

+                    if ($attribute_string != '') {
+                        $attribute_string .= '-';
+                    }
                     $attribute_string .= $attribute['id'];

 

                     // We calculate all products which is on stock with this attribute to be able to mark unused attributes in list.

-                    if (!isset($attribute_for_sale[$attribute['id']])) $attribute_for_sale[$attribute['id']] = 0;

+                    if (!isset($attribute_for_sale[$attribute['id']])) {
+                        $attribute_for_sale[$attribute['id']] = 0;
+                    }
                     if ($stock !== false) {

                         // If for_sale is less than zero we add zero.

                         $attribute_for_sale[$attribute['id']] += (($stock['for_sale'] < 0) ? 0 : $stock['for_sale']);

src/Intraface/XMLRPC/Shop/Server2.php

Doc Comments +3 added lines, -4 removed lines

@@ -213,8 +213,6 @@ 
      *

      * @param struct  $credentials Credentials to use the server

      * @param integer $shop_id    Id for the shop

-     * @param integer $id          Product id

-     *

      * @return array

      */

     public function getRelatedProducts($credentials, $shop_id, $product_id)

@@ -326,7 +324,7 @@ 
      *

      * @param struct  $credentials       Credentials to use the server

      * @param integer $shop_id    Id for the shop

-     * @param integer $produt_id         Product id to add

+     * @param integer $product_id         Product id to add

      * @param integer $product_variation_id Product variation id to change

      * @param integer $quantity          Optional quantity

      * @param string  $text              Extra text to the itemline

@@ -369,7 +367,7 @@ 
      * @param string  $text              Extra text to the itemline

      * @param integer $product_detail_id Product detail id

      *

-     * @return mixed

+     * @return boolean

      */

     public function changeProductInBasket($credentials, $shop_id, $product_id, $product_variation_id, $quantity, $text = '', $product_detail_id = 0)

     {

@@ -789,6 +787,7 @@ 
     /**

      * Initialize the webshop

      *

+     * @param integer $shop_id
      * @return void

      */

     private function _factoryWebshop($shop_id)

Indentation +2 added lines, -2 removed lines

@@ -234,7 +234,7 @@ 
         return $this->prepareResponseData($product->getRelatedProducts());

     }

 

-   /**

+    /**

      * Gets featured products

      *

      * Method is experimental and only used by discimport.dk. If you need to use it

@@ -279,7 +279,7 @@ 
 

     }

 

-   /**

+    /**

      * Gets product keywords which can be used to sort ones webshop

      *

      *

Spacing +15 added lines, -15 removed lines

@@ -60,40 +60,40 @@ 
 

 

         // sublevel has to be used so other searches are not overwritten

-        $product->getDBQuery()->storeResult('use_stored', 'webshop_' . $area . '_' .  md5($this->credentials['session_id']), 'sublevel');

+        $product->getDBQuery()->storeResult('use_stored', 'webshop_'.$area.'_'.md5($this->credentials['session_id']), 'sublevel');

         $debug2 = serialize($mixed);

         if (isset($mixed['offset']) AND array_key_exists('offset', $mixed) AND is_numeric($mixed['offset'])) {

             $product->getDBQuery()->useStored(true);

             $product->getDBQuery()->setPagingOffset((int)$mixed['offset']);

-            $debug2 .= 'offset ' . $mixed['offset'];

+            $debug2 .= 'offset '.$mixed['offset'];

         } elseif (isset($mixed['use_stored']) AND array_key_exists('use_stored', $mixed) AND $mixed['use_stored'] == 'true') {

             $product->getDBQuery()->useStored(true);

             $debug2 .= 'use_stored true';

         } else {

             if (array_key_exists('search', $mixed) AND !empty($mixed['search'])) {

                 $product->getDBQuery()->setFilter('search', $mixed['search']);

-                $debug2 .= 'search ' . $mixed['search'];

+                $debug2 .= 'search '.$mixed['search'];

             }

 

             if (array_key_exists('keywords', $mixed) AND !empty($mixed['keywords'])) {

                 $product->getDBQuery()->setFilter('keywords', $mixed['keywords']);

-                $debug2 .= 'keyword ' . $mixed['keywords'];

+                $debug2 .= 'keyword '.$mixed['keywords'];

             }

 

             if (array_key_exists('category', $mixed) AND !empty($mixed['category'])) {

                 $product->getDBQuery()->setFilter('shop_id', $shop_id);

                 $product->getDBQuery()->setFilter('category', $mixed['category']);

-                $debug2 .= 'category ' . $mixed['category'];

+                $debug2 .= 'category '.$mixed['category'];

             }

 

             if (isset($mixed['ids']) AND array_key_exists('ids', $mixed) AND is_array($mixed['ids'])) {

                 $product->getDBQuery()->setFilter('ids', $mixed['ids']);

-                $debug2 .= 'ids ' . implode(', ', $mixed['ids']);

+                $debug2 .= 'ids '.implode(', ', $mixed['ids']);

             }

 

             if (array_key_exists('sorting', $mixed) AND !empty($mixed['sorting'])) {

                 $product->getDBQuery()->setFilter('sorting', $mixed['sorting']);

-                $debug2 .= 'sorting ' . $mixed['sorting'];

+                $debug2 .= 'sorting '.$mixed['sorting'];

             }

 

         }

@@ -197,7 +197,7 @@ 
                         'name' => $variation->getName(),

                         'attributes' => $attributes_array,

                         'identifier' => $attribute_string,

-                        'price_incl_vat' => round(($product->get('price') + $detail->getPriceDifference()) * (1 + $product->get('vat_percent')/100), 2),

+                        'price_incl_vat' => round(($product->get('price') + $detail->getPriceDifference())*(1 + $product->get('vat_percent')/100), 2),

                         'weight' => $product->get('weight') + $detail->getWeightDifference()

                     ),

                     'stock' => $variation->getStock($product)->get()

@@ -257,7 +257,7 @@ 
 

         if (PEAR::isError($db)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException($db->getMessage() . $db->getUserInfo(), -1);

+            throw new XML_RPC2_FaultException($db->getMessage().$db->getUserInfo(), -1);

         }

 

         $featured = new Intraface_modules_shop_FeaturedProducts($this->kernel->intranet, $this->webshop->getShop(), $db);

@@ -457,7 +457,7 @@ 
 

         if (!$order_id = $this->webshop->placeOrder($values)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('order could not be placed. It returned the following error: ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('order could not be placed. It returned the following error: '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData($this->webshop->getOrderIdentifierKey());

@@ -487,7 +487,7 @@ 
 

         if (!$this->webshop->getBasket()->saveAddress($values)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -528,7 +528,7 @@ 
         $customer_coupon = $this->processRequestData($customer_coupon);

         if (!$this->webshop->getBasket()->saveCustomerCoupon($customer_coupon)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -569,7 +569,7 @@ 
         $customer_ean = $this->processRequestData($customer_ean);

         if (!$this->webshop->getBasket()->saveCustomerEan($customer_ean)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('ean could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('ean could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -611,7 +611,7 @@ 
         $customer_comment = $this->processRequestData($customer_comment);

         if (!$this->webshop->getBasket()->saveCustomerComment($customer_comment)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

@@ -670,7 +670,7 @@ 
         $payment_method = $this->processRequestData($payment_method);

         if (!$this->webshop->getBasket()->savePaymentMethod($payment_method)) {

             require_once 'XML/RPC2/Exception.php';

-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData(true);

Braces +3 added lines, -1 removed lines

@@ -185,7 +185,9 @@
                 $attribute_string = '';

                 $attributes_array = $variation->getAttributesAsArray();

                 foreach ($attributes_array as $attribute) {

-                    if ($attribute_string != '') $attribute_string .= '-';

+                    if ($attribute_string != '') {
+                        $attribute_string .= '-';
+                    }
                     $attribute_string .= $attribute['id'];

                 }

 

install/Helper/Accounting.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     {
         require_once 'Intraface/modules/accounting/Year.php';
         $year = new Year($this->kernel);
-        $year->save(array('from_date' => date('Y') . '-01-01', 'to_date' => date('Y') . '-12-31', 'label' => 'test', 'locked' => 0, 'vat' => 1));
+        $year->save(array('from_date' => date('Y').'-01-01', 'to_date' => date('Y').'-12-31', 'label' => 'test', 'locked' => 0, 'vat' => 1));
         $year->createAccounts('standard');
         $year->setYear();
     }

install/Helper/Debtor.php

Spacing +9 added lines, -9 removed lines

@@ -12,11 +12,11 @@ 
 
     public function createInvoice()
     {
-        require_once dirname (__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 
-        require_once dirname(__FILE__) . '/Product.php';
+        require_once dirname(__FILE__).'/Product.php';
         $product = new Install_Helper_Product($this->kernel, $this->db);
         $product_id = $product->create();
 
@@ -26,7 +26,7 @@ 
             'contact_id' => $contact_id,
             'description' => 'Test invoice',
             'this_date' => date('d-m-Y'),
-            'due_date' => date('d-m-Y', time()+14*60*60*24)));
+            'due_date' => date('d-m-Y', time() + 14*60*60*24)));
 
         $debtor->loadItem();
         $debtor->item->save(array('product_id' => $product_id, 'quantity' => 3, 'description' => 'Test description on product'));
@@ -34,11 +34,11 @@ 
 
     public function createOrder()
     {
-        require_once dirname(__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 
-        require_once dirname(__FILE__) . '/Product.php';
+        require_once dirname(__FILE__).'/Product.php';
         $product = new Install_Helper_Product($this->kernel, $this->db);
         $product_id = $product->create();
 
@@ -48,7 +48,7 @@ 
             'contact_id' => $contact_id,
             'description' => 'Test invoice',
             'this_date' => date('d-m-Y'),
-            'due_date' => date('d-m-Y', time()+14*60*60*24)));
+            'due_date' => date('d-m-Y', time() + 14*60*60*24)));
 
         $debtor->loadItem();
         $debtor->item->save(array('product_id' => $product_id, 'quantity' => 3, 'description' => 'Test description on product'));
@@ -56,11 +56,11 @@ 
 
     public function createOrderFromShop()
     {
-        require_once dirname(__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 
-        require_once dirname(__FILE__) . '/Product.php';
+        require_once dirname(__FILE__).'/Product.php';
         $product = new Install_Helper_Product($this->kernel, $this->db);
         $product_id = $product->create();
 
@@ -70,7 +70,7 @@ 
             'contact_id' => $contact_id,
             'description' => 'From shop',
             'this_date' => date('d-m-Y'),
-            'due_date' => date('d-m-Y', time()+14*60*60*24)), 'webshop', 1);
+            'due_date' => date('d-m-Y', time() + 14*60*60*24)), 'webshop', 1);
 
         $debtor->loadItem();
         $debtor->item->save(array('product_id' => $product_id, 'quantity' => 3, 'description' => 'Test description on product'));

install/Helper/ModulePackage.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     public function loadPackages()
     {
 
-        $sql_structure = file_get_contents(dirname(__FILE__) . '/../database-module_package-values.sql');
+        $sql_structure = file_get_contents(dirname(__FILE__).'/../database-module_package-values.sql');
         $sql_arr = Intraface_Install::splitSql($sql_structure);
 
         foreach ($sql_arr as $sql) {

install/Helper/Product.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
                 $variation->load();
                 $detail = $variation->getDetail();
                 $detail->price_difference = 0; /* Can be reimplemented: ($a1 * $a2); */
-                $detail->weight_difference = -1*($a1 * $a2);
+                $detail->weight_difference = -1*($a1*$a2);
                 $detail->save();
 
             }

install/Helper/Email.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
     public function create()
     {
-        require_once dirname(__FILE__) . '/Contact.php';
+        require_once dirname(__FILE__).'/Contact.php';
         $contact = new Install_Helper_Contact($this->kernel, $this->db);
         $contact_id = $contact->create();
 

generate_package_xml.php

Indentation +25 added lines, -25 removed lines

@@ -57,10 +57,10 @@ 
         'packagefile'       => 'package.xml',

         'ignore'            => $ignore,

         'dir_roles'        => array(

-              'intraface.dk' => 'www'

+                'intraface.dk' => 'www'

         ),

         'exceptions' => array(

-              'intraface.dk/*.*' => 'www'

+                'intraface.dk/*.*' => 'www'

         ),

         'simpleoutput'      => true,

         'addhiddenfiles' => true

@@ -221,29 +221,29 @@ 
 $post_install_script = $pfm->initPostinstallScript('intraface.php');

 $post_install_script->addParamGroup('setup',

     array($post_install_script->getParam('db_user', 'User', 'string', 'root'),

-          $post_install_script->getParam('db_pass', 'Password', 'string', ''),

-          $post_install_script->getParam('db_host', 'Host', 'string', 'localhost'),

-          $post_install_script->getParam('db_name', 'Database', 'string', 'intraface'),

-          $post_install_script->getParam('net_scheme', 'Net scheme', 'string', 'http://'),

-          $post_install_script->getParam('net_host', 'Net host', 'string', 'localhost'),

-          $post_install_script->getParam('net_directory', 'Net directory', 'string', '/'),

-          $post_install_script->getParam('path_root', 'Root path', 'string', '/home/intraface/'),

-          $post_install_script->getParam('path_include_path', 'Include path', 'string', ''),

-          $post_install_script->getParam('path_upload', 'Upload path', 'string', '/home/intraface/upload/'),

-          $post_install_script->getParam('path_cache', 'Cache path', 'string', '/home/intraface/cache'),

-          $post_install_script->getParam('connection_internet', 'Connection to intranet', 'boolean', true),

-          $post_install_script->getParam('server_status', 'Server status', 'string', 'PRODUCTION'),

-          $post_install_script->getParam('error_handle_level', 'Error handle error ', 'integer', E_ALL),

-          $post_install_script->getParam('error_level_continue_script', 'Error level continue script', 'integer' ^ E_NOTICE),

-          $post_install_script->getParam('error_report_email', 'Error report email', 'string', 'support@intraface.dk'),

-          $post_install_script->getParam('error_log', 'Error log', 'string', 'log/error.log'),

-          $post_install_script->getParam('timezone', 'Timezone', 'string', 'Europe/Copenhagen'),

-          $post_install_script->getParam('country_local', 'Country local', 'string', 'da_DK'),

-          $post_install_script->getParam('intraface_intranetmaintenance_intranet_private_key', 'Private key', 'string', ''),

-          $post_install_script->getParam('intraface_onlinepayment_provider', 'Online payment provider', 'string', 'Quickpay'),

-          $post_install_script->getParam('intraface_onlinepayment_merchant', 'Online payment merchant number', 'string', ''),

-          $post_install_script->getParam('intraface_onlinepayment_md5secret', 'Online payment md5secret', 'string', '')

-              ),

+            $post_install_script->getParam('db_pass', 'Password', 'string', ''),

+            $post_install_script->getParam('db_host', 'Host', 'string', 'localhost'),

+            $post_install_script->getParam('db_name', 'Database', 'string', 'intraface'),

+            $post_install_script->getParam('net_scheme', 'Net scheme', 'string', 'http://'),

+            $post_install_script->getParam('net_host', 'Net host', 'string', 'localhost'),

+            $post_install_script->getParam('net_directory', 'Net directory', 'string', '/'),

+            $post_install_script->getParam('path_root', 'Root path', 'string', '/home/intraface/'),

+            $post_install_script->getParam('path_include_path', 'Include path', 'string', ''),

+            $post_install_script->getParam('path_upload', 'Upload path', 'string', '/home/intraface/upload/'),

+            $post_install_script->getParam('path_cache', 'Cache path', 'string', '/home/intraface/cache'),

+            $post_install_script->getParam('connection_internet', 'Connection to intranet', 'boolean', true),

+            $post_install_script->getParam('server_status', 'Server status', 'string', 'PRODUCTION'),

+            $post_install_script->getParam('error_handle_level', 'Error handle error ', 'integer', E_ALL),

+            $post_install_script->getParam('error_level_continue_script', 'Error level continue script', 'integer' ^ E_NOTICE),

+            $post_install_script->getParam('error_report_email', 'Error report email', 'string', 'support@intraface.dk'),

+            $post_install_script->getParam('error_log', 'Error log', 'string', 'log/error.log'),

+            $post_install_script->getParam('timezone', 'Timezone', 'string', 'Europe/Copenhagen'),

+            $post_install_script->getParam('country_local', 'Country local', 'string', 'da_DK'),

+            $post_install_script->getParam('intraface_intranetmaintenance_intranet_private_key', 'Private key', 'string', ''),

+            $post_install_script->getParam('intraface_onlinepayment_provider', 'Online payment provider', 'string', 'Quickpay'),

+            $post_install_script->getParam('intraface_onlinepayment_merchant', 'Online payment merchant number', 'string', ''),

+            $post_install_script->getParam('intraface_onlinepayment_md5secret', 'Online payment md5secret', 'string', '')

+                ),

     '');

 

 $pfm->addPostInstallTask($post_install_script, 'intraface.php');

Spacing +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
 

 foreach ($web_files AS $file) {

     $src_file = substr($file, 4);

-    $formatted_file = substr($file, strlen($web_dir . '/'));

+    $formatted_file = substr($file, strlen($web_dir.'/'));

     if (in_array($src_file, $ignore)) continue;

     $pfm->addInstallAs($src_file, $formatted_file);

 }

Braces +3 added lines, -1 removed lines

@@ -251,7 +251,9 @@
 foreach ($web_files AS $file) {

     $src_file = substr($file, 4);

     $formatted_file = substr($file, strlen($web_dir . '/'));

-    if (in_array($src_file, $ignore)) continue;

+    if (in_array($src_file, $ignore)) {
+        continue;
+    }
     $pfm->addInstallAs($src_file, $formatted_file);

 }