intraface / intraface.dk

src/Intraface/modules/modulepackage/Controller/Postform.php

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
             $this->body('amount'),
             $this->body('currency'),
             $language,
-            NET_SCHEME . NET_HOST. $this->url('../', array('status' => 'success')),
-            NET_SCHEME . NET_HOST. $this->url('../payment', array('action_store_identifier' => $this->body('action_store_identifier'), 'payment_error' => 'true')),
-            NET_SCHEME . NET_HOST. $this->url('/process', array('action_store_identifier' => $this->body('action_store_identifier'))),
+            NET_SCHEME.NET_HOST.$this->url('../', array('status' => 'success')),
+            NET_SCHEME.NET_HOST.$this->url('../payment', array('action_store_identifier' => $this->body('action_store_identifier'), 'payment_error' => 'true')),
+            NET_SCHEME.NET_HOST.$this->url('/process', array('action_store_identifier' => $this->body('action_store_identifier'))),
             $this->query(),
             $this->body()
         );
@@ -47,7 +47,7 @@ 
             'form_action' => $form_action,
             'language' => $language);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/postform');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/postform');
         return $tpl->render($this, $data);
     }
 

src/Intraface/modules/modulepackage/Controller/AddPackage.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
             'modulepackageshop' => $modulepackageshop,
             'modulepackage' => $this->modulepackage,
             'kernel' => $this->getKernel());
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/add-package');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/add-package');
         return $tpl->render($this, $data);
     }
 
@@ -86,7 +86,7 @@ 
                         if ($this->getKernel()->intranet->address->get('name') != $this->getKernel()->user->getAddress()->get('name')) {
                             $contact['contactperson'] = $this->getKernel()->user->getAddress()->get('name');
                             $contact['contactemail'] = $this->getKernel()->user->getAddress()->get('email');
-                            $contact['contactphone'] =  $this->getKernel()->user->getAddress()->get('phone');
+                            $contact['contactphone'] = $this->getKernel()->user->getAddress()->get('phone');
                         }
 
                         // We add the contact_id. But notice, despite of the bad naming the contact_id is the contact_id in the intranet_maintenance intranet!

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

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         	'email_shared' => $email_shared
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/index');
         return $tpl->render($this, $data);
     }
 

src/Intraface/modules/modulepackage/ModulePackage.php

Spacing +6 added lines, -6 removed lines

@@ -56,10 +56,10 @@ 
      */
     public function load()
     {
-        $result = $this->db->query("SELECT module_package.id, module_package.product_id, module_package_group.group_name AS ".$this->db->quoteIdentifier('group').", module_package_plan.plan, module_package_plan.plan_index, module_package_group.id AS group_id " .
-                "FROM module_package " .
-                "INNER JOIN module_package_group ON module_package.module_package_group_id = module_package_group.id " .
-                "INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id " .
+        $result = $this->db->query("SELECT module_package.id, module_package.product_id, module_package_group.group_name AS ".$this->db->quoteIdentifier('group').", module_package_plan.plan, module_package_plan.plan_index, module_package_group.id AS group_id ".
+                "FROM module_package ".
+                "INNER JOIN module_package_group ON module_package.module_package_group_id = module_package_group.id ".
+                "INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id ".
                 "WHERE module_package.id = ".$this->db->quote($this->id, 'integer'));
 
         if (PEAR::isError($result)) {
@@ -93,8 +93,8 @@ 
             $id = intval($id);
         }
 
-        $result = $this->db->query("SELECT id, module, limiter " .
-                "FROM module_package_module " .
+        $result = $this->db->query("SELECT id, module, limiter ".
+                "FROM module_package_module ".
                 "WHERE module_package_module.module_package_id = ".$this->db->quote($id, 'integer'));
 
         if (PEAR::isError($result)) {

src/Intraface/modules/contact/ContactPerson.php

Spacing +12 added lines, -12 removed lines

@@ -61,7 +61,7 @@ 
     public function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id, name, email, phone, mobile, contact_id FROM contact_person WHERE id = " . $this->id . " LIMIT 1");
+        $db->query("SELECT id, name, email, phone, mobile, contact_id FROM contact_person WHERE id = ".$this->id." LIMIT 1");
         while ($db->nextRecord()) {
             $this->value['id'] = $db->f('id');
             $this->value['name'] = $db->f('name');
@@ -99,7 +99,7 @@ 
 
         if ($this->id > 0) {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         } else {
             $sql_type = "INSERT INTO ";
             $sql_end = ", date_created = NOW()";
@@ -108,15 +108,15 @@ 
 
         $db = MDB2::singleton(DB_DSN);
 
-        $result = $db->exec($sql_type . "contact_person " .
-                "SET " .
-                "intranet_id = ".$db->quote($this->contact->kernel->intranet->get("id"), 'integer').", " .
-                "name = ".$db->quote($input['name'], 'text').", " .
-                "email = ".$db->quote($input['email'], 'text').", " .
-                "phone = ".$db->quote($input['phone'], 'text').", " .
-                "mobile = ".$db->quote($input['mobile']).", " .
-                "contact_id = " . $db->quote($this->contact->get('id'), 'integer') . ", " .
-                "date_changed = NOW() " . $sql_end);
+        $result = $db->exec($sql_type."contact_person ".
+                "SET ".
+                "intranet_id = ".$db->quote($this->contact->kernel->intranet->get("id"), 'integer').", ".
+                "name = ".$db->quote($input['name'], 'text').", ".
+                "email = ".$db->quote($input['email'], 'text').", ".
+                "phone = ".$db->quote($input['phone'], 'text').", ".
+                "mobile = ".$db->quote($input['mobile']).", ".
+                "contact_id = ".$db->quote($this->contact->get('id'), 'integer').", ".
+                "date_changed = NOW() ".$sql_end);
 
         if (PEAR::isError($result)) {
             throw new Exception('Error in query: '.$result->getUserInfo());
@@ -143,7 +143,7 @@ 
     public function getList()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM contact_person WHERE contact_id = " . $this->contact->get('id'));
+        $db->query("SELECT * FROM contact_person WHERE contact_id = ".$this->contact->get('id'));
         $persons = array();
         $i = 0;
         while ($db->nextRecord()) {

src/Intraface/modules/contact/include_frontpage.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
  * @package Intraface_Contact
  */
 
-require_once dirname(__FILE__) . '/ContactReminder.php';
+require_once dirname(__FILE__).'/ContactReminder.php';
 $contact_module = $kernel->useModule('contact');
 
 $contact = new Contact($kernel);
@@ -25,7 +25,7 @@ 
     }
     $_attention_needed[] = array(
         'module' => $contact_module->getName(),
-        'link' => $contact_module->getPath() .$reminder['contact_id'] . '/memo/' . $reminder['id'],
+        'link' => $contact_module->getPath().$reminder['contact_id'].'/memo/'.$reminder['id'],
         'msg' => $text.' ('.$reminder['dk_reminder_date'].'): '.$reminder['contact_name'].':  '.$reminder['subject'].'.',
         'no_translation' => true
     );

src/Intraface/modules/contact/ContactReminder.php

Spacing +18 added lines, -18 removed lines

@@ -199,9 +199,9 @@ 
             throw new Exception("Was not able to convert date in ContactReminder->update");
         }
 
-        $sql = "reminder_date = ".$this->db->quote($date->get(), 'date')."," .
-                "date_changed = NOW()," .
-                "subject = ".$this->db->quote($input['subject'], 'text')."," .
+        $sql = "reminder_date = ".$this->db->quote($date->get(), 'date').",".
+                "date_changed = NOW(),".
+                "subject = ".$this->db->quote($input['subject'], 'text').",".
                 "description = ".$this->db->quote($input['description'], 'text')."";
 
         if ($this->error->isError()) {
@@ -212,17 +212,17 @@ 
             $result = $this->db->exec("UPDATE contact_reminder_single SET ".$sql." WHERE intranet_id = ".$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer')." AND id = ".$this->db->quote($this->id, 'integer'));
         } else {
             $result = $this->db->exec("INSERT INTO contact_reminder_single SET ".$sql.", ".
-                "intranet_id = ".$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer')."," .
-                "contact_id = ".$this->db->quote($this->contact->get('id'), 'integer')."," .
-                "created_by_user_id = ".$this->db->quote($this->contact->kernel->user->get('id'), 'integer')."," .
-                "status_key = 1," .
-                "date_created = NOW()," .
+                "intranet_id = ".$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').",".
+                "contact_id = ".$this->db->quote($this->contact->get('id'), 'integer').",".
+                "created_by_user_id = ".$this->db->quote($this->contact->kernel->user->get('id'), 'integer').",".
+                "status_key = 1,".
+                "date_created = NOW(),".
                 "active = 1");
             $this->id = $this->db->lastInsertID();
         }
 
         if (PEAR::isError($result)) {
-            throw new Exception('Could not save information in ContactReminder->update' . $result->getUserInfo());
+            throw new Exception('Could not save information in ContactReminder->update'.$result->getUserInfo());
             return false;
         }
          return $this->id;
@@ -240,9 +240,9 @@ 
         /**
          * @todo: validation needed - not crucial as we are setting the postpone date
          */
-        $result = $this->db->exec('UPDATE contact_reminder_single SET date_changed = NOW(), reminder_date = ' .$this->db->quote($date, 'date').' WHERE intranet_id = '.$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
+        $result = $this->db->exec('UPDATE contact_reminder_single SET date_changed = NOW(), reminder_date = '.$this->db->quote($date, 'date').' WHERE intranet_id = '.$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
         if (PEAR::isError($result)) {
-            throw new Exception('Could not postphone reminder' . $result->getUserInfo());
+            throw new Exception('Could not postphone reminder'.$result->getUserInfo());
             return false;
         }
          $this->load();
@@ -265,11 +265,11 @@ 
 
         $db = MDB2::singleton(DB_DSN);
         //
-        $result = $db->query('SELECT contact_reminder_single.*, DATE_FORMAT(contact_reminder_single.reminder_date, "%d-%m-%Y") AS dk_reminder_date, address.name AS contact_name ' .
-                'FROM contact_reminder_single ' .
-                'INNER JOIN contact ON (contact_reminder_single.contact_id = contact.id AND contact.intranet_id = '.$db->quote($kernel->intranet->get('id'), 'integer') . ' AND contact.active = 1) '.
-                'LEFT JOIN address ON (address.belong_to_id = contact.id AND address.type = 3 AND address.active = 1) ' .
-                'WHERE contact_reminder_single.reminder_date < DATE_ADD(NOW(), INTERVAL 30 DAY) AND contact_reminder_single.intranet_id = ' .$db->quote($kernel->intranet->get('id'), 'integer').' AND contact_reminder_single.active = 1 AND contact_reminder_single.status_key = 1 ' .
+        $result = $db->query('SELECT contact_reminder_single.*, DATE_FORMAT(contact_reminder_single.reminder_date, "%d-%m-%Y") AS dk_reminder_date, address.name AS contact_name '.
+                'FROM contact_reminder_single '.
+                'INNER JOIN contact ON (contact_reminder_single.contact_id = contact.id AND contact.intranet_id = '.$db->quote($kernel->intranet->get('id'), 'integer').' AND contact.active = 1) '.
+                'LEFT JOIN address ON (address.belong_to_id = contact.id AND address.type = 3 AND address.active = 1) '.
+                'WHERE contact_reminder_single.reminder_date < DATE_ADD(NOW(), INTERVAL 30 DAY) AND contact_reminder_single.intranet_id = '.$db->quote($kernel->intranet->get('id'), 'integer').' AND contact_reminder_single.active = 1 AND contact_reminder_single.status_key = 1 '.
                 'ORDER BY contact_reminder_single.reminder_date ASC');
         if (PEAR::isError($result)) {
             die($result->getUserInfo());
@@ -292,9 +292,9 @@ 
     {
         $status_key = array_search($status, $this->status_types);
 
-        $result = $this->db->exec('UPDATE contact_reminder_single SET date_changed = NOW(), status_key = ' .$this->db->quote($status_key, 'integer').' WHERE intranet_id = '.$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
+        $result = $this->db->exec('UPDATE contact_reminder_single SET date_changed = NOW(), status_key = '.$this->db->quote($status_key, 'integer').' WHERE intranet_id = '.$this->db->quote($this->contact->kernel->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
         if (PEAR::isError($result)) {
-            throw new Exception('Could not postphone reminder' . $result->getUserInfo());
+            throw new Exception('Could not postphone reminder'.$result->getUserInfo());
             return false;
         }
          $this->load();

src/Intraface/modules/contact/Contact.php

Spacing +24 added lines, -24 removed lines

@@ -119,7 +119,7 @@ 
  * @license
  *
  */
-require_once dirname(__FILE__) . '/ContactPerson.php';
+require_once dirname(__FILE__).'/ContactPerson.php';
 require_once 'Intraface/functions.php';
 
 class Contact extends Intraface_Standard
@@ -386,7 +386,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'));
     }
 
     /**
@@ -556,16 +556,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()
@@ -595,7 +595,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];
             }
         }
 
@@ -629,7 +629,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;
     }
 
@@ -649,7 +649,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;
     }
@@ -667,9 +667,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);
@@ -689,7 +689,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;
         }
@@ -781,11 +781,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 != ''))
 
                     ";
 
@@ -874,7 +874,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');
         }
@@ -892,7 +892,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;
     }
@@ -909,7 +909,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;
     }
@@ -922,7 +922,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');
@@ -938,7 +938,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()) {
@@ -959,7 +959,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/contact/PdfLabel.php

Spacing +6 added lines, -6 removed lines

@@ -57,18 +57,18 @@ 
         }
         
         if (is_array($keywords) && count($keywords) > 0) {
-            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing') * $line, $this->get('font_size'), "Nøgleord: ".implode(", ", $keywords));
+            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing')*$line, $this->get('font_size'), "Nøgleord: ".implode(", ", $keywords));
             $line++;
         }
         
-        $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing') * $line, $this->get('font_size'), "Antal labels i søgning: ".count($contacts));
+        $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing')*$line, $this->get('font_size'), "Antal labels i søgning: ".count($contacts));
         
         // The contacts on labels
         
         for ($i = 0, $max = count($contacts); $i < $max; $i++) {
             // TODO -- hvorfor bruger vi ikke antallet af labels til at vide, hvorn�r
             // vi skifter linje? Vi kender faktisk ikke antallet af labels i en r�kke. Det kunne vi selvf�lgelig komme til
-            if ($this->get('x') + $this->label_width  > $this->get('right_margin_position')) {
+            if ($this->get('x') + $this->label_width > $this->get('right_margin_position')) {
                 // For enden af linjen, ny linje
                 $this->setY("-".$this->label_height);
                 $this->setX(0);
@@ -91,13 +91,13 @@ 
             $address_lines = explode("\n", $contacts[$i]['address']['address']);
             foreach ($address_lines as $l) {
                 if (trim($l) != "") {
-                    $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing') * $line, $this->get('font_size'), $l);
+                    $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing')*$line, $this->get('font_size'), $l);
                     $line++;
                 }
             }
-            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing') * $line, $this->get('font_size'), $contacts[$i]['address']['postcode']." ".$contacts[$i]['address']['city']);
+            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing')*$line, $this->get('font_size'), $contacts[$i]['address']['postcode']." ".$contacts[$i]['address']['city']);
             $line++;
-            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing') * $line, $this->get('font_size'), $contacts[$i]['address']['country']);
+            $this->addText($this->get('x') + $this->label_padding_left, $this->get('y') - $this->label_padding_top - $this->get('font_spacing')*$line, $this->get('font_size'), $contacts[$i]['address']['country']);
         }
     }
 }