intraface / intraface.dk

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

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
             'payments' => $payments,
             'onlinepayment' => $onlinepayment);
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
         return $smarty->render($this, $data);
     }
 }

src/Intraface/modules/newsletter/NewsletterSubscriber.php

Spacing +23 added lines, -23 removed lines

@@ -52,7 +52,7 @@ 
             return $this->dbquery;
         }
         // optin = 1 should not be set here
-        $this->dbquery = new Intraface_DBQuery($this->list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=". $this->list->get("id") . " AND newsletter_subscriber.intranet_id = " . $this->list->kernel->intranet->get('id'));
+        $this->dbquery = new Intraface_DBQuery($this->list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=".$this->list->get("id")." AND newsletter_subscriber.intranet_id = ".$this->list->kernel->intranet->get('id'));
         $this->dbquery->setJoin("LEFT", "contact", "newsletter_subscriber.contact_id = contact.id AND contact.intranet_id = ".$this->list->kernel->intranet->get("id"), '');
         $this->dbquery->setJoin("LEFT", "address", "address.belong_to_id = contact.id AND address.active = 1 AND address.type = 3", '');
         $this->dbquery->useErrorObject($this->error);
@@ -135,7 +135,7 @@ 
     private function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM newsletter_subscriber WHERE id = " . $this->id." and active = 1");
+        $db->query("SELECT * FROM newsletter_subscriber WHERE id = ".$this->id." and active = 1");
         if (!$db->nextRecord()) {
             $this->id = 0;
             $this->value['id'] = 0;
@@ -158,7 +158,7 @@ 
     public function delete()
     {
         $db = new DB_Sql;
-        $db->query('UPDATE newsletter_subscriber SET active = 0 WHERE id = ' . $this->id);
+        $db->query('UPDATE newsletter_subscriber SET active = 0 WHERE id = '.$this->id);
         return true;
     }
 
@@ -184,7 +184,7 @@ 
     {
         $db = new DB_sql;
 
-        $db->query("SELECT id FROM newsletter_subscriber WHERE contact_id = '".$contact->getId()."' AND list_id = " . $this->list->get("id") . " AND intranet_id = ".$this->list->kernel->intranet->get('id')." AND active = 1");
+        $db->query("SELECT id FROM newsletter_subscriber WHERE contact_id = '".$contact->getId()."' AND list_id = ".$this->list->get("id")." AND intranet_id = ".$this->list->kernel->intranet->get('id')." AND active = 1");
         if ($db->nextRecord()) {
             return $db->f('id');
         }
@@ -192,10 +192,10 @@ 
         // Spørgsmålet er om vedkommende bør få en e-mail, hvor man kan acceptere?
         $db->query("INSERT INTO newsletter_subscriber SET
                     contact_id = '".$contact->getId()."',
-                    list_id = " . $this->list->get("id") . ",
+                    list_id = " . $this->list->get("id").",
                     date_submitted=NOW(),
                     optin = 1,
-                    code = '".md5($this->list->get("id") . $this->list->kernel->intranet->get('id') . date('Y-m-d H:i:s') . $contact->getId())."',
+                    code = '".md5($this->list->get("id").$this->list->kernel->intranet->get('id').date('Y-m-d H:i:s').$contact->getId())."',
                     intranet_id = ".$this->list->kernel->intranet->get('id'));
 
         return $db->insertedId();
@@ -214,7 +214,7 @@ 
         $input = array_map('strip_tags', $input);
 
         $validator = new Intraface_Validator($this->error);
-        $validator->isEmail($input['email'], $input['email'] . ' er ikke en gyldig e-mail');
+        $validator->isEmail($input['email'], $input['email'].' er ikke en gyldig e-mail');
 
         if (empty($input['name'])) {
             $input['name'] = $input['email'];
@@ -282,7 +282,7 @@ 
                     date_submitted = NOW(),
                     ip_submitted = '".$input['ip']."'
                 WHERE id = ".$this->id."
-                    AND list_id = " . $this->list->get("id") . "
+                    AND list_id = " . $this->list->get("id")."
                     AND intranet_id = " . $this->list->kernel->intranet->get('id'));
             //code =  '" . md5($input['email'] . date('Y-m-d H:i:s') . $input['ip'])."'
         } else {
@@ -305,10 +305,10 @@ 
                     contact_id = '".$contact->get('id')."',
                     email = '".$input['email']."',
                     name='".$input['name']."',
-                    list_id = " . $this->list->get("id") . ",
+                    list_id = " . $this->list->get("id").",
                     ip_submitted='".$input['ip']."',
                     date_submitted=NOW(),
-                    code= '" . md5($input['email'] . date('Y-m-d H:i:s') . $input['ip'])."',
+                    code= '" . md5($input['email'].date('Y-m-d H:i:s').$input['ip'])."',
                     intranet_id = ".$this->list->kernel->intranet->get('id'));
         }
 
@@ -342,7 +342,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("SELECT * FROM newsletter_subscriber WHERE id = " . $this->id." and active = 1");
+        $db->query("SELECT * FROM newsletter_subscriber WHERE id = ".$this->id." and active = 1");
         if (!$db->nextRecord()) {
             return false;
         }
@@ -380,7 +380,7 @@ 
         $this->load();
 
         $db = new DB_Sql;
-        $db->query("UPDATE newsletter_subscriber SET active = 0, date_unsubscribe = '".date('Y-m-d H:i:s')."' WHERE id=".$this->id." AND list_id = " . $this->list->get("id") . " AND intranet_id = " . $this->list->kernel->intranet->get('id'));
+        $db->query("UPDATE newsletter_subscriber SET active = 0, date_unsubscribe = '".date('Y-m-d H:i:s')."' WHERE id=".$this->id." AND list_id = ".$this->list->get("id")." AND intranet_id = ".$this->list->kernel->intranet->get('id'));
         return true;
     }
 
@@ -398,16 +398,16 @@ 
         // optin really wants to optin, so we will not make that a part of the select query
         // and we will set it in the update query
         $db = new DB_Sql;
-        $db->query("SELECT id, ip_submitted FROM newsletter_subscriber WHERE code = '".$code."' AND list_id = " . $this->list->get('id'));
+        $db->query("SELECT id, ip_submitted FROM newsletter_subscriber WHERE code = '".$code."' AND list_id = ".$this->list->get('id'));
         if (!$db->nextRecord()) {
             return false;
         }
 
-        $db->query("UPDATE newsletter_subscriber SET optin = 1, ip_optin = '".$ip."', date_optin = NOW(), active = 1 WHERE code = '" . $code . "' AND list_id = " . $this->list->get('id'));
+        $db->query("UPDATE newsletter_subscriber SET optin = 1, ip_optin = '".$ip."', date_optin = NOW(), active = 1 WHERE code = '".$code."' AND list_id = ".$this->list->get('id'));
 
         // makes sure that the submitted ip is also set - not really a part of this method.
         if ($db->f('ip_submitted')) {
-            $db->query("UPDATE newsletter_subscriber SET ip_submitted = '".$ip."' WHERE id = " . $db->f("id"));
+            $db->query("UPDATE newsletter_subscriber SET ip_submitted = '".$ip."' WHERE id = ".$db->f("id"));
         }
         return true;
     }
@@ -452,8 +452,8 @@ 
         $data = array(
                 'subject' => $subscribe_subject,
                 'body' =>
-                    $this->list->get('subscribe_message') . "\n\n" .
-                    $this->getLoginUrl($contact) .
+                    $this->list->get('subscribe_message')."\n\n".
+                    $this->getLoginUrl($contact).
                     "\n\n".$this->list->get('sender_name'),
                 'contact_id' => $this->get('contact_id'),
                 'from_email' => $this->list->get('reply_email'),
@@ -463,16 +463,16 @@ 
             );
 
         if (!$email->save($data)) {
-            $this->error->set('could not send the e-mail' . implode(',', $email->error->messages));
+            $this->error->set('could not send the e-mail'.implode(',', $email->error->messages));
             return false;
         }
 
         if ($email->queue()) {
             $db = new DB_Sql;
-            $db->query("UPDATE newsletter_subscriber SET date_optin_email_sent = NOW() WHERE id = " . $this->id);
+            $db->query("UPDATE newsletter_subscriber SET date_optin_email_sent = NOW() WHERE id = ".$this->id);
             return true;
         }
-        $this->error->set('could not send the e-mail' . implode(',', $email->error->message));
+        $this->error->set('could not send the e-mail'.implode(',', $email->error->message));
         return false;
     }
 
@@ -484,7 +484,7 @@ 
     {
         if ($this->sendOptInEmail()) {
             $db = new DB_Sql;
-            $db->query("UPDATE newsletter_subscriber SET resend_optin_email_count = resend_optin_email_count + 1 WHERE id = " . $this->id);
+            $db->query("UPDATE newsletter_subscriber SET resend_optin_email_count = resend_optin_email_count + 1 WHERE id = ".$this->id);
             return true;
         }
     }
@@ -492,9 +492,9 @@ 
     private function getLoginUrl($contact)
     {
         if (!$link = $this->list->get('optin_link')) {
-            return $contact->getLoginUrl() . '&optin=' . $this->get('code');
+            return $contact->getLoginUrl().'&optin='.$this->get('code');
         }
-        return $link . '?optin=' . $this->get('code');
+        return $link.'?optin='.$this->get('code');
     }
 
     /**

src/Intraface/modules/product/ProductDetail.php

Spacing +15 added lines, -15 removed lines

@@ -77,14 +77,14 @@ 
 
         $sql = "SELECT product_detail.id, product_detail.unit AS unit_key,".implode(',', $this->fields).", product_detail_translation.name, product_detail_translation.description FROM product_detail
             LEFT JOIN product_detail_translation ON product_detail.id = product_detail_translation.id AND product_detail_translation.lang = 'da'
-            WHERE ".$sql . "
-            AND product_id = " . $this->product->get('id') . ' AND intranet_id = ' . $this->product->intranet->getId();
+            WHERE ".$sql."
+            AND product_id = " . $this->product->get('id').' AND intranet_id = '.$this->product->intranet->getId();
         $this->db->query($sql);
         if ($this->db->numRows() > 1) {
             throw new Exception('Der er mere end en aktiv produktdetalje');
         } elseif ($this->db->nextRecord()) {
             // hardcoded udtr�k af nogle vigtige oplysnigner, som vi ikke kan have i feltlisten
-            for ($i = 0, $max = count($this->fields); $i<$max; $i++) {
+            for ($i = 0, $max = count($this->fields); $i < $max; $i++) {
                 $this->value[$this->fields[$i]] = $this->db->f($this->fields[$i]);
             }
             $this->value['name'] = $this->db->f('name');
@@ -100,13 +100,13 @@ 
                 exit;
             }
 
-            $this->value['unit_id']   = $this->db->f('unit_key');
-            $this->value['unit']     = $unit;
+            $this->value['unit_id'] = $this->db->f('unit_key');
+            $this->value['unit'] = $unit;
 
             // udregne moms priser ud fra prisen, men kun hvis der er moms p� den
             if ($this->db->f('vat') == 1) {
                 $this->value['vat_percent'] = 25;
-                $this->value['price_incl_vat'] = round((float)$this->db->f('price') + ((float)$this->db->f('price') * 0.25), 2);
+                $this->value['price_incl_vat'] = round((float)$this->db->f('price') + ((float)$this->db->f('price')*0.25), 2);
             } else {
                 $this->value['vat_percent'] = 0;
                 $this->value['price_incl_vat'] = round((float)$this->db->f('price'), 2);
@@ -269,8 +269,8 @@ 
             return true;
         } else {
             // vi opdaterer produktet
-            $this->db->query("UPDATE product_detail SET active = 0 WHERE product_id = " . $this->product->get('id'));
-            $this->db->query("INSERT INTO product_detail SET ".$sql." active = 1, changed_date = NOW(), product_id = " . $this->product->get('id') . ", intranet_id = " . $this->product->intranet->getId());
+            $this->db->query("UPDATE product_detail SET active = 0 WHERE product_id = ".$this->product->get('id'));
+            $this->db->query("INSERT INTO product_detail SET ".$sql." active = 1, changed_date = NOW(), product_id = ".$this->product->get('id').", intranet_id = ".$this->product->intranet->getId());
             $this->detail_id = $this->db->insertedId();
             $this->db->query("INSERT INTO product_detail_translation SET name = \"".$array_var['name']."\", description = \"".$array_var['description']."\", lang = 'da', id = ".$this->detail_id);
 
@@ -291,17 +291,17 @@ 
 
     public function getPriceInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2), 'iso');
     }
 
     public function getPriceIncludingVat()
     {
-        return new Ilib_Variable_Float(round($this->get('price') * (1 + $this->getVatPercent()->getAsIso()/100), 2));
+        return new Ilib_Variable_Float(round($this->get('price')*(1 + $this->getVatPercent()->getAsIso()/100), 2));
     }
 
     public function getPriceIncludingVatInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100) * (1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100)*(1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
     }
 
     public function getBeforePrice()
@@ -311,17 +311,17 @@ 
 
     public function getBeforePriceInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2), 'iso');
     }
 
     public function getBeforePriceIncludingVat()
     {
-        return new Ilib_Variable_Float(round($this->get('before_price') * (1 + $this->getVatPercent()->getAsIso()/100), 2));
+        return new Ilib_Variable_Float(round($this->get('before_price')*(1 + $this->getVatPercent()->getAsIso()/100), 2));
     }
 
     public function getBeforePriceIncludingVatInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('before_price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100) * (1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('before_price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100)*(1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
     }
 
     public function getVatPercent()
@@ -372,7 +372,7 @@ 
     function setStateAccountId($id)
     {
         $db = new DB_Sql;
-        $db->query('UPDATE product_detail SET state_account_id = ' . $id . ' WHERE id = ' . $this->detail_id);
+        $db->query('UPDATE product_detail SET state_account_id = '.$id.' WHERE id = '.$this->detail_id);
         $this->load();
         $this->product->load();
         return true;

src/Intraface/modules/product/Attribute.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         
         $this->hasOne(
             'Intraface_modules_product_Variation_X_Attribute as variation_x_attribute',
-            array( 'local' => 'id','foreign' => 'product_attribute_id')
+            array('local' => 'id', 'foreign' => 'product_attribute_id')
         );
     }
 

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

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
         $data = array('products' => $products, 'product' => $product);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/batchpricechanger');
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/batchpricechanger');
         return $tpl->render($this, $data);
     }
 
@@ -29,7 +29,7 @@ 
         foreach ($this->body('product_id') as $key => $product_id) {
             $product = new Product($this->context->getKernel(), $product_id);
             if ($this->body('change_type') == 'percent') {
-                $new_price = $product->get('price') + intval($product->get('price') * ($_POST['price_change'] / 100));
+                $new_price = $product->get('price') + intval($product->get('price')*($_POST['price_change']/100));
                 if ($this->body('round_off') == 'yes') {
                     $new_price = round($new_price, 0);
                 }

src/Intraface/modules/product/ProductDoctrine.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 
     public function getCollectedErrorStack()
     {
-        $stack =& $this->getErrorStack();
+        $stack = & $this->getErrorStack();
         if (is_object($this->active_details)) {
             foreach ($this->active_details->getErrorStack() as $field => $errors) {
                 foreach ($errors as $error) {

src/Intraface/modules/product/Variation/X/Attribute.php

Spacing +2 added lines, -2 removed lines

@@ -19,10 +19,10 @@
         //$this->loadTemplate('Intraface_Doctrine_Template_Intranet');
         $this->actAs('Intraface_Doctrine_Template_Intranet');
         
-        $this->hasOne('Intraface_modules_product_Attribute as attribute', array('local' => 'product_attribute_id','foreign' => 'id'));
+        $this->hasOne('Intraface_modules_product_Attribute as attribute', array('local' => 'product_attribute_id', 'foreign' => 'id'));
         // Notice that Variation/OneAttributeGroup and TwoAttributeGroup extends Variation, which means we do not get
         // all functionality in the relation specified below here.
-        $this->hasOne('Intraface_modules_product_Variation as variation', array('local' => 'product_variation_id','foreign' => 'id'));
+        $this->hasOne('Intraface_modules_product_Variation as variation', array('local' => 'product_variation_id', 'foreign' => 'id'));
         
     }
 }

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

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         } elseif (count($this->groups) == 1) {
             $this->variation = new Intraface_modules_product_Variation_OneAttributeGroup;
         } elseif (count($this->groups) == 2) {
-            $this->variation =  new Intraface_modules_product_Variation_TwoAttributeGroups;
+            $this->variation = new Intraface_modules_product_Variation_TwoAttributeGroups;
         } else {
             throw new Exception('At the moment the system only supports up to two attribute groups!');
         }

src/Intraface/modules/contact/Controller/Contactpersons.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         $contact = $this->context->getContact();
         $person = $contact->loadContactPerson(0);
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/contactperson-edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/contactperson-edit');
         return $smarty->render($this, array('person' => $person, 'contact' => $contact));
     }