Completed
Pull Request — master (#21)
by Lars
14:31
created
src/Intraface/modules/onlinepayment/Controller/ChooseProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
         $onlinepayment_module = $this->context->getKernel()->module('onlinepayment');
19 19
         $onlinepayment = OnlinePayment::factory($this->context->getKernel());
20 20
         $value = $onlinepayment->getProvider();
21
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/chooseprovider');
21
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/chooseprovider');
22 22
         return $smarty->render($this, array('value' => $value));
23 23
     }
24 24
 
Please login to merge, or discard this patch.
src/Intraface/modules/onlinepayment/Controller/Settings.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
     {
20 20
         $this->document->setTitle('Accounting settings');
21 21
     
22
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/settings');
22
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/settings');
23 23
         return $smarty->render($this);
24 24
     }
25 25
 
Please login to merge, or discard this patch.
src/Intraface/modules/onlinepayment/Controller/Index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 
23 23
     function renderHtml()
24 24
     {
25
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
25
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
26 26
         return $smarty->render($this);
27 27
     }
28 28
 
Please login to merge, or discard this patch.
modules/intranetmaintenance/Controller/templates/intranet/show.tpl.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 $address_value = $context->getValues();
4 4
 ?>
5 5
 <?php if (!empty($contact_error)) : ?>
6
-<?php echo $contact_error;?>
6
+<?php echo $contact_error; ?>
7 7
 <?php else : ?>
8 8
 <div id="colOne">
9 9
 
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 </ul>
16 16
 
17 17
 <?php if ($context->query('flare')) : ?>
18
- <p class="message"><?php e(t($context->query('flare')));?></p>
18
+ <p class="message"><?php e(t($context->query('flare'))); ?></p>
19 19
 <?php endif; ?>
20 20
 
21 21
 <?php echo $context->getIntranet()->error->view(); ?>
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
             <?php if (!empty($value['contact_id']) and $context->getIntranet()->get('id') > 0 && isset($contact_module)) : ?>
34 34
                 <?php
35 35
                     $contact = new Contact($context->getKernel(), $value['contact_id']);
36
-                    echo '<a href="'.$contact_module->getPath() . $contact->get('id').'">'.$contact->get('name').'</a>';
36
+                    echo '<a href="'.$contact_module->getPath().$contact->get('id').'">'.$contact->get('name').'</a>';
37 37
                     echo ' <a href="'.url(null, array('add_contact'=>1)).'">'.t('change contact').'</a>';
38 38
                 ?>
39 39
             <?php elseif (isset($contact_module)) : ?>
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
                 $user_list['name'] = '[not filled in]';
242 242
             }
243 243
             ?>
244
-            <td><a href="<?php e(url('../../user/'. $user_list['id'], array('intranet_id' => $context->getIntranet()->get('id')))); ?>"><?php e($user_list['name']); ?></a></td>
244
+            <td><a href="<?php e(url('../../user/'.$user_list['id'], array('intranet_id' => $context->getIntranet()->get('id')))); ?>"><?php e($user_list['name']); ?></a></td>
245 245
             <td><?php e($user_list['email']); ?></td>
246 246
         </tr>
247 247
     <?php } ?>
Please login to merge, or discard this patch.
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -4,10 +4,13 @@  discard block
 block discarded – undo
4 4
 ?>
5 5
 <?php if (!empty($contact_error)) : ?>
6 6
 <?php echo $contact_error;?>
7
-<?php else : ?>
7
+<?php else {
8
+    : ?>
8 9
 <div id="colOne">
9 10
 
10
-<h1><?php e(t('Intranet')); ?>: <?php e($context->getIntranet()->get('name')); ?></h1>
11
+<h1><?php e(t('Intranet'));
12
+}
13
+?>: <?php e($context->getIntranet()->get('name')); ?></h1>
11 14
 
12 15
 <ul class="options">
13 16
     <li><a href="<?php e(url(null, array('edit'))); ?>"><?php e(t('edit')); ?></a></li>
@@ -160,10 +163,12 @@  discard block
 block discarded – undo
160 163
     <legend>Tilføj modulpakke</legend>
161 164
     <?php if (!$context->getKernel()->intranet->hasModuleAccess('shop')) : ?>
162 165
         This intranet needs to have access to shop for modulepackage to work!
163
-    <?php else : ?>
166
+    <?php else {
167
+    : ?>
164 168
 
165 169
         <?php
166 170
         $modulepackage = new Intraface_modules_modulepackage_ModulePackage;
171
+}
167 172
         $modulepackage->getDBQuery($context->getKernel());
168 173
         $packages = $modulepackage->getList();
169 174
         ?>
Please login to merge, or discard this patch.
modules/intranetmaintenance/Controller/templates/intranet/index.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 
3 3
 <ul class="options">
4 4
     <li><a href="<?php e(url('../')); ?>"><?php e(t('Close')); ?></a></li>
5
-    <li><a href="<?php e(url(null) . '?new'); ?>"><?php e(t('create')); ?></a></li>
5
+    <li><a href="<?php e(url(null).'?new'); ?>"><?php e(t('create')); ?></a></li>
6 6
     <li><a href="<?php e(url('../user')); ?>"><?php e(t('users')); ?></a></li>
7 7
 </ul>
8 8
 
Please login to merge, or discard this patch.
modules/intranetmaintenance/Controller/templates/user/show.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@
 block discarded – undo
141 141
     <tbody>
142 142
     <?php foreach ($context->getIntranets() as $intranet_value) { ?>
143 143
         <tr>
144
-            <td><a href="<?php e(url('../../intranet/' . $intranet_value['id'])); ?>"><?php e($intranet_value['name']); ?></a></td>
144
+            <td><a href="<?php e(url('../../intranet/'.$intranet_value['id'])); ?>"><?php e($intranet_value['name']); ?></a></td>
145 145
             <td><a href="<?php e(url(null, array('intranet_id' => $intranet_value['id']))); ?>"><?php e(t('Show contact information')); ?></a></td>
146 146
         </tr>
147 147
         <?php } ?>
Please login to merge, or discard this patch.
modules/intranetmaintenance/Controller/templates/user/index.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
                 $user["name"] = '['.t('not filled in').']';
46 46
             }
47 47
             ?>
48
-            <td><img style="border: none;" src="<?php e('http://www.gravatar.com/avatar/'.md5($user['email']).'?s=20&d=&d='.NET_SCHEME . NET_HOST . url('/images/icons/gravatar.png')); ?>" height="20" width="20" /></td>
48
+            <td><img style="border: none;" src="<?php e('http://www.gravatar.com/avatar/'.md5($user['email']).'?s=20&d=&d='.NET_SCHEME.NET_HOST.url('/images/icons/gravatar.png')); ?>" height="20" width="20" /></td>
49 49
             <td><a href="<?php e(url($user["id"])); ?>"><?php e($user["name"]); ?></a></td>
50 50
             <td><?php e($user["email"]); ?></td>
51 51
             <td class="buttons">
Please login to merge, or discard this patch.
src/Intraface/modules/intranetmaintenance/Controller/User/Index.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
         if (!is_null($this->redirect)) {
82 82
             return $this->redirect;
83 83
         }
84
-         return $this->redirect = Intraface_Redirect::factory($this->getKernel(), 'receive');
84
+            return $this->redirect = Intraface_Redirect::factory($this->getKernel(), 'receive');
85 85
     }
86 86
 
87 87
     function isAddUserTrue()
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,13 +29,13 @@
 block discarded – undo
29 29
             return new k_SeeOther($this->getRedirect()->getRedirect($this->url(null)));
30 30
         }
31 31
 
32
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/user/index');
32
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/user/index');
33 33
         return $smarty->render($this);
34 34
     }
35 35
 
36 36
     function renderHtmlCreate()
37 37
     {
38
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/user/edit');
38
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/user/edit');
39 39
         return $smarty->render($this);
40 40
     }
41 41
 
Please login to merge, or discard this patch.
src/Intraface/modules/intranetmaintenance/Controller/Intranet/Key.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
         $modul = $this->getKernel()->module("intranetmaintenance");
15 15
         $translation = $this->getKernel()->getTranslation('intranetmaintenance');
16 16
 
17
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/edit');
17
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/edit');
18 18
         return $smarty->render($this);
19 19
     }
20 20
 
Please login to merge, or discard this patch.