Completed
Pull Request — master (#24)
by Lars
12:05
created
src/Intraface/modules/contact/Controller/templates/import.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,9 +9,12 @@
 block discarded – undo
9 9
         <?php endforeach; ?>
10 10
     <?php endif; ?>
11 11
 
12
-<?php else : ?>
12
+<?php else {
13
+    : ?>
13 14
 
14
-    <form action="<?php e(url()); ?>" method="post">
15
+    <form action="<?php e(url());
16
+}
17
+?>" method="post">
15 18
 
16 19
 
17 20
     <fieldset>
Please login to merge, or discard this patch.
src/Intraface/modules/contact/Controller/templates/sendemail.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,9 +8,12 @@
 block discarded – undo
8 8
 
9 9
 <p><?php echo $context->getMessage(); ?></p>
10 10
 
11
-<?php else : ?>
11
+<?php else {
12
+    : ?>
12 13
 
13
-    <?php echo $contact->error->view(); ?>
14
+    <?php echo $contact->error->view();
15
+}
16
+?>
14 17
 
15 18
 <p class="message">Du er ved at sende en e-mail til <?php e(count($contacts)); ?> kontakter. Vi sender naturligvis kun til de kontakter, der har en e-mail-adresse.</p>
16 19
 
Please login to merge, or discard this patch.
src/Intraface/modules/contact/Controller/templates/choosecontact.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,9 +6,12 @@
 block discarded – undo
6 6
 
7 7
     <p><?php e(t('No contacts has been created')); ?>. <a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create contact')); ?></a>.</p>
8 8
 
9
-<?php else : ?>
9
+<?php else {
10
+    : ?>
10 11
     <ul class="options">
11
-        <li><a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create contact')); ?></a></li>
12
+        <li><a href="<?php e(url(null, array('create')));
13
+}
14
+?>"><?php e(t('Create contact')); ?></a></li>
12 15
         <?php if (isset($_GET['last_contact_id']) && intval($_GET['last_contact_id']) != 0) : ?>
13 16
         <li><a href="<?php e(url(null, array('contact_id' => $_GET['last_contact_id']))); ?>"><?php e(t('Show chosen')); ?></a></li>
14 17
         <?php endif; ?>
Please login to merge, or discard this patch.
src/Intraface/modules/contact/Controller/templates/edit.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
             <tr>
49 49
                 <td><?php e($c['name']); ?></td>
50 50
                 <td><?php e($c['address']); ?></td>
51
-                <td><?php e($c['postcode'] . ' ' . $c['city']); ?></td>
51
+                <td><?php e($c['postcode'].' '.$c['city']); ?></td>
52 52
                 <td><?php e($c['phone']); ?></td>
53 53
                 <td><?php e($c['email']); ?></td>
54 54
                 <td><a href="<?php e(url($c['id'])); ?>"><?php e(t('Choose')); ?></a></td>
Please login to merge, or discard this patch.
src/Intraface/modules/contact/Controller/Sendemail.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
             'contact' => $contact
28 28
         );
29 29
 
30
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/sendemail');
30
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/sendemail');
31 31
         return $smarty->render($this, $data);
32 32
     }
33 33
 
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
                 $email = new Email($this->getKernel());
59 59
                 $input = array(
60 60
                     'subject' => $_POST['subject'],
61
-                    'body' => $_POST['text'] . "\n\nLogin: " . $contact->get('login_url'),
61
+                    'body' => $_POST['text']."\n\nLogin: ".$contact->get('login_url'),
62 62
                     'from_email' => $this->getKernel()->user->get('email'),
63 63
                     'from_name' => $this->getKernel()->user->get('name'),
64 64
                     'contact_id' => $contact->get('id'),
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
                 $email->queue();
71 71
                 $j++;
72 72
             }
73
-            $this->msg = 'Emailen blev i alt sendt til ' . $j . ' kontakter. <a href="'.$this->url('../').'">Tilbage til kontakter</a>.';
73
+            $this->msg = 'Emailen blev i alt sendt til '.$j.' kontakter. <a href="'.$this->url('../').'">Tilbage til kontakter</a>.';
74 74
         } else {
75 75
             $value = $_POST;
76 76
         }
Please login to merge, or discard this patch.
src/Intraface/modules/contact/Controller/BatchNewsletter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
             'contact' => $contact
32 32
         );
33 33
 
34
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/batchnewsletter');
34
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/batchnewsletter');
35 35
         return $smarty->render($this, $data);
36 36
     }
37 37
 
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 
67 67
                 $j++;
68 68
             }
69
-            $this->msg = 'I alt blev ' . $j . ' kontakter tilmeldt nyhedsbrevet. <a href="'.$this->url('../', array('use_stored' => 'true')).'">Tilbage til kontakter</a>.';
69
+            $this->msg = 'I alt blev '.$j.' kontakter tilmeldt nyhedsbrevet. <a href="'.$this->url('../', array('use_stored' => 'true')).'">Tilbage til kontakter</a>.';
70 70
         } else {
71 71
             $value = $_POST;
72 72
         }
Please login to merge, or discard this patch.
src/Intraface/modules/contact/Controller/Index.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
         }
55 55
         */
56 56
 
57
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
57
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
58 58
         return $smarty->render($this, array('contacts' => $this->getContacts()));
59 59
     }
60 60
 
@@ -139,9 +139,9 @@  discard block
 block discarded – undo
139 139
             }
140 140
         }
141 141
 
142
-        $keywords = 'Nøgleord' . implode(' ', $used_keyword);
143
-        $search = 'Søgetekst' . $contact->getDBQuery()->getFilter('search');
144
-        $count = 'Kontakter i søgning' . count($contacts);
142
+        $keywords = 'Nøgleord'.implode(' ', $used_keyword);
143
+        $search = 'Søgetekst'.$contact->getDBQuery()->getFilter('search');
144
+        $count = 'Kontakter i søgning'.count($contacts);
145 145
 
146 146
         $i = 1;
147 147
 
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
         $i = $i + 1;
175 175
         $worksheet->write($i, 0, $count, $format_italic);
176 176
 
177
-        $i = $i+2;
177
+        $i = $i + 2;
178 178
         $worksheet->write($i, 0, 'Navn', $format_bold);
179 179
         $worksheet->write($i, 1, 'Adresse', $format_bold);
180 180
         $worksheet->write($i, 2, 'Postnummer', $format_bold);
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 
209 209
         $this->document->addScript('contact/contact_edit.js');
210 210
 
211
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/edit');
211
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/edit');
212 212
         return $smarty->render($this);
213 213
     }
214 214
 
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
         if ($this->body()) {
271 271
             return $value = $_POST;
272 272
         }
273
-        return array('number' => $this->getContact()->getMaxNumber()+1);
273
+        return array('number' => $this->getContact()->getMaxNumber() + 1);
274 274
     }
275 275
 
276 276
     function getAddressValues()
Please login to merge, or discard this patch.
src/Intraface/modules/shop/Controller/tpl/categories.tpl.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
             # If there is subcategories to the category
33 33
             if (is_array($category['categories']) && count($category['categories']) > 0) {
34 34
                 # We make the items for the next level the sub categories of this category
35
-                $level_categories[$level+1] = $category['categories'];
35
+                $level_categories[$level + 1] = $category['categories'];
36 36
 
37 37
                 # We move to next level
38 38
                 $level++;
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,9 +55,12 @@
 block discarded – undo
55 55
 <?php if (isset($product_id)) : ?>
56 56
     <input type="hidden" name="product_id" value="<?php e($product_id); ?>" />
57 57
     <input type="submit" name="append_product" value="<?php e(t('Select')); ?>" />
58
-<?php else : ?>
58
+<?php else {
59
+    : ?>
59 60
     <select name="action">
60
-        <option value=""><?php e(t('Choose...')); ?></option>
61
+        <option value=""><?php e(t('Choose...'));
62
+}
63
+?></option>
61 64
         <option value="delete"><?php e(t('Delete selected')); ?></option>
62 65
     </select>
63 66
 
Please login to merge, or discard this patch.
src/Intraface/modules/shop/Controller/BasketEvaluation/Edit.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,9 +49,9 @@
 block discarded – undo
49 49
         $settings = $this->getBasketEvaluation()->get('settings');
50 50
 
51 51
         $data = array('basketevaluation' => $this->getBasketEvaluation(),
52
-                      'value' => $this->value,
53
-                      'settings' => $settings,
54
-                      'translation' => $this->getKernel()->getTranslation('shop')
52
+                        'value' => $this->value,
53
+                        'settings' => $settings,
54
+                        'translation' => $this->getKernel()->getTranslation('shop')
55 55
         );
56 56
         $tpl = $this->template->create('Intraface/modules/shop/Controller/tpl/evaluation');
57 57
         return $tpl->render($this, $data);
Please login to merge, or discard this patch.