intraface / intraface.dk

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 
         $this->document->setTitle('Memos');
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/memos');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/memos');
 
         if (is_numeric($this->context->name())) {
             return $tpl->render($this, array('memos' => $gateway->findByContactId($this->context->name())));
@@ -34,7 +34,7 @@ 
         $reminder = new ContactReminder($this->context->getKernel());
         $contact = $reminder->contact;
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/memo-edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/memo-edit');
         return $smarty->render($this, array('reminder' => $reminder, 'contact' => $contact));
     }
 

src/Intraface/modules/contact/Contact.php

Spacing +24 added lines, -24 removed lines

@@ -114,7 +114,7 @@ 
  * @author  Sune Jensen <sj@sunet.dk>
  * @copyright   Lars Olesen
  */
-require_once dirname(__FILE__) . '/ContactPerson.php';
+require_once dirname(__FILE__).'/ContactPerson.php';
 require_once 'Intraface/functions.php';
 
 class Contact extends Intraface_Standard
@@ -381,7 +381,7 @@ 
     {
         // HACK NECCESSARY FOR THE NEWSLETTERSUBSCRIBER
         $this->kernel->useModule('contact');
-        return ($this->value['login_url'] = 'http://' . $this->kernel->getSetting()->get('intranet', 'contact.login_url') . '/' .$this->kernel->intranet->get('identifier') . '/login?code='. $this->get('code'));
+        return ($this->value['login_url'] = 'http://'.$this->kernel->getSetting()->get('intranet', 'contact.login_url').'/'.$this->kernel->intranet->get('identifier').'/login?code='.$this->get('code'));
     }
 
     /**
@@ -551,16 +551,16 @@ 
 
         // prepare sql to update or insert
         if ($this->id > 0) {
-            $sql="UPDATE contact ";
-            $sql_after=" WHERE id='".$this->id."'";
+            $sql = "UPDATE contact ";
+            $sql_after = " WHERE id='".$this->id."'";
             $sql_create = "";
         } else {
-            $sql="INSERT INTO contact ";
-            $sql_after = ", code='".safeToDb(md5(date('Y-m-d H:i:s') . $sql_items))."'";
+            $sql = "INSERT INTO contact ";
+            $sql_after = ", code='".safeToDb(md5(date('Y-m-d H:i:s').$sql_items))."'";
             $sql_create = "date_created = NOW(),";
         }
 
-        $sql .= " SET	".$sql_create. "
+        $sql .= " SET	".$sql_create."
             intranet_id = '". $this->kernel->intranet->get('id')."',"
             .$sql_items.
             "date_changed = NOW()
@@ -590,7 +590,7 @@ 
             // Delivery Address
         foreach ($address_fields as $key => $value) {
             if (array_key_exists('delivery_'.$value, $var)) {
-                $delivery_address_to_save[$value] = $var['delivery_' . $value];
+                $delivery_address_to_save[$value] = $var['delivery_'.$value];
             }
         }
 
@@ -624,7 +624,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE contact SET active = 0, date_changed = NOW() WHERE intranet_id = " . $this->kernel->intranet->get("id") . " AND id = " . $this->id);
+        $db->query("UPDATE contact SET active = 0, date_changed = NOW() WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND id = ".$this->id);
         return true;
     }
 
@@ -644,7 +644,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE contact SET active = 1, date_changed = NOW() WHERE intranet_id = " . $this->kernel->intranet->get("id") . " AND id = " . $this->id);
+        $db->query("UPDATE contact SET active = 1, date_changed = NOW() WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND id = ".$this->id);
 
         return true;
     }
@@ -662,9 +662,9 @@ 
         $db = new DB_Sql();
         $sql = "SELECT id
             FROM contact
-            WHERE intranet_id = " . $this->kernel->intranet->get("id") . "
-                AND number = " . (int)$number . "
-                AND id <> " . $this->id . "
+            WHERE intranet_id = " . $this->kernel->intranet->get("id")."
+                AND number = " . (int)$number."
+                AND id <> " . $this->id."
                 AND active = 1
             LIMIT 1";
         $db->query($sql);
@@ -684,7 +684,7 @@ 
     public function getMaxNumber()
     {
         $db = new DB_Sql();
-        $db->query("SELECT number FROM contact WHERE intranet_id = " . $this->kernel->intranet->get("id") . " ORDER BY number DESC");
+        $db->query("SELECT number FROM contact WHERE intranet_id = ".$this->kernel->intranet->get("id")." ORDER BY number DESC");
         if (!$db->nextRecord()) {
             return 0;
         }
@@ -776,11 +776,11 @@ 
                 WHERE address.type=3
                     AND contact.active = 1
                     AND address.active = 1
-                    AND contact.intranet_id = " . $db->quote($this->kernel->intranet->get('id'), 'integer') . "
-                    AND contact.id != " . $db->quote($this->id, 'integer') . "
+                    AND contact.intranet_id = " . $db->quote($this->kernel->intranet->get('id'), 'integer')."
+                    AND contact.id != " . $db->quote($this->id, 'integer')."
                     AND (
-                        (address.email = " . $db->quote($this->address->get('email'), 'text') . " AND address.email != '')
-                        OR (address.phone = " . $db->quote($this->address->get('phone'), 'text') . " AND address.phone != ''))
+                        (address.email = " . $db->quote($this->address->get('email'), 'text')." AND address.email != '')
+                        OR (address.phone = " . $db->quote($this->address->get('phone'), 'text')." AND address.phone != ''))
 
                     ";
 
@@ -869,7 +869,7 @@ 
     function isFilledIn()
     {
         $db = new DB_Sql;
-        $db->query("SELECT count(*) AS antal FROM contact WHERE intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT count(*) AS antal FROM contact WHERE intranet_id = ".$this->kernel->intranet->get('id'));
         if ($db->nextRecord()) {
             return $db->f('antal');
         }
@@ -887,7 +887,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE contact SET code = '".md5($this->id . date('Y-m-d H:i:s') . $this->kernel->intranet->get('id'))."' WHERE id = " . $this->id);
+        $db->query("UPDATE contact SET code = '".md5($this->id.date('Y-m-d H:i:s').$this->kernel->intranet->get('id'))."' WHERE id = ".$this->id);
         $this->load();
         return true;
     }
@@ -904,7 +904,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE contact SET password = '".md5($this->id . date('Y-m-d H:i:s') . $this->kernel->intranet->get('id'))."' WHERE id = " . $this->id);
+        $db->query("UPDATE contact SET password = '".md5($this->id.date('Y-m-d H:i:s').$this->kernel->intranet->get('id'))."' WHERE id = ".$this->id);
         $this->load();
         return true;
     }
@@ -917,7 +917,7 @@ 
     function getNewsletterSubscriptions()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM newsletter_subscriber WHERE optin = 1 AND active = 1 AND contact_id = " . $this->id . " AND intranet_id =" . $this->kernel->intranet->get('id'));
+        $db->query("SELECT * FROM newsletter_subscriber WHERE optin = 1 AND active = 1 AND contact_id = ".$this->id." AND intranet_id =".$this->kernel->intranet->get('id'));
         $lists = array();
         while ($db->nextRecord()) {
             $lists[] = $db->f('list_id');
@@ -933,7 +933,7 @@ 
     function needNewsletterOptin()
     {
         $db = new DB_Sql;
-        $db->query("SELECT list_id, code FROM newsletter_subscriber WHERE optin = 0 AND contact_id = " . $this->id . " AND intranet_id =" . $this->kernel->intranet->get('id'));
+        $db->query("SELECT list_id, code FROM newsletter_subscriber WHERE optin = 0 AND contact_id = ".$this->id." AND intranet_id =".$this->kernel->intranet->get('id'));
         $lists = array();
         $i = 0;
         while ($db->nextRecord()) {
@@ -954,7 +954,7 @@ 
     function canBeDeleted()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM debtor WHERE contact_id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT * FROM debtor WHERE contact_id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return true;
         }

src/Intraface/modules/currency/Currency/ExchangeRate.php

Spacing +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
      */
     public function convertAmountToCurrency($amount)
     {
-        return new Ilib_Variable_Float($amount->getAsIso() / ($this->getRate()->getAsIso() / 100));
+        return new Ilib_Variable_Float($amount->getAsIso()/($this->getRate()->getAsIso()/100));
     }
     
     
@@ -89,7 +89,7 @@ 
      */
     public function convertAmountFromCurrency($amount)
     {
-        return new Ilib_Variable_Float($amount->getAsIso() * ($this->getRate()->getAsIso() / 100));
+        return new Ilib_Variable_Float($amount->getAsIso()*($this->getRate()->getAsIso()/100));
     }
 
     public function getUsedForTypes()

src/Intraface/modules/debtor/Visitor/Pdf.php

Spacing +19 added lines, -19 removed lines

@@ -74,7 +74,7 @@ 
 
         $this->doc->setY('-'.$this->doc->get("font_spacing"));
 
-        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
             $this->doc->nextPage(true);
         }
 
@@ -83,7 +83,7 @@ 
             foreach ($text as $line) {
                 if ($line == "") {
                     $this->doc->setY('-'.$this->doc->get("font_spacing"));
-                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                         $this->doc->nextPage(true);
                     }
                 } else {
@@ -91,7 +91,7 @@ 
                         $this->doc->setY('-'.($this->doc->get("font_padding_top") + $this->doc->get("font_size")));
                         $line = $this->doc->addTextWrap($this->doc->get('margin_left'), $this->doc->get('y'), $this->doc->get('content_width'), $this->doc->get("font_size"), $line);
                         $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
-                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                             $this->doc->nextPage(true);
                         }
                     }
@@ -116,7 +116,7 @@ 
         $this->doc->addText($apointX["tekst"], $this->doc->get('y'), $this->doc->get("font_size"), "Tekst");
         $this->doc->addText($apointX["antal"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Antal"), $this->doc->get('y'), $this->doc->get("font_size"), "Antal");
         $this->doc->addText($apointX["pris"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Pris"), $this->doc->get('y'), $this->doc->get("font_size"), "Pris");
-        $this->doc->addText($apointX["beloeb"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Beløb") -3, $this->doc->get('y'), $this->doc->get("font_size"), "Beløb");
+        $this->doc->addText($apointX["beloeb"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Beløb") - 3, $this->doc->get('y'), $this->doc->get("font_size"), "Beløb");
 
         $this->doc->setY('-'.($this->doc->get("font_spacing") - $this->doc->get("font_size")));
 
@@ -138,7 +138,7 @@ 
 
         $bg_color = 0;
 
-        for ($i = 0, $max = count($items); $i <  $max; $i++) {
+        for ($i = 0, $max = count($items); $i < $max; $i++) {
             $vat = $items[$i]["vat"];
 
             if ($bg_color == 1) {
@@ -161,9 +161,9 @@ 
             }
             
             if ($debtor->getCurrency()) {
-                $amount =  $items[$i]["quantity"] * $items[$i]["price_currency"]->getAsIso(2);
+                $amount = $items[$i]["quantity"]*$items[$i]["price_currency"]->getAsIso(2);
             } else {
-                $amount =  $items[$i]["quantity"] * $items[$i]["price"]->getAsIso(2);
+                $amount = $items[$i]["quantity"]*$items[$i]["price"]->getAsIso(2);
             }
             $total += $amount;
 
@@ -187,7 +187,7 @@ 
 
                 $tekst = $this->doc->addTextWrap($apointX["tekst"], $this->doc->get('y'), $apointX["tekst_width_small"], $this->doc->get("font_size"), $tekst);
                 $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
-                if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                     $this->doc->nextPage(true);
                 }
             }
@@ -210,7 +210,7 @@ 
                             $this->doc->setColor(0, 0, 0);
                         }
                         $this->doc->setY('-'.$this->doc->get("font_spacing"));
-                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                             $this->doc->nextPage(true);
                         }
                     } else {
@@ -225,7 +225,7 @@ 
                             $line = $this->doc->addTextWrap($apointX["tekst"], $this->doc->get('y') + 1, $apointX["tekst_width"], $this->doc->get("font_size"), $line); // Ups Ups, hvor kommer '+ 1' fra - jo ser du, ellers kappes det nederste af teksten!
                             $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
 
-                            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                                 $this->doc->nextPage(true);
                             }
                         }
@@ -233,12 +233,12 @@ 
                 }
             }
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
 
             // If products with VAT and next post is without we add VAT.
-            if (($vat == 1 && isset($items[$i+1]["vat"]) && $items[$i+1]["vat"] == 0) || ($vat == 1 && $i+1 >= $max)) {
+            if (($vat == 1 && isset($items[$i + 1]["vat"]) && $items[$i + 1]["vat"] == 0) || ($vat == 1 && $i + 1 >= $max)) {
                 // If VAT on current product, but next has no VAT OR if VAT and last product
 
                 ($bg_color == 1) ? $bg_color = 0 : $bg_color = 1;
@@ -253,8 +253,8 @@ 
                 $this->doc->line($this->doc->get("margin_left"), $this->doc->get('y'), $this->doc->get('right_margin_position'), $this->doc->get('y'));
                 $this->doc->setY('-'.($this->doc->get("font_size") + $this->doc->get("font_padding_top")));
                 $this->doc->addText($apointX["tekst"], $this->doc->get('y'), $this->doc->get("font_size"), "<b>25% moms af ".number_format($total, 2, ",", ".")."</b>");
-                $this->doc->addText($apointX["beloeb"] - $this->doc->getTextWidth($this->doc->get("font_size"), "<b>".number_format($total * 0.25, 2, ",", ".")."</b>"), $this->doc->get('y'), $this->doc->get("font_size"), "<b>".number_format($total * 0.25, 2, ",", ".")."</b>");
-                $total = $total * 1.25;
+                $this->doc->addText($apointX["beloeb"] - $this->doc->getTextWidth($this->doc->get("font_size"), "<b>".number_format($total*0.25, 2, ",", ".")."</b>"), $this->doc->get('y'), $this->doc->get("font_size"), "<b>".number_format($total*0.25, 2, ",", ".")."</b>");
+                $total = $total*1.25;
                 $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
                 $this->doc->line($this->doc->get("margin_left"), $this->doc->get('y'), $this->doc->get('right_margin_position'), $this->doc->get('y'));
                 $this->doc->setLineStyle(1);
@@ -265,7 +265,7 @@ 
         }
 
 
-        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
             $this->doc->nextPage();
         }
 
@@ -290,7 +290,7 @@ 
             $total_text = "Total ".$currency_iso_code.":";
         }
 
-        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
             $this->doc->nextPage(true);
         }
 
@@ -326,7 +326,7 @@ 
 
             $this->doc->setY('-'.$this->doc->get("font_spacing"));
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
 
@@ -334,7 +334,7 @@ 
             foreach ($text as $line) {
                 if ($line == "") {
                     $this->doc->setY('-'.$this->doc->get("font_spacing"));
-                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                         $this->doc->nextPage(true);
                     }
                 } else {
@@ -343,7 +343,7 @@ 
                         $line = $this->doc->addTextWrap($this->doc->get('margin_left'), $this->doc->get('y'), $this->doc->get('content_width'), $this->doc->get("font_size"), $line);
                         $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
 
-                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                             $this->doc->nextPage(true);
                         }
                     }