Completed
Pull Request — master (#21)
by Lars
14:31
created
modules/accounting/Controller/templates/state/depreciation.tpl.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,10 +9,12 @@
 block discarded – undo
9 9
     <p>Gå til <a href="<?php e($accounting_module->getPath().'years.php'); ?>">regnskabet</a></p>
10 10
 <?php elseif ($depreciation->isStated()) : ?>
11 11
     <p><?php e(t('the depreciation is alredy stated')); ?>. <a href="<?php e($accounting_module->getPath().'voucher/'.$depreciation->get('voucher_id')); ?>"><?php e(t('see the voucher')); ?></a>.</p>
12
-<?php else : ?>
12
+<?php else {
13
+    : ?>
13 14
     <?php
14 15
     // need to be executed to generate errors!
15 16
     $depreciation->readyForState();
17
+}
16 18
     echo $depreciation->error->view();
17 19
     ?>
18 20
 
Please login to merge, or discard this patch.
src/Intraface/modules/procurement/Controller/templates/index.tpl.php 1 patch
Braces   +20 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,9 +13,12 @@  discard block
 block discarded – undo
13 13
 
14 14
 <?php if (!$gateway->any()) : ?>
15 15
     <p><?php e(t('No procurements has been created')); ?>. <a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create procurement')); ?></a>.</p>
16
-<?php else : ?>
16
+<?php else {
17
+    : ?>
17 18
 
18
-    <form method="get" action="<?php e(url()); ?>">
19
+    <form method="get" action="<?php e(url());
20
+}
21
+?>">
19 22
     <fieldset>
20 23
         <legend><?php e(t('Search')); ?></legend>
21 24
         <label><?php e(t('Text')); ?>
@@ -78,8 +81,11 @@  discard block
 block discarded – undo
78 81
                         <?php if ($context->getKernel()->user->hasModuleAccess('contact') && $procurement["contact_id"] != 0) : ?>
79 82
                             <?php $ModuleContact = $context->getKernel()->getModule('contact'); ?>
80 83
                             <a href="<?php e($ModuleContact->getPath().$procurement["contact_id"]); ?>"><?php e($procurement["contact"]); ?></a>
81
-                        <?php else : ?>
82
-                            <?php e($procurement["vendor"]); ?>
84
+                        <?php else {
85
+    : ?>
86
+                            <?php e($procurement["vendor"]);
87
+}
88
+?>
83 89
                         <?php endif; ?>
84 90
                     </td>
85 91
                     <td><?php e($procurement["dk_invoice_date"]); ?></td>
@@ -88,8 +94,11 @@  discard block
 block discarded – undo
88 94
                             <?php e(t(ucfirst($procurement["status"]))); ?> <?php e($procurement["dk_delivery_date"]); ?>
89 95
                         <?php elseif ($procurement["delivery_date"] != "0000-00-00") : ?>
90 96
                             <?php e($procurement["dk_delivery_date"]); ?>
91
-                        <?php else : ?>
92
-                            <?php e(t('Not given')); ?>
97
+                        <?php else {
98
+    : ?>
99
+                            <?php e(t('Not given'));
100
+}
101
+?>
93 102
                         <?php endif; ?>
94 103
                     </td>
95 104
                     <td>
@@ -99,8 +108,11 @@  discard block
 block discarded – undo
99 108
                             <?php e(t('Paid')); ?> <?php e($procurement['dk_paid_date']); ?>
100 109
                         <?php elseif ($procurement["payment_date"] != "0000-00-00") : ?>
101 110
                             <?php e($procurement["dk_payment_date"]); ?>
102
-                        <?php else : ?>
103
-                            <?php e(t('Not given')); ?>
111
+                        <?php else {
112
+    : ?>
113
+                            <?php e(t('Not given'));
114
+}
115
+?>
104 116
                         <?php endif; ?>
105 117
                     </td>
106 118
                     <td>
Please login to merge, or discard this patch.
src/Intraface/modules/currency/Controller/tpl/currencies.tpl.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,14 +15,18 @@
 block discarded – undo
15 15
         <td><?php  $rate = $currency->getProductPriceExchangeRate();
16 16
         if ($rate === false) :
17 17
             e(t('Not given'));
18
-        else :
18
+        else {
19
+            :
19 20
             e($rate->getRate()->getAsLocal('da_dk').' ('.$rate->getDateUpdated()->getAsLocal('da_dk').')');
21
+        }
20 22
         endif; ?> <a class="edit" href="<?php e(url($currency->getId().'/exchangerate/productprice/update')) ?>"><?php e(t('Update')); ?></a></td>
21 23
         <td><?php  $rate = $currency->getPaymentExchangeRate();
22 24
         if ($rate === false) :
23 25
             e(t('Not given'));
24
-        else :
26
+        else {
27
+            :
25 28
             e($rate->getRate()->getAsLocal('da_dk').' ('.$rate->getDateUpdated()->getAsLocal('da_dk').')');
29
+        }
26 30
         endif; ?> <a class="edit" href="<?php e(url($currency->getId().'/exchangerate/payment/update')) ?>"><?php e(t('Update')); ?></a></td>
27 31
     </tr>
28 32
     <?php endforeach; ?>
Please login to merge, or discard this patch.
src/Intraface/modules/todo/Controller/templates/index.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,11 +8,14 @@
 block discarded – undo
8 8
 
9 9
     <p><?php e(t('No lists available'))?>. <a href="<?php e(url('create'));?>"><?php e(t('Create list')); ?></a>.</p>
10 10
 
11
-<?php else : ?>
11
+<?php else {
12
+    : ?>
12 13
 
13 14
 <ul class="todo-list">
14 15
     <?php foreach ($todo_list as $t) : ?>
15
-    <li><a href="<?php e(url($t['id'])); ?>"><?php e($t['name']); ?></a> &mdash; <?php e($t['left']); ?> <?php e(t('left')); ?></li>
16
+    <li><a href="<?php e(url($t['id']));
17
+}
18
+?>"><?php e($t['name']); ?></a> &mdash; <?php e($t['left']); ?> <?php e(t('left')); ?></li>
16 19
     <?php endforeach; ?>
17 20
 </ul>
18 21
 
Please login to merge, or discard this patch.
src/Intraface/modules/modulepackage/Controller/templates/index.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,8 +9,11 @@
 block discarded – undo
9 9
         ?>
10 10
         <h3><?php e(t('success!')); ?></h3>
11 11
         <p><?php e(t('if everything went as it should, you can see your packages below, and you should be able to use them now.')); ?></p>
12
-    <?php else : ?>
13
-        <p><?php e(t('on this page you have an overview of your intraface account')); ?></p>
12
+    <?php else {
13
+    : ?>
14
+        <p><?php e(t('on this page you have an overview of your intraface account'));
15
+}
16
+?></p>
14 17
     <?php endif; ?>
15 18
 </div>
16 19
 
Please login to merge, or discard this patch.
Intraface/modules/modulepackage/Controller/templates/add-package.tpl.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,8 +19,10 @@
 block discarded – undo
19 19
         <span id="price"><?php $product = $modulepackageshop->getProduct((int)$modulepackage->get('product_id'));
20 20
         if (isset($product['product']['currency']['DKK']['price_incl_vat'])) :
21 21
             e('DKK '.$product['product']['currency']['DKK']['price_incl_vat'].' '.t('per').' '.t($product['product']['unit']['singular']));
22
-        else :
22
+        else {
23
+            :
23 24
             echo 'free!';
25
+        }
24 26
         endif; ?></span>
25 27
     </div>
26 28
 
Please login to merge, or discard this patch.
src/Intraface/modules/contact/Controller/templates/index.tpl.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,12 +21,15 @@
 block discarded – undo
21 21
 
22 22
     <p><?php e(t('No contacts has been created')); ?>. <a href="<?php e(url(null, array('create'))); ?>"><?php e(t('Create contact')); ?></a>.</p>
23 23
 
24
-<?php else : ?>
24
+<?php else {
25
+    : ?>
25 26
 
26 27
 
27 28
 <?php if ($context->getKernel()->getSetting()->get('user', 'contact.search') == 'view') : ?>
28 29
 
29
-<form action="<?php e(url()); ?>" method="get" class="search-filter">
30
+<form action="<?php e(url());
31
+}
32
+?>" method="get" class="search-filter">
30 33
     <fieldset>
31 34
         <legend><?php e(t('search')); ?></legend>
32 35
 
Please login to merge, or discard this patch.
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.