intraface / intraface.dk

src/Intraface/modules/shop/Controller/BasketEvaluation/Index.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     {
         $shop = $this->getShop();
 
-        $this->document->setTitle('Basket evaluation for' . ' ' . $shop->name);
+        $this->document->setTitle('Basket evaluation for'.' '.$shop->name);
         $this->document->options = array($this->url('../') => 'Close');
 
         $basketevaluation = new Intraface_modules_shop_BasketEvaluation($this->mdb2, $this->getKernel()->intranet, $shop);
@@ -33,7 +33,7 @@ 
 
         $data = array('shop' => $shop, 'evaluations' => $evaluations);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/evaluation-index');
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/evaluation-index');
         return $tpl->render($this, $data);
     }
 

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

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     {
         $this->document->setTitle($this->getModel()->getName());
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/category');
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/category');
         return $tpl->render($this);
     }
 
@@ -34,7 +34,7 @@ 
             'category_object' => $this->getModel(),
             'regret_link' => $redirect->getRedirect($this->url('../'))
         );
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/categories-edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/categories-edit');
         return $tpl->render($this, $data);
     }
 

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

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
             'category_object' => $this->getModel(),
             'regret_link' => $redirect->getRedirect($this->url('../'))
         );
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/categories-edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/categories-edit');
         return $tpl->render($this, $data);
     }
 

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

Indentation +5 added lines, -5 removed lines

@@ -33,11 +33,11 @@
         $this->document->setTitle($shop->name);
 
         $this->document->options = array($this->url('../') => 'Close',
-                                         $this->url(null, array('edit')) => 'Edit',
-                                         $this->url('featuredproducts') => 'Choose featured products',
-                                         $this->url('categories') => 'Product categories',
-                                         $this->url('basketevaluation') => 'Basket evaluation',
-                                         $this->url('paymentmethods') => 'Payment methods');
+                                            $this->url(null, array('edit')) => 'Edit',
+                                            $this->url('featuredproducts') => 'Choose featured products',
+                                            $this->url('categories') => 'Product categories',
+                                            $this->url('basketevaluation') => 'Basket evaluation',
+                                            $this->url('paymentmethods') => 'Payment methods');
 
         $basketevaluation = new Intraface_modules_shop_BasketEvaluation($this->mdb2, $this->getKernel()->intranet, $shop);
         $evaluations = $basketevaluation->getList();

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 
         $data = array('shop' => $shop, 'evaluations' => $evaluations);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/show');
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/show');
         return $tpl->render($this, $data);
     }
 
@@ -85,8 +85,8 @@ 
             'settings' => $settings,
             'currencies' => $currencies,
             'languages' => $langs);
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/edit');
-        return $this->getError()->view() . $tpl->render($this, $data);
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/edit');
+        return $this->getError()->view().$tpl->render($this, $data);
     }
 
     function postForm()

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

Indentation +2 added lines, -2 removed lines

@@ -77,8 +77,8 @@
 
     function __construct(k_TemplateFactory $template, Doctrine_Connection_Common $doctrine)
     {
-         $this->template = $template;
-         $this->doctrine = $doctrine;
+            $this->template = $template;
+            $this->doctrine = $doctrine;
     }
 
     function map($name)

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
         if (!is_null($options)) {
             $config = HTMLPurifier_Config::createDefault();
             foreach ($options as $option) {
-                $config->set($option[0] . '.' . $option[1], $option[2]);
+                $config->set($option[0].'.'.$option[1], $option[2]);
             }
         }
         $this->_htmlPurifier = new HTMLPurifier($config);
@@ -45,7 +45,7 @@ 
     {
         $options = array(
             array('Cache', 'SerializerPath',
-                PATH_CACHE . '/htmlpurifier'
+                PATH_CACHE.'/htmlpurifier'
             ),
             //array('HTML', 'Doctype', 'XHTML 1.0 Strict'),
             array('HTML', 'Allowed',
@@ -149,12 +149,12 @@ 
         $shops = Doctrine::getTable('Intraface_modules_shop_Shop')->findByIntranetId($this->getKernel()->intranet->getId());
 
         if (count($shops) == 0) {
-            $tpl = $this->template->create(dirname(__FILE__) . '/tpl/empty-table');
+            $tpl = $this->template->create(dirname(__FILE__).'/tpl/empty-table');
             return $tpl->render($this, array('message' => 'No shops has been created yet.'));
         }
 
         $data = array('shops' => $shops);
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/shops');
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/shops');
         return $tpl->render($this, $data);
     }
 
@@ -192,7 +192,7 @@ 
             'settings' => $settings,
             'currencies' => $currencies,
             'languages' => $langs);
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/edit');
         return $tpl->render($this, $data);
     }
 
@@ -242,7 +242,7 @@ 
 
     function wrapHtml($content)
     {
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/content');
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/content');
         return $tpl->render($this, array('content' => $content));
     }
 

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

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
             'kernel' => $this->getKernel(),
             'keywords' => $keywords);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/featuredproducts');
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/featuredproducts');
         return $tpl->render($this, $data);
     }
 

src/Intraface/modules/shop/Controller/PaymentMethods/Index.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
     {
         $shop = Doctrine::getTable('Intraface_modules_shop_Shop')->find($this->getShopId());
 
-        $this->document->setTitle('Payment methods for') . ' ' . $shop->name;
+        $this->document->setTitle('Payment methods for').' '.$shop->name;
 
         $this->document->options = array($this->url('../') => 'Close');
 
@@ -22,7 +22,7 @@ 
         $chosen = $this->getPaymentMethodsForShop();
 
         $data = array('shop' => $shop, 'methods' => $methods, 'chosen' => $chosen);
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/paymentmethods-index');
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/paymentmethods-index');
         return $tpl->render($this, $data);
     }
 

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

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

Doc Comments +14 added lines, -14 removed lines

@@ -184,7 +184,7 @@ 
     /**
      * Returns the price of the product
      *
-     * @return object Ilib_Variable_Float with price
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price
      */
     public function getPrice()
     {
@@ -194,7 +194,7 @@ 
     /**
      * Used to set price
      *
-     * @param object $price Ilib_Variable_Float
+     * @param Ilib_Variable_Float $price Ilib_Variable_Float
      * @return void
      */
     public function setPrice(Ilib_Variable_Float $price)
@@ -206,9 +206,9 @@ 
      * 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
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price of the variation in given currency
      */
     public function getPriceInCurrency($currency, $exchange_rate_id = 0)
     {
@@ -218,7 +218,7 @@ 
     /**
      * Returns price include vat of the product
      *
-     * @return object Ilib_Variable_Float with price including vat
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price including vat
      */
     public function getPriceIncludingVat()
     {
@@ -230,7 +230,7 @@ 
      *
      * @param object $currency Intraface_modules_currency_Currency
      * @param integer $exchange_rate_id
-     * @return object Ilib_Variable_Float with price including vat in given currency
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price including vat in given currency
      */
     public function getPriceIncludingVatInCurrency($currency, $exchange_rate_id)
     {
@@ -245,7 +245,7 @@ 
     /**
      * Returns the before price of the product
      *
-     * @return object Ilib_Variable_Float with price
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price
      */
     public function getBeforePrice()
     {
@@ -256,9 +256,9 @@ 
      * 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
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price of the variation in given currency
      */
     public function getBeforePriceInCurrency($currency, $exchange_rate_id = 0)
     {
@@ -268,7 +268,7 @@ 
     /**
      * Returns before price include vat of the product
      *
-     * @return object Ilib_Variable_Float with price including vat
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price including vat
      */
     public function getBeforePriceIncludingVat()
     {
@@ -280,7 +280,7 @@ 
      *
      * @param object $currency Intraface_modules_currency_Currency
      * @param integer $exchange_rate_id
-     * @return object Ilib_Variable_Float with price including vat in given currency
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price including vat in given currency
      */
     public function getBeforePriceIncludingVatInCurrency($currency, $exchange_rate_id)
     {
@@ -289,7 +289,7 @@ 
 
     /**
      * Sets the weight
-     * @param object $value Ilib_Value_Float
+     * @param Ilib_Variable_Float $value Ilib_Value_Float
      * @return void
      */
     public function setWeight(Ilib_Variable_Float $value)
@@ -300,7 +300,7 @@ 
     /**
      * Returns the weight of the product
      *
-     * @return object Ilib_Variable_Float with price
+     * @return Ilib_Variable_Float Ilib_Variable_Float with price
      */
     public function getWeight()
     {
@@ -361,7 +361,7 @@ 
     /**
      * Returns the var percenttage of the product
      *
-     * @return object Ilib_Variable_Float with vat percent
+     * @return Ilib_Variable_Float Ilib_Variable_Float with vat percent
      */
     public function getVatPercent()
     {

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/Controller/Show/PlainText.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
             'db' => $this->mdb2
         );
         
-        $smarty = $this->template->create(dirname(__FILE__) . '/../tpl/show-plain-text');
+        $smarty = $this->template->create(dirname(__FILE__).'/../tpl/show-plain-text');
         return $smarty->render($this, $data);
     }