intraface / intraface.dk

src/Intraface/modules/contact/Controller/templates/show.tpl.php

Spacing +7 added lines, -7 removed lines

@@ -6,22 +6,22 @@ 
 <div id="colOne">
 
 <div class="box">
-    <img style="float: right;" src="<?php e('http://www.gravatar.com/avatar/'.md5($address['email']).'?s=60&d='.NET_SCHEME . NET_HOST . url('/images/icons/gravatar.png')); ?>" height="60" width="60" />
+    <img style="float: right;" src="<?php e('http://www.gravatar.com/avatar/'.md5($address['email']).'?s=60&d='.NET_SCHEME.NET_HOST.url('/images/icons/gravatar.png')); ?>" height="60" width="60" />
 
     <h1>#<?php e($value['number']); ?> <?php e($address['name']); ?></h1>
 
     <ul class="options" style="clear: none;">
         <li><a href="<?php e(url(null, array('edit'))); ?>"><?php e(t('Edit')); ?></a></li>
         <li><a href="<?php e(url('../', array('use_stored' => 'true'))); ?>"><?php e(t('Close')); ?></a></li>
-        <li><a class="vcard" href="<?php e(url(null . '.vcf')); ?>"><?php e(t('Vcard')); ?></a></li>
+        <li><a class="vcard" href="<?php e(url(null.'.vcf')); ?>"><?php e(t('Vcard')); ?></a></li>
     </ul>
 
     <ul class="options" style="clear: none;">
     <?php foreach ($context->getDependencies() as $key => $dependency) : ?>
             <?php if ($dependency['gateway']->findCountByContactId($context->getContact()->get("id")) > 0) : ?>
-            <li><a href="<?php e($dependency['url']); ?>"><?php e(t(ucfirst($dependency['label'] . 's'))); ?></a></li>
+            <li><a href="<?php e($dependency['url']); ?>"><?php e(t(ucfirst($dependency['label'].'s'))); ?></a></li>
             <?php elseif (!empty($dependency['url_create'])) : ?>
-            <li class="inactive"><a href="<?php e($dependency['url_create']); ?>"><?php e(t('Create') . ' ' . t($dependency['label'])); ?></a></li>
+            <li class="inactive"><a href="<?php e($dependency['url_create']); ?>"><?php e(t('Create').' '.t($dependency['label'])); ?></a></li>
             <?php endif; ?>
     <?php endforeach; ?>
     </ul>
@@ -156,7 +156,7 @@ 
     <?php
     foreach ($persons as $person) { ?>
         <tr class="vcard">
-        <td class="fn"><a href="<?php e(url('contactperson/' . $person['id'], array('edit'))); ?>"><?php e($person['name']); ?></a></td>
+        <td class="fn"><a href="<?php e(url('contactperson/'.$person['id'], array('edit'))); ?>"><?php e($person['name']); ?></a></td>
         <td class="email"><?php e($person['email']); ?></td>
         <td class="tel"><?php e($person['phone']); ?></td>
         <td class="tel"><?php e($person['mobile']); ?></td>
@@ -201,8 +201,8 @@ 
 }
                     ?>
                 </td>
-                <td><a href="<?php e(url('memo/' . $reminder_item['id'])); ?>"><?php e($reminder_item['subject']); ?></a></td>
-                <td class="buttons"><a href="<?php e(url('memo/' .$reminder_item['id'], array('edit'))); ?>" class="edit"><?php e(t('edit')); ?></a></td>
+                <td><a href="<?php e(url('memo/'.$reminder_item['id'])); ?>"><?php e($reminder_item['subject']); ?></a></td>
+                <td class="buttons"><a href="<?php e(url('memo/'.$reminder_item['id'], array('edit'))); ?>" class="edit"><?php e(t('edit')); ?></a></td>
             </tr>
             <?php
         }

src/Intraface/modules/contact/Controller/templates/index.tpl.php

Spacing +3 added lines, -3 removed lines

@@ -5,8 +5,8 @@ 
     <?php if ($context->getKernel()->getSetting()->get('user', 'contact.search') == 'hide' and count($context->getContacts()) > 0) : ?>
     <li><a href="<?php e(url(null, array('search' => 'view'))); ?>"><?php e(t('show search')); ?></a></li>
     <?php endif; ?>
-    <li><a class="pdf" href="<?php e(url(null . '.pdf', array('use_stored' => 'true'))); ?>" target="_blank"><?php e(t('Pdf-labels')); ?></a></li>
-    <li><a class="excel" href="<?php e(url(null . '.xls', array('use_stored' => 'true'))); ?>"><?php e(t('Excel')); ?></a></li>
+    <li><a class="pdf" href="<?php e(url(null.'.pdf', array('use_stored' => 'true'))); ?>" target="_blank"><?php e(t('Pdf-labels')); ?></a></li>
+    <li><a class="excel" href="<?php e(url(null.'.xls', array('use_stored' => 'true'))); ?>"><?php e(t('Excel')); ?></a></li>
     <li><a href="<?php e(url('sendemail', array('use_stored' => true))); ?>"><?php e(t('Email to contacts in search')); ?></a></li>
     <li><a href="<?php e(url('import/file')); ?>"><?php e(t('Import contacts')); ?></a></li>
     <li><a href="<?php e(url('../')); ?>"><?php e(t('Close')); ?></a></li>
@@ -86,7 +86,7 @@ 
                     <input type="checkbox" value="<?php e($c['id']); ?>" name="selected[]" />
                 </td>
                 <td><?php e($c['number']); ?></td>
-                <td><img style="border: none; vertical-align:middle" src="<?php e('http://www.gravatar.com/avatar/'.md5($c['email']).'?s=20&d=&d='.NET_SCHEME . NET_HOST . url('/images/icons/gravatar.png')); ?>" height="20" width="20" /> <a class="fn" href="<?php e(url($c['id'])); ?>"><?php e($c['name']); ?></a></td>
+                <td><img style="border: none; vertical-align:middle" src="<?php e('http://www.gravatar.com/avatar/'.md5($c['email']).'?s=20&d=&d='.NET_SCHEME.NET_HOST.url('/images/icons/gravatar.png')); ?>" height="20" width="20" /> <a class="fn" href="<?php e(url($c['id'])); ?>"><?php e($c['name']); ?></a></td>
                 <td class="tel"><?php e($c['phone']); ?></td>
                 <td class="email"><?php e($c['email']); ?></td>
                 <td class="options">

src/Intraface/modules/contact/Controller/templates/merge.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -58,13 +58,13 @@
         <?php foreach ($context->getSimilarContacts() as $c) { ?>
             <tr>
                 <td><input type="checkbox" value="<?php e($c['id']); ?>" name="contact[]" /></td>
-                <td><a href="<?php e(url('../../' . $c['id'])); ?>"><?php e($c['number']); ?></a></td>
+                <td><a href="<?php e(url('../../'.$c['id'])); ?>"><?php e($c['number']); ?></a></td>
                 <td><?php e($c['name']); ?></td>
                 <td><?php e($c['address']); ?></td>
                 <td><?php e($c['postcode']); ?> <?php e($c['city']); ?></td>
                 <td><?php e($c['phone']); ?></td>
                 <td><?php e($c['email']); ?></td>
-                <td><a href="<?php e(url('../../' . $c['id'] . '/merge')); ?>"><?php e(t('Switch to')); ?></a></td>
+                <td><a href="<?php e(url('../../'.$c['id'].'/merge')); ?>"><?php e(t('Switch to')); ?></a></td>
             </tr>
         <?php } ?>
         </tbody>

src/Intraface/modules/contact/Controller/templates/edit.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
             <tr>
                 <td><?php e($c['name']); ?></td>
                 <td><?php e($c['address']); ?></td>
-                <td><?php e($c['postcode'] . ' ' . $c['city']); ?></td>
+                <td><?php e($c['postcode'].' '.$c['city']); ?></td>
                 <td><?php e($c['phone']); ?></td>
                 <td><?php e($c['email']); ?></td>
                 <td><a href="<?php e(url($c['id'])); ?>"><?php e(t('Choose')); ?></a></td>

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

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
             'contact' => $contact
         );
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/sendemail');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/sendemail');
         return $smarty->render($this, $data);
     }
 
@@ -58,7 +58,7 @@ 
                 $email = new Email($this->getKernel());
                 $input = array(
                     'subject' => $_POST['subject'],
-                    'body' => $_POST['text'] . "\n\nLogin: " . $contact->get('login_url'),
+                    'body' => $_POST['text']."\n\nLogin: ".$contact->get('login_url'),
                     'from_email' => $this->getKernel()->user->get('email'),
                     'from_name' => $this->getKernel()->user->get('name'),
                     'contact_id' => $contact->get('id'),
@@ -70,7 +70,7 @@ 
                 $email->queue();
                 $j++;
             }
-            $this->msg = 'Emailen blev i alt sendt til ' . $j . ' kontakter. <a href="'.$this->url('../').'">Tilbage til kontakter</a>.';
+            $this->msg = 'Emailen blev i alt sendt til '.$j.' kontakter. <a href="'.$this->url('../').'">Tilbage til kontakter</a>.';
         } else {
             $value = $_POST;
         }

src/Intraface/modules/contact/Controller/Contactperson.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/BatchNewsletter.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
             'contact' => $contact
         );
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/batchnewsletter');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/batchnewsletter');
         return $smarty->render($this, $data);
     }
 
@@ -66,7 +66,7 @@ 
 
                 $j++;
             }
-            $this->msg = 'I alt blev ' . $j . ' kontakter tilmeldt nyhedsbrevet. <a href="'.$this->url('../', array('use_stored' => 'true')).'">Tilbage til kontakter</a>.';
+            $this->msg = 'I alt blev '.$j.' kontakter tilmeldt nyhedsbrevet. <a href="'.$this->url('../', array('use_stored' => 'true')).'">Tilbage til kontakter</a>.';
         } else {
             $value = $_POST;
         }

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

Spacing +7 added lines, -7 removed lines

@@ -54,7 +54,7 @@ 
         }
         */
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
         return $smarty->render($this, array('contacts' => $this->getContacts()));
     }
 
@@ -139,9 +139,9 @@ 
             }
         }
 
-        $keywords = 'Nøgleord' . implode(' ', $used_keyword);
-        $search = 'Søgetekst' . $contact->getDBQuery()->getFilter('search');
-        $count = 'Kontakter i søgning' . count($contacts);
+        $keywords = 'Nøgleord'.implode(' ', $used_keyword);
+        $search = 'Søgetekst'.$contact->getDBQuery()->getFilter('search');
+        $count = 'Kontakter i søgning'.count($contacts);
 
         $i = 1;
 
@@ -174,7 +174,7 @@ 
         $i = $i + 1;
         $worksheet->write($i, 0, $count, $format_italic);
 
-        $i = $i+2;
+        $i = $i + 2;
         $worksheet->write($i, 0, 'Navn', $format_bold);
         $worksheet->write($i, 1, 'Adresse', $format_bold);
         $worksheet->write($i, 2, 'Postnummer', $format_bold);
@@ -208,7 +208,7 @@ 
 
         $this->document->addScript('contact/contact_edit.js');
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/edit');
         return $smarty->render($this);
     }
 
@@ -270,7 +270,7 @@ 
         if ($this->body()) {
             return $value = $_POST;
         }
-        return array('number' => $this->getContact()->getMaxNumber()+1);
+        return array('number' => $this->getContact()->getMaxNumber() + 1);
     }
 
     function getAddressValues()

src/Intraface/modules/shop/BasketEvaluation.php

Spacing +19 added lines, -19 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,35 +146,35 @@ 
             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;
             }
         } else {
             $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());
             }
         }
 
@@ -190,7 +190,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;
@@ -203,10 +203,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;