intraface / intraface.dk

src/Intraface/modules/debtor/Controller/Payment.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
     function renderHtml()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/payment');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/payment');
         return $smarty->render($this);
     }
 
@@ -25,7 +25,7 @@ 
         $payment = $this->getModel();
         if ($id = $payment->update($_POST)) {
             if ($this->getKernel()->user->hasModuleAccess('accounting')) {
-                return new k_SeeOther($this->url($id . '/state'));
+                return new k_SeeOther($this->url($id.'/state'));
             } else {
                 return new k_SeeOther($this->url('../'));
             }

src/Intraface/modules/shop/Coordinator.php

Spacing +12 added lines, -12 removed lines

@@ -194,12 +194,12 @@ 
 
         if (isset($input['customer_coupon']) && $input['customer_coupon'] != '') {
             if ($value['message'] != '') $value['message'] .= "\n\n";
-            $value['message'] .= "Kundekupon:". $input['customer_coupon'];
+            $value['message'] .= "Kundekupon:".$input['customer_coupon'];
         }
 
         if (isset($input['customer_comment']) && $input['customer_comment'] != '') {
             if ($value['message'] != '') $value['message'] .= "\n\n";
-            $value['message'] .= "Kommentar:\n". $input['customer_comment'];
+            $value['message'] .= "Kommentar:\n".$input['customer_comment'];
         }
 
         if (isset($input['payment_method']) && is_array($input['payment_method']) && !empty($input['payment_method'])) {
@@ -324,15 +324,15 @@ 
         $email = new Email($this->kernel);
 
         if ($this->shop->getConfirmationSubject()) {
-            $subject = $this->shop->getConfirmationSubject() . ' (#' . $this->order->get('number') . ')';
+            $subject = $this->shop->getConfirmationSubject().' (#'.$this->order->get('number').')';
         } else {
-            $subject = 'Bekræftelse på bestilling (#' . $this->order->get('number') . ')';
+            $subject = 'Bekræftelse på bestilling (#'.$this->order->get('number').')';
         }
 
         $body = $this->shop->getConfirmationText();
 
         if ($this->shop->showPaymentUrl()) {
-            $body .=  "\n\n" . $this->shop->getPaymentUrl() . $this->order->getIdentifier();
+            $body .= "\n\n".$this->shop->getPaymentUrl().$this->order->getIdentifier();
         }
 
         // @todo improve this table
@@ -348,19 +348,19 @@ 
                 $currency_iso_code = 'DKK';
             }
 
-            $table->addRow(array(round($item["quantity"]), substr($item["name"], 0, 40), $currency_iso_code.' ' . $amount));
+            $table->addRow(array(round($item["quantity"]), substr($item["name"], 0, 40), $currency_iso_code.' '.$amount));
         }
 
-        $body .= "\n\n" . $table->getTable();
+        $body .= "\n\n".$table->getTable();
 
         if ($this->shop->getConfirmationGreeting()) {
-            $body .=  "\n\n" . $this->shop->getConfirmationGreeting();
+            $body .= "\n\n".$this->shop->getConfirmationGreeting();
         } else {
-            $body .= "Venlig hilsen\n".  $this->kernel->intranet->address->get('name');
+            $body .= "Venlig hilsen\n".$this->kernel->intranet->address->get('name');
         }
 
         if ($this->shop->showLoginUrl()) {
-            $body .=  "\n\n" . $this->contact->getLoginUrl();
+            $body .= "\n\n".$this->contact->getLoginUrl();
         }
 
         if (!$email->save(array('contact_id' => $this->contact->get('id'),
@@ -435,9 +435,9 @@ 
         $this->kernel->useShared('email');
         $email = new Email($this->kernel);
 
-        $subject = 'Bekræftelse på betaling (#' . $payment_id . ')';
+        $subject = 'Bekræftelse på betaling (#'.$payment_id.')';
         $body = 'Vi har modtaget din betaling. Hvis din ordre var afsendt inden kl. 12.00, sender vi den allerede i dag.';
-        $body .= "\n\nVenlig hilsen\n".  $this->kernel->intranet->address->get('name');
+        $body .= "\n\nVenlig hilsen\n".$this->kernel->intranet->address->get('name');
 
         if (!$email->save(array('contact_id' => $this->contact->get('id'),
                                 'subject' => $subject,

Doc Comments +5 added lines, -3 removed lines

@@ -226,7 +226,6 @@ 
      *
      * @param array $input    Array with customer data
      * @param array $products Array with products
-     * @param object $mailer mailer to send e-mail
      *
      * @return integer Order id
      */
@@ -392,9 +391,9 @@ 
      * @param integer $order_id
      * @param integer $transaction_number
      * @param integer $transaction_status
-     * @param float   $transaction_amount
+     * @param integer $amount
      *
-     * @return boolean
+     * @return integer
      */
     public function addOnlinePayment($order_id, $transaction_number, $transaction_status, $amount)
     {
@@ -434,6 +433,9 @@ 
         }
     }
 
+    /**
+     * @param integer $payment_id
+     */
     private function sendEmailOnOnlinePayment($payment_id)
     {
         $this->kernel->useShared('email');

src/Intraface/modules/shop/FeaturedProducts.php

Spacing +4 added lines, -4 removed lines

@@ -42,8 +42,8 @@ 
     {
         $result = $this->db->query('SELECT id 
                                     FROM shop_featuredproducts 
-                                    WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer') . ' 
-                                        AND shop_id = ' . $this->db->quote($this->shop->getId(), 'integer') . ' 
+                                    WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer').' 
+                                        AND shop_id = ' . $this->db->quote($this->shop->getId(), 'integer').' 
                                         AND keyword_id  = ' . $this->db->quote($keyword->getId(), 'integer'));
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
@@ -71,7 +71,7 @@ 
      */
     function delete($id)
     {
-        $result = $this->db->query('DELETE FROM shop_featuredproducts WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer') . ' AND shop_id = ' . $this->db->quote($this->shop->getId(), 'integer') . ' AND id  = ' . $this->db->quote($id, 'integer'));
+        $result = $this->db->query('DELETE FROM shop_featuredproducts WHERE intranet_id = '.$this->db->quote($this->intranet->getId(), 'integer').' AND shop_id = '.$this->db->quote($this->shop->getId(), 'integer').' AND id  = '.$this->db->quote($id, 'integer'));
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
         }
@@ -81,7 +81,7 @@ 
     function getAll()
     {
         $result = $this->db->query('SELECT * FROM shop_featuredproducts 
-                                    WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer') . ' 
+                                    WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer').' 
                                         AND shop_id = ' . $this->db->quote($this->shop->getId(), 'integer'));
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());

Doc Comments +2 added lines, -2 removed lines

@@ -33,10 +33,10 @@
     }
 
     /**
-     * @param string $headline Headline
      * @param object $keyword  Keyword object
+     * @param string $description
      *
-     * @return integer
+     * @return boolean
      */
     function add($description, $keyword)
     {

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);
     }