Completed
Pull Request — master (#26)
by Lars
14:13
created
src/Intraface/modules/onlinepayment/provider/DanDomain.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -142,8 +142,8 @@
 block discarded – undo
142 142
 
143 143
     function getSettings()
144 144
     {
145
-        $this->value['password'] =  $this->kernel->setting->get('intranet', 'onlinepayment.dandomain.password');
146
-        $this->value['merchant_id'] =   $this->kernel->setting->get('intranet', 'onlinepayment.dandomain.merchant_id');
145
+        $this->value['password'] = $this->kernel->setting->get('intranet', 'onlinepayment.dandomain.password');
146
+        $this->value['merchant_id'] = $this->kernel->setting->get('intranet', 'onlinepayment.dandomain.merchant_id');
147 147
         return $this->value;
148 148
     }
149 149
 
Please login to merge, or discard this patch.
src/Intraface/modules/onlinepayment/provider/QuickPay.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
         $this->quickpay = new quickpay;
59 59
         $this->quickpay->set_md5checkword($this->settings['md5_secret']);
60 60
         $this->quickpay->set_merchant($this->settings['merchant_id']);
61
-        $this->quickpay->set_curl_certificate(dirname(__FILE__) . '/../../../certificates/cacert.pem');
61
+        $this->quickpay->set_curl_certificate(dirname(__FILE__).'/../../../certificates/cacert.pem');
62 62
 
63 63
         // hvordan bliver disse sat - og hvad er det n�jagtigt?
64 64
         $this->quickpay->set_posc($this->posc);
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 
105 105
             // henter bel�bene fra denne onlinebetaling
106 106
             $this->quickpay->set_transaction($this->get('transaction_number'));
107
-            $this->quickpay->set_amount(round($this->get('amount') * 100));
107
+            $this->quickpay->set_amount(round($this->get('amount')*100));
108 108
 
109 109
             $this->eval = $this->quickpay->capture();
110 110
 
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
                 $this->setStatus("reversed");
131 131
                 return true;
132 132
             } else {
133
-                $this->error->set('Betalingen kunne ikke tilbagebetales: ' . $this->eval['qpstatmsg']);
133
+                $this->error->set('Betalingen kunne ikke tilbagebetales: '.$this->eval['qpstatmsg']);
134 134
                 return false;
135 135
             }
136 136
         } else {
@@ -184,8 +184,8 @@  discard block
 block discarded – undo
184 184
      */
185 185
     function getSettings()
186 186
     {
187
-        $this->value['md5_secret'] =    $this->kernel->setting->get('intranet', 'onlinepayment.quickpay.md5_secret');
188
-        $this->value['merchant_id'] =   $this->kernel->setting->get('intranet', 'onlinepayment.quickpay.merchant_id');
187
+        $this->value['md5_secret'] = $this->kernel->setting->get('intranet', 'onlinepayment.quickpay.md5_secret');
188
+        $this->value['merchant_id'] = $this->kernel->setting->get('intranet', 'onlinepayment.quickpay.merchant_id');
189 189
         return $this->value;
190 190
     }
191 191
 
Please login to merge, or discard this patch.
src/Intraface/modules/onlinepayment/OnlinePaymentGateway.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     {
26 26
         $type = 'id';
27 27
         $db = new DB_Sql;
28
-        $db->query("SELECT provider_key FROM onlinepayment WHERE id = ".(int)$value. " AND intranet_id = " . $this->kernel->intranet->get('id'));
28
+        $db->query("SELECT provider_key FROM onlinepayment WHERE id = ".(int)$value." AND intranet_id = ".$this->kernel->intranet->get('id'));
29 29
         if (!$db->nextRecord()) {
30 30
             throw new Exception('OnlinePayment::factory: Ikke et gyldigt id');
31 31
         }
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     public function findByTransactionNumber($value)
46 46
     {
47 47
         $db = new DB_Sql;
48
-        $db->query("SELECT provider_key FROM onlinepayment WHERE transaction_number = '".$value."' AND intranet_id = " . $kernel->intranet->get('id'));
48
+        $db->query("SELECT provider_key FROM onlinepayment WHERE transaction_number = '".$value."' AND intranet_id = ".$kernel->intranet->get('id'));
49 49
         if (!$db->nextRecord()) {
50 50
             throw new Exception('OnlinePayment::factory: Ikke et gyldigt transactionnumber');
51 51
         }
Please login to merge, or discard this patch.
src/Intraface/modules/onlinepayment/Controller/Payment.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 
17 17
         $value['dk_amount'] = $onlinepayment->get('dk_amount');
18 18
 
19
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/payment');
19
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/payment');
20 20
         return $smarty->render($this, array('value' => $value, 'kernel' => $this->context->getKernel(), 'onlinepayment' => $onlinepayment));
21 21
     }
22 22
 
Please login to merge, or discard this patch.
src/Intraface/modules/onlinepayment/Controller/templates/payment.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
                     case "invoice":
25 25
                         if ($kernel->user->hasModuleAccess('invoice')) {
26 26
                             $debtor_module = $kernel->useModule('debtor');
27
-                            print("<a href=\"".$debtor_module->getPath().$onlinepayment->get('belong_to') . '/list/' . $onlinepayment->get('belong_to_id')."\">Faktura</a>");
27
+                            print("<a href=\"".$debtor_module->getPath().$onlinepayment->get('belong_to').'/list/'.$onlinepayment->get('belong_to_id')."\">Faktura</a>");
28 28
                         } else {
29 29
                             e("Faktura");
30 30
                         }
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
                     case "order":
33 33
                         if ($kernel->user->hasModuleAccess('order')) {
34 34
                             $debtor_module = $kernel->useModule('debtor');
35
-                            print("<a href=\"".$debtor_module->getPath().$onlinepayment->get('belong_to') . '/list/' . $onlinepayment->get('belong_to_id')."\">Ordre</a>");
35
+                            print("<a href=\"".$debtor_module->getPath().$onlinepayment->get('belong_to').'/list/'.$onlinepayment->get('belong_to_id')."\">Ordre</a>");
36 36
                         } else {
37 37
                             e("Ordre");
38 38
                         }
Please login to merge, or discard this patch.
src/Intraface/modules/onlinepayment/Controller/templates/index.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
                         case "invoice":
83 83
                             if ($kernel->user->hasModuleAccess('invoice')) {
84 84
                                 $debtor_module = $kernel->useModule('debtor');
85
-                                print("<a href=\"".$debtor_module->getPath().$payment['belong_to'] . '/list/' . $payment['belong_to_id']."\">Faktura</a>");
85
+                                print("<a href=\"".$debtor_module->getPath().$payment['belong_to'].'/list/'.$payment['belong_to_id']."\">Faktura</a>");
86 86
                             } else {
87 87
                                 e("Faktura");
88 88
                             }
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
                         case "order":
91 91
                             if ($kernel->user->hasModuleAccess('order')) {
92 92
                                 $debtor_module = $kernel->useModule('debtor');
93
-                                print("<a href=\"".$debtor_module->getPath().$payment['belong_to'] . '/list/' . $payment['belong_to_id']."\">Ordre</a>");
93
+                                print("<a href=\"".$debtor_module->getPath().$payment['belong_to'].'/list/'.$payment['belong_to_id']."\">Ordre</a>");
94 94
                             } else {
95 95
                                 e("Ordre");
96 96
                             }
Please login to merge, or discard this patch.
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.
modules/intranetmaintenance/Controller/templates/intranet/show.tpl.php 1 patch
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.
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.