intraface / intraface.dk

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

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 
         if (isset($_GET['change_product'])) {
         	$redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
-        	$url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('selectproduct'), NET_SCHEME . NET_HOST . $this->url());
+        	$url = $redirect->setDestination(NET_SCHEME.NET_HOST.$this->url('selectproduct'), NET_SCHEME.NET_HOST.$this->url());
         	$redirect->askParameter('product_id');
         	return new k_SeeOther($url);
         }
@@ -44,7 +44,7 @@ 
         }
         */
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/item-edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/item-edit');
         return $smarty->render($this);
     }
 

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

Spacing +23 added lines, -23 removed lines

@@ -51,7 +51,7 @@ 
             }

         }

 

-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/reminder');

+        $smarty = $this->template->create(dirname(__FILE__).'/templates/reminder');

         return $smarty->render($this);

     }

 

@@ -82,7 +82,7 @@ 
             $checked_reminder[] = $reminders[$i]["reminder_id"];

         }

 

-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/reminder-edit');

+        $smarty = $this->template->create(dirname(__FILE__).'/templates/reminder-edit');

         return $smarty->render($this, array('value' => $value, 'checked_invoice' => $checked_invoice, 'checked_reminder' => $checked_reminder));

     }

 

@@ -180,14 +180,14 @@ 
             throw new Exception('Kontaktpersonen har ikke nogen email');

         }

 

-        $subject  =	"Påmindelse om betaling";

+        $subject = "Påmindelse om betaling";

 

         $reminder_text = new Reminder_Text();

         $reminder_text->visit($reminder);

 

         $body = $reminder_text->getText();

 

-        switch($this->getKernel()->setting->get('intranet', 'debtor.sender')) {

+        switch ($this->getKernel()->setting->get('intranet', 'debtor.sender')) {

             case 'intranet':

                 $from_email = '';

                 $from_name = '';

@@ -218,7 +218,7 @@ 
         if ($id = $email->save($var)) {

             $redirect = new Intraface_Redirect($this->getKernel());

             $shared_email = $this->getKernel()->useModule('email');

-            $url = $redirect->setDestination($shared_email->getPath() . $id . '?edit', NET_SCHEME . NET_HOST . $this->url());

+            $url = $redirect->setDestination($shared_email->getPath().$id.'?edit', NET_SCHEME.NET_HOST.$this->url());

             $redirect->setIdentifier('send_email');

             $redirect->askParameter('send_email_status');

             return new k_SeeOther($url);

@@ -263,14 +263,14 @@ 
 

     function visit(Reminder $reminder)

     {

-        $this->output .= "Dato: " . $reminder->get("dk_this_date") ."\n\n";

-        $this->output .= $reminder->contact->address->get("name") . "\n";

+        $this->output .= "Dato: ".$reminder->get("dk_this_date")."\n\n";

+        $this->output .= $reminder->contact->address->get("name")."\n";

         if ($reminder->get("attention_to") != "") {

             $this->output .= "Att.: ".$reminder->get("attention_to")."\n";

         }

-        $this->output .= $reminder->contact->address->get("address") . "\n";

-        $this->output .= $reminder->contact->address->get("postcode") . "  " .  $reminder->contact->address->get("city") ."\n\n";

-        $this->output .= $reminder->get("text") . "\n\n";

+        $this->output .= $reminder->contact->address->get("address")."\n";

+        $this->output .= $reminder->contact->address->get("postcode")."  ".$reminder->contact->address->get("city")."\n\n";

+        $this->output .= $reminder->get("text")."\n\n";

 

         // Overskrifter - Vareudskrivning

         $this->output .= "Beskrivelse          Dato        Forfaldsdato    Bel�b\n";

@@ -280,25 +280,25 @@ 
         for ($i = 0, $max = count($items); $i < $max; $i++) {

             $this->output .= "\nFak# ".$items[$i]["number"];

             $spaces = -strlen($items[$i]["number"]) - 5 + 20;

-            for ($j = 0; $j < $spaces; $j++) { $this->output .= ' ';  }

-                $this->output .= ' ' . $items[$i]["dk_this_date"];

-                $this->output .= '  ' . $items[$i]["dk_due_date"];

-                $this->output .= '      ' . number_format($items[$i]["arrears"], 2, ",", ".");

+            for ($j = 0; $j < $spaces; $j++) { $this->output .= ' '; }

+                $this->output .= ' '.$items[$i]["dk_this_date"];

+                $this->output .= '  '.$items[$i]["dk_due_date"];

+                $this->output .= '      '.number_format($items[$i]["arrears"], 2, ",", ".");

                 $total += $items[$i]["arrears"];

             }

             $items = $reminder->item->getList("reminder");

             for ($i = 0, $max = count($items); $i < $max; $i++) {

                 $this->output .= "\nTidl. rykkkergebyr  ";

-                $this->output .= ' ' . $items[$i]["dk_this_date"];

-                $this->output .= '  ' .$items[$i]["dk_due_date"];

-                $this->output .= '      ' . number_format($items[$i]["reminder_fee"], 2, ",", ".");

+                $this->output .= ' '.$items[$i]["dk_this_date"];

+                $this->output .= '  '.$items[$i]["dk_due_date"];

+                $this->output .= '      '.number_format($items[$i]["reminder_fee"], 2, ",", ".");

                 $total += $items[$i]["reminder_fee"];

             }

             if ($reminder->get("reminder_fee") != 0) {

                 $this->output .= "\nRykkergebyr                                      ".number_format($reminder->get("reminder_fee"), 2, ",", ".");

                 $total += $reminder->get("reminder_fee");

             }

-            $this->output .= "\n\nTotal:                                           " . number_format($total, 2, ",", ".");

+            $this->output .= "\n\nTotal:                                           ".number_format($total, 2, ",", ".");

 

             $parameter = array(

                 "contact" => $reminder->contact,

@@ -306,7 +306,7 @@ 
                 "amount" => $total,

                 "due_date" => $reminder->get("dk_due_date"),

                 "girocode" => $reminder->get("girocode"));

-            $this->output .= "\n\nDet skyldige beløb betales senest: " . $parameter['due_date'];

+            $this->output .= "\n\nDet skyldige beløb betales senest: ".$parameter['due_date'];

 

             // TODO: change to payment_method

             switch ($reminder->get('payment_method_key')) {

@@ -316,16 +316,16 @@ 
                     $this->output .= "\nBank:                ".$reminder->kernel->setting->get('intranet', 'bank_name');

                     $this->output .= "\nRegnr.:              ".$reminder->kernel->setting->get('intranet', 'bank_reg_number');

                     $this->output .= "\nKontonr.:            ".$reminder->kernel->setting->get('intranet', 'bank_account_number');

-                    $this->output .= "\nBesked til modtager: " . "Kunde #" . $reminder->contact->get("number");

+                    $this->output .= "\nBesked til modtager: "."Kunde #".$reminder->contact->get("number");

                 break;

                 case 3:

                     $this->output .= "\n\nBetaling via homebanking\n+71< ".str_repeat("0", 15 - strlen($parameter["girocode"])).$parameter["girocode"]." +".$kernel->setting->get('intranet', 'giro_account_number')."<";

                 break;

             }

 

-            $this->output .= "\n\nMed venlig hilsen\n\n" . $reminder->kernel->user->getAddress()->get("name") . "\n" .$reminder->kernel->intranet->get("name");

-            $this->output .= "\n" . $reminder->kernel->intranet->address->get("address");

-            $this->output .= "\n" . $reminder->kernel->intranet->address->get("postcode") . "  " . $reminder->kernel->intranet->address->get("city");

+            $this->output .= "\n\nMed venlig hilsen\n\n".$reminder->kernel->user->getAddress()->get("name")."\n".$reminder->kernel->intranet->get("name");

+            $this->output .= "\n".$reminder->kernel->intranet->address->get("address");

+            $this->output .= "\n".$reminder->kernel->intranet->address->get("postcode")."  ".$reminder->kernel->intranet->address->get("city");

     }

 

     public function getText()

src/Intraface/modules/shop/BasketEvaluation.php

Spacing +23 added lines, -23 removed lines

@@ -47,7 +47,7 @@ 
         $this->shop     = $shop;
         $this->id       = (int)$id;
 
-        $this->value['settings'] = array (
+        $this->value['settings'] = array(
             'evaluate_target' => array(
                 0 => 'price',
                 1 => 'weight',
@@ -85,10 +85,10 @@ 
      */
     private function load()
     {
-        $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer') . " AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));
+        $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer')." AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));
 
         if (PEAR::isError($result)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
         }
 
         if ($result->numRows() == 0) {
@@ -146,22 +146,22 @@ 
             return false;
         }
 
-        $sql = "running_index = ".$this->db->quote($input['running_index'], 'integer').", " .
-                 "evaluate_target_key = ".$this->db->quote($input['evaluate_target_key'], 'integer').", " .
-                 "evaluate_method_key = ".$this->db->quote($input['evaluate_method_key'], 'integer').", " .
-                 "evaluate_value = ".$this->db->quote($input['evaluate_value'], 'text').", " .
-                 "evaluate_value_case_sensitive = ".$this->db->quote($input['evaluate_value_case_sensitive'], 'integer').", " .
-                 "go_to_index_after = ".$this->db->quote($input['go_to_index_after'], 'integer').", " .
-                 "action_action_key = ".$this->db->quote($input['action_action_key'], 'integer').", " .
-                 "action_value = ".$this->db->quote($input['action_value'], 'text').", " .
-                 "action_quantity = ".$this->db->quote($input['action_quantity'], 'integer').", " .
+        $sql = "running_index = ".$this->db->quote($input['running_index'], 'integer').", ".
+                 "evaluate_target_key = ".$this->db->quote($input['evaluate_target_key'], 'integer').", ".
+                 "evaluate_method_key = ".$this->db->quote($input['evaluate_method_key'], 'integer').", ".
+                 "evaluate_value = ".$this->db->quote($input['evaluate_value'], 'text').", ".
+                 "evaluate_value_case_sensitive = ".$this->db->quote($input['evaluate_value_case_sensitive'], 'integer').", ".
+                 "go_to_index_after = ".$this->db->quote($input['go_to_index_after'], 'integer').", ".
+                 "action_action_key = ".$this->db->quote($input['action_action_key'], 'integer').", ".
+                 "action_value = ".$this->db->quote($input['action_value'], 'text').", ".
+                 "action_quantity = ".$this->db->quote($input['action_quantity'], 'integer').", ".
                  "action_unit_key = ".$this->db->quote($input['action_unit_key'], 'integer');
 
         if ($this->id != 0) {
-            $result = $this->db->exec("UPDATE webshop_basket_evaluation SET ".$sql." WHERE intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer')  . " AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));
+            $result = $this->db->exec("UPDATE webshop_basket_evaluation SET ".$sql." WHERE intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer')." AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));
 
             if (PEAR::isError($result)) {
-                throw new Exception($result->getMessage() . $result->getUserInfo());
+                throw new Exception($result->getMessage().$result->getUserInfo());
                 return false;
             }
 
@@ -169,13 +169,13 @@ 
             $result = $this->db->query("INSERT INTO webshop_basket_evaluation SET ".$sql.", intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer').", id = ".$this->db->quote($this->id, 'integer').", shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));
 
             if (PEAR::isError($result)) {
-                throw new Exception($result->getMessage() . $result->getUserInfo());
+                throw new Exception($result->getMessage().$result->getUserInfo());
                 return false;
             }
 
             $this->id = $this->db->lastInsertID();
             if (PEAR::isError($this->id)) {
-                throw new Exception($result->getMessage() . $result->getUserInfo());
+                throw new Exception($result->getMessage().$result->getUserInfo());
             }
         }
 
@@ -191,7 +191,7 @@ 
     {
         $result = $this->db->exec("UPDATE webshop_basket_evaluation SET active = 0 WHERE intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer'));
         if (PEAR::isError($result)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
             return false;
         }
         return true;
@@ -204,10 +204,10 @@ 
      */
     public function getList()
     {
-        $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer'). " AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer')." ORDER BY running_index");
+        $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->db->quote($this->intranet->getId(), 'integer')." AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer')." ORDER BY running_index");
 
         if (PEAR::isError($this->id)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
         }
 
         $i = 0;
@@ -249,7 +249,7 @@ 
 
             $evaluation_result = false;
 
-            switch($evaluation['evaluate_target']) {
+            switch ($evaluation['evaluate_target']) {
                 case 'price':
                     $evaluate = (double)$basket->getTotalPrice();
                     settype($evaluation['evaluate_value'], 'double');
@@ -319,7 +319,7 @@ 
                     return false;
             }
 
-            switch($evaluation['evaluate_method']) {
+            switch ($evaluation['evaluate_method']) {
                 case 'equals':
                     if ($evaluate == $evaluation['evaluate_value']) {
                         $evaluation_result = true;
@@ -348,7 +348,7 @@ 
             if ($evaluation_result) {
                 $go_to_index = $evaluation['go_to_index_after'];
 
-                switch($evaluation['action_unit']) {
+                switch ($evaluation['action_unit']) {
                     case 'pieces':
                         $quantity = $evaluation['action_quantity'];
                         break;
@@ -363,7 +363,7 @@ 
                         return false;
                 }
 
-                switch($evaluation['action_action']) {
+                switch ($evaluation['action_action']) {
                     case 'no_action':
                         // fine nothing is done
                         break;

src/Intraface/modules/shop/Shop.php

Spacing +14 added lines, -14 removed lines

@@ -4,21 +4,21 @@
     public function setTableDefinition()
     {
         $this->setTableName('shop');
-        $this->hasColumn('name',                         'string',  255);
-        $this->hasColumn('description',                  'string',  65555);
-        $this->hasColumn('identifier',                   'string',  255);
-        $this->hasColumn('show_online',                  'integer', 1);
-        $this->hasColumn('send_confirmation',            'integer', 1);
-        $this->hasColumn('confirmation_subject',         'string',  255);
-        $this->hasColumn('confirmation_greeting',        'string',  255);
-        $this->hasColumn('confirmation',                 'string',  65555);
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('description', 'string', 65555);
+        $this->hasColumn('identifier', 'string', 255);
+        $this->hasColumn('show_online', 'integer', 1);
+        $this->hasColumn('send_confirmation', 'integer', 1);
+        $this->hasColumn('confirmation_subject', 'string', 255);
+        $this->hasColumn('confirmation_greeting', 'string', 255);
+        $this->hasColumn('confirmation', 'string', 65555);
         $this->hasColumn('confirmation_add_contact_url', 'integer', 1);
-        $this->hasColumn('receipt',                      'string',  65555);
-        $this->hasColumn('payment_link',                 'string',  255);
-        $this->hasColumn('payment_link_add',             'integer', 1);
-        $this->hasColumn('terms_of_trade_url',           'string',  255);
-        $this->hasColumn('default_currency_id',          'integer');
-        $this->hasColumn('language_key',                 'integer');
+        $this->hasColumn('receipt', 'string', 65555);
+        $this->hasColumn('payment_link', 'string', 255);
+        $this->hasColumn('payment_link_add', 'integer', 1);
+        $this->hasColumn('terms_of_trade_url', 'string', 255);
+        $this->hasColumn('default_currency_id', 'integer');
+        $this->hasColumn('language_key', 'integer');
 
     }
 

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,

src/Intraface/modules/shop/PaymentMethods.php

Spacing +3 added lines, -3 removed lines

@@ -4,9 +4,9 @@
     public function setTableDefinition()
     {
         $this->setTableName('shop_paymentmethods');
-        $this->hasColumn('paymentmethod_key', 'integer',  11);
-        $this->hasColumn('text',  'string',  65555);
-        $this->hasColumn('shop_id',   'integer',  11);
+        $this->hasColumn('paymentmethod_key', 'integer', 11);
+        $this->hasColumn('text', 'string', 65555);
+        $this->hasColumn('shop_id', 'integer', 11);
     }
 
     public function setUp()

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

src/Intraface/modules/shop/DiscountCampaign/Voucher.php

Spacing +3 added lines, -3 removed lines

@@ -10,10 +10,10 @@
     {
         $this->setTableName('shop_dicount_campaign_voucher');
         $this->hasColumn('shop_discount_campaign_id', 'integer', 4, array('type' => 'integer', 'length' => 4, 'default' => '0', 'notnull' => true));
-        $this->hasColumn('code', 'string',  255, array('type' => 'string', 'length' => 255, 'notnull' => true));
+        $this->hasColumn('code', 'string', 255, array('type' => 'string', 'length' => 255, 'notnull' => true));
         $this->hasColumn('quantity', 'integer', 11, array('type' => 'integer', 'length' => 11, 'default' => '0', 'notnull' => true));
-        $this->hasColumn('date_created', 'timestamp',  NULL, array('type' => 'timestamp', 'default' => new Doctrine_Expression('NOW()'), 'notnull' => true));
-        $this->hasColumn('date_expiry', 'timestamp',  NULL, array('type' => 'timestamp', 'notnull' => true));
+        $this->hasColumn('date_created', 'timestamp', NULL, array('type' => 'timestamp', 'default' => new Doctrine_Expression('NOW()'), 'notnull' => true));
+        $this->hasColumn('date_expiry', 'timestamp', NULL, array('type' => 'timestamp', 'notnull' => true));
         $this->hasColumn('used_on_debtor_id', 'integer', 11, array('type' => 'integer', 'length' => 11, 'default' => '0', 'notnull' => true));
         $this->hasColumn('created_from_debtor_id', 'integer', 11, array('type' => 'integer', 'length' => 11, 'default' => '0', 'notnull' => true));
 

src/Intraface/modules/shop/Basket.php

Spacing +41 added lines, -41 removed lines

@@ -69,16 +69,16 @@ 
         $this->resetItemCache();
 
         $this->conditions = array(
-        	'session_id = ' . $this->db->quote($this->session_id, 'text'),
-            'shop_id = ' . $this->db->quote($this->webshop->getId(), 'integer'),
-            'intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer'));
+        	'session_id = '.$this->db->quote($this->session_id, 'text'),
+            'shop_id = '.$this->db->quote($this->webshop->getId(), 'integer'),
+            'intranet_id = '.$this->db->quote($this->intranet->getId(), 'integer'));
 
         $this->cleanUp();
     }
 
     private function cleanUp()
     {
-        return $this->db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL " . $this->db->quote(self::CLEAN_UP_AFTER, 'integer') . " HOUR) < NOW()");
+        return $this->db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL ".$this->db->quote(self::CLEAN_UP_AFTER, 'integer')." HOUR) < NOW()");
     }
 
     /**
@@ -165,23 +165,23 @@ 
                 FROM basket
                 WHERE product_id = ".$product_id."
                     AND product_variation_id = ".$product_variation_id."
-                    AND product_detail_id = " . $product_detail_id . "
-                    AND basketevaluation_product = " . $basketevaluation . "
+                    AND product_detail_id = " . $product_detail_id."
+                    AND basketevaluation_product = " . $basketevaluation."
                     AND " . $sql_extra);
 
         if ($db->nextRecord()) {
             if ($quantity == 0) {
                 $db->query("DELETE FROM basket
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
                         AND " . $sql_extra);
             } else {
                 $db->query("UPDATE basket SET
                     quantity = $quantity,
                     date_changed = NOW(),
                     text = '".$text."'
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
                         AND " . $sql_extra);
             }
             return true;
@@ -192,7 +192,7 @@ 
                         quantity = $quantity,
                         date_changed = NOW(),
                         text = '".$text."',
-                        basketevaluation_product = " . $basketevaluation . ",
+                        basketevaluation_product = " . $basketevaluation.",
                         product_id = ".$product_id.",
                         product_variation_id = ".$product_variation_id.",
                         product_detail_id = ".$product_detail_id.",
@@ -220,10 +220,10 @@ 
         settype($input['email'], 'string');
         settype($input['phone'], 'string');
 
-        $sql = "name = \"".safeToDb($input['name'])."\"," .
-            "contactperson = \"".safeToDb($input['contactperson'])."\", " .
-            "address = \"".safeToDb($input['address'])."\", " .
-            "postcode = \"".safeToDb($input['postcode'])."\", " .
+        $sql = "name = \"".safeToDb($input['name'])."\",".
+            "contactperson = \"".safeToDb($input['contactperson'])."\", ".
+            "address = \"".safeToDb($input['address'])."\", ".
+            "postcode = \"".safeToDb($input['postcode'])."\", ".
             "city = \"".safeToDb($input['city'])."\", ".
             "country = \"".safeToDb($input['country'])."\", ".
             "cvr = \"".safeToDb($input['cvr'])."\", ".
@@ -305,13 +305,13 @@ 
         $sql_extra = implode(" AND ", $this->conditions);
 
         $db = new DB_Sql;
-        $db->query("SELECT id FROM basket_details WHERE " . $sql_extra. "
+        $db->query("SELECT id FROM basket_details WHERE ".$sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if ($db->nextRecord()) {
             $db->query("UPDATE basket_details SET ".$sql.",
                 date_changed = NOW()
-                WHERE id = ".$db->f('id') . "
-                    AND " . $sql_extra . "
+                WHERE id = ".$db->f('id')."
+                    AND " . $sql_extra."
                     AND intranet_id = " . $this->intranet->getId());
             return true;
         } else {
@@ -339,7 +339,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -369,7 +369,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_coupon
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -391,7 +391,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_ean
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -413,7 +413,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_comment
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -435,7 +435,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT payment_method_key
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord() || $db->f('payment_method_key') == 0) {
             return array();
@@ -460,10 +460,10 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket
-            WHERE " . $sql_extra . "
-                AND product_id = " . $product_id . "
+            WHERE " . $sql_extra."
+                AND product_id = " . $product_id."
                 AND product_variation_id = ".$product_variation_id."
-                AND intranet_id = " . $this->intranet->getId() . "
+                AND intranet_id = " . $this->intranet->getId()."
       AND quantity > 0 LIMIT 1");
 
         if (!$db->nextRecord()) {
@@ -576,9 +576,9 @@ 
                 ON product.id = basket.product_id
             INNER JOIN product_detail
                 ON product.id = product_detail.product_id
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND product_detail.active = 1
-                AND basket.intranet_id = " . $this->intranet->getId() . "
+                AND basket.intranet_id = " . $this->intranet->getId()."
             ORDER BY product_detail.vat DESC, basket.basketevaluation_product");
 
         $i = 0;
@@ -630,16 +630,16 @@ 
 
             // basket specific
             $items[$i]['quantity'] = $db->f('quantity');
-            $items[$i]['totalweight'] = $items[$i]['weight'] * $db->f('quantity');
-            $items[$i]['totalprice'] = $db->f('quantity') * $items[$i]['price'];
-            $items[$i]['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['price_incl_vat'];
+            $items[$i]['totalweight'] = $items[$i]['weight']*$db->f('quantity');
+            $items[$i]['totalprice'] = $db->f('quantity')*$items[$i]['price'];
+            $items[$i]['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['price_incl_vat'];
 
-            $items[$i]['currency']['DKK']['totalprice'] = $db->f('quantity') * $items[$i]['currency']['DKK']['price'];
-            $items[$i]['currency']['DKK']['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['currency']['DKK']['price_incl_vat'];
+            $items[$i]['currency']['DKK']['totalprice'] = $db->f('quantity')*$items[$i]['currency']['DKK']['price'];
+            $items[$i]['currency']['DKK']['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['currency']['DKK']['price_incl_vat'];
             if (is_object($currencies) && $currencies->count() > 0) {
                 foreach ($currencies AS $currency) {
-                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice'] = $db->f('quantity') * $items[$i]['currency'][$currency->getType()->getIsoCode()]['price'];
-                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['currency'][$currency->getType()->getIsoCode()]['price_incl_vat'];
+                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice'] = $db->f('quantity')*$items[$i]['currency'][$currency->getType()->getIsoCode()]['price'];
+                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['currency'][$currency->getType()->getIsoCode()]['price_incl_vat'];
                 }
             }
 
@@ -668,10 +668,10 @@ 
     {
         $sql_extra = implode(" AND ", $this->conditions);
         $db = new DB_Sql;
-        $db->query("DELETE FROM basket " .
-                "WHERE basketevaluation_product = 1 " .
-                    "AND " . $sql_extra . " " .
-                    "AND intranet_id = " . $this->intranet->getId());
+        $db->query("DELETE FROM basket ".
+                "WHERE basketevaluation_product = 1 ".
+                    "AND ".$sql_extra." ".
+                    "AND intranet_id = ".$this->intranet->getId());
 
         $this->resetItemCache();
 
@@ -690,8 +690,8 @@ 
 
         $sql_extra = implode(" AND ", $this->conditions);
         $db = new DB_Sql;
-        $db->query("UPDATE basket SET session_id = '' WHERE " . $sql_extra . " AND intranet_id = " . $this->intranet->getId());
-        $db->query("UPDATE basket_details SET session_id = '' WHERE " . $sql_extra . " AND intranet_id = " . $this->intranet->getId());
+        $db->query("UPDATE basket SET session_id = '' WHERE ".$sql_extra." AND intranet_id = ".$this->intranet->getId());
+        $db->query("UPDATE basket_details SET session_id = '' WHERE ".$sql_extra." AND intranet_id = ".$this->intranet->getId());
 
         return true;
     }