Completed
Pull Request — master (#21)
by Lars
14:31
created
src/Intraface/modules/cms/element/Delicious.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
         $url = parse_url($var['url']);
61 61
 
62 62
         // cleans up url
63
-        $var['url'] = $url['scheme'] . '://' . $url['host'] . $url['path'];
63
+        $var['url'] = $url['scheme'].'://'.$url['host'].$url['path'];
64 64
 
65 65
         $this->parameter->save('url', $var['url']);
66 66
 
Please login to merge, or discard this patch.
src/Intraface/modules/cms/section/Mixed.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,8 +52,8 @@
 block discarded – undo
52 52
         $db = new DB_Sql;
53 53
         $db->query("SELECT id FROM cms_element
54 54
             WHERE intranet_id = ".$this->kernel->intranet->get('id')."
55
-                AND section_id = " . $this->id . "
56
-                AND active = 1 " . $sql_expire . $sql_publish . "
55
+                AND section_id = " . $this->id."
56
+                AND active = 1 " . $sql_expire.$sql_publish."
57 57
             ORDER BY position ASC");
58 58
         $i = 0;
59 59
 
Please login to merge, or discard this patch.
src/Intraface/modules/invoice/Depreciation.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@
 block discarded – undo
127 127
         }
128 128
 
129 129
         $db = new DB_sql;
130
-        $db->query("UPDATE invoice_payment SET date_stated = NOW(), voucher_id = ".$voucher->get('id').' WHERE id = '. $this->id.' AND intranet_id = '.$this->kernel->intranet->getId());
130
+        $db->query("UPDATE invoice_payment SET date_stated = NOW(), voucher_id = ".$voucher->get('id').' WHERE id = '.$this->id.' AND intranet_id = '.$this->kernel->intranet->getId());
131 131
 
132 132
         $this->load();
133 133
         return true;
Please login to merge, or discard this patch.
Doc Comments   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -360,10 +360,11 @@  discard block
 block discarded – undo
360 360
     /**
361 361
      * States the payment i the given year
362 362
      *
363
-     * @param object $year Accounting Year object
363
+     * @param Year $year Accounting Year object
364 364
      * @param integer $voucher_number
365 365
      * @param string $voucher_date
366 366
      * @param integer $state_account_number
367
+     * @param Stub_Translation $translation
367 368
      *
368 369
      * @return boolean true on succes or false.
369 370
      */
@@ -454,7 +455,7 @@  discard block
 block discarded – undo
454 455
     /**
455 456
      * returns possible payment types
456 457
      *
457
-     * @return array payment types
458
+     * @return string[] payment types
458 459
      *
459 460
      */
460 461
     public static function getTypes()
@@ -469,7 +470,7 @@  discard block
 block discarded – undo
469 470
     /**
470 471
      * returns the possible types payments can be for.
471 472
      *
472
-     * @return array payment for types
473
+     * @return string[] payment for types
473 474
      */
474 475
     private static function getPaymentForTypes()
475 476
     {
Please login to merge, or discard this patch.
src/Intraface/modules/email/Controller/templates/show.tpl.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
     <?php if ($email->get('status') != 'sent') : ?>
6 6
     <li><a href="<?php e(url(null, array('edit'))); ?>"><?php e(t('Edit')); ?></a></li>
7 7
     <?php endif; ?>
8
-    <li><a class="pdf" href="<?php e(url(null . '.pdf')); ?>"><?php e(t('Pdf')); ?></a></li>
8
+    <li><a class="pdf" href="<?php e(url(null.'.pdf')); ?>"><?php e(t('Pdf')); ?></a></li>
9 9
 </ul>
10 10
 
11 11
 <?php if ($email->get('status') == 'sent') : ?>
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,8 +14,10 @@
 block discarded – undo
14 14
     <div>
15 15
         <input type="submit" value="<?php e(t('Switch')); ?>" /> <a href="<?php if (isset($_SERVER['HTTP_REFERER'])) :
16 16
             e($_SERVER['HTTP_REFERER']);
17
-else :
17
+else {
18
+    :
18 19
     echo 'index.php';
20
+}
19 21
 endif; ?>"><?php e(t('Cancel')); ?></a>
20 22
     </div>
21 23
 
Please login to merge, or discard this patch.
src/Intraface/modules/email/Controller/templates/index.tpl.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,9 +10,12 @@  discard block
 block discarded – undo
10 10
 
11 11
     <p><?php e(t('no e-mails has been sent')); ?></p>
12 12
 
13
-<?php else : ?>
13
+<?php else {
14
+    : ?>
14 15
     <?php if ($queue > 0) : ?>
15
-        <p><?php e(t('E-mails are in queue - the will be sent soon')); ?></p>
16
+        <p><?php e(t('E-mails are in queue - the will be sent soon'));
17
+}
18
+?></p>
16 19
     <?php endif; ?>
17 20
 
18 21
     <?php echo $gateway->getDBQuery()->display('character'); ?>
@@ -37,8 +40,11 @@  discard block
 block discarded – undo
37 40
         <?php if (!empty($email['status']) and $email['status'] != 'sent') : ?>
38 41
             <a class="edit" href="<?php e(url($email['id'], array('edit'))); ?>"><?php e(t('edit')); ?></a>
39 42
             <a class="delete" href="<?php e(url($email['id'], array('delete'))); ?>"><?php e(t('delete')); ?></a>
40
-        <?php else : ?>
41
-            <?php e(t($email['status'])); ?>
43
+        <?php else {
44
+    : ?>
45
+            <?php e(t($email['status']));
46
+}
47
+?>
42 48
         <?php endif; ?>
43 49
         </td>
44 50
     </tr>
Please login to merge, or discard this patch.
src/Intraface/modules/email/Controller/Email.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
         $value = $email->get();
18 18
         $contact = $email->getContact();
19 19
 
20
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/show');
20
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/show');
21 21
         $data = array(
22 22
             'contact' => $contact,
23 23
             'value' => $value,
@@ -35,18 +35,18 @@  discard block
 block discarded – undo
35 35
         $size = 12; // font size
36 36
 
37 37
         // udskriv adressehoved
38
-        $text = $this->getEmail()->getContact()->address->get('name') .
39
-            "\n" . $this->getEmail()->getContact()->address->get('address') .
40
-            "\n" . $this->getEmail()->getContact()->address->get('postcode') .
41
-            "  " . $this->getEmail()->getContact()->address->get('city') . "\n\n\n";
38
+        $text = $this->getEmail()->getContact()->address->get('name').
39
+            "\n".$this->getEmail()->getContact()->address->get('address').
40
+            "\n".$this->getEmail()->getContact()->address->get('postcode').
41
+            "  ".$this->getEmail()->getContact()->address->get('city')."\n\n\n";
42 42
 
43 43
         $pdf->ezText($text, $size);
44 44
 
45 45
         // uskriv subject
46
-        $pdf->ezText($this->getEmail()->get('subject') . "\n\n", $size);
46
+        $pdf->ezText($this->getEmail()->get('subject')."\n\n", $size);
47 47
 
48 48
         // udskriv body
49
-        $pdf->ezText($this->getEmail()->get('body') . "\n", $size);
49
+        $pdf->ezText($this->getEmail()->get('body')."\n", $size);
50 50
 
51 51
         // udskriv greeting
52 52
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
         $contact = $email->getContact();
105 105
         $redirect = Intraface_Redirect::factory($this->getKernel(), 'receive');
106 106
 
107
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/edit');
107
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/edit');
108 108
         $data = array(
109 109
             'contact' => $contact,
110 110
             'value' => $value,
Please login to merge, or discard this patch.
src/Intraface/modules/backup/Controller/Index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
         	'email_shared' => $email_shared
63 63
         );
64 64
 
65
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/index');
65
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/index');
66 66
         return $tpl->render($this, $data);
67 67
     }
68 68
 
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.