Completed
Pull Request — master (#26)
by Lars
10:03
created
src/Intraface/modules/accounting/Controller/Vat/Show.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
             'saldo_total' => $saldo_total
44 44
         );
45 45
 
46
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/vat/show');
46
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/vat/show');
47 47
         return $smarty->render($this, $data);
48 48
     }
49 49
 
Please login to merge, or discard this patch.
src/Intraface/modules/accounting/Controller/Vat/Index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
         $periods = $vat_period->getList();
42 42
         $post = new Post(new Voucher($year));
43 43
 
44
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/vat/period');
44
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/vat/period');
45 45
         return $smarty->render($this);
46 46
     }
47 47
 
Please login to merge, or discard this patch.
src/Intraface/modules/filemanager/FileViewer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
         $last_modified = filemtime($this->file_path);
96 96
 
97 97
         header('Content-Type: '.$this->mime_type);
98
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $last_modified).' GMT');
98
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_modified).' GMT');
99 99
         header('Cache-Control:');
100 100
         header('Content-Disposition: inline; filename='.$this->file_name);
101 101
         header('Pragma:');
Please login to merge, or discard this patch.
src/Intraface/modules/filemanager/FileHandlerHTML.php 3 patches
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -86,19 +86,19 @@
 block discarded – undo
86 86
 
87 87
 
88 88
     /**
89
-    * Denne funktion skal printe et upload field.
90
-    *
91
-    * Det skal p� en eller anden m�de v�re muligt at s�tte f�lgende parameter:
92
-    * @param checkbox_name: navnet p� den checkboks, som inds�ttes, n�r der er uploadet et billede
93
-    * @param upload_field_name: navnet p� type="file" input-felttet.
94
-    * @param submit_name: navnet p� submit-knappen, som f�rer til "V�lg fra filarkiv"
95
-    * @param options: array:
96
-    *       image_attr (mulighed for at s�tte attributer p� img-tag);
97
-    *           field_description: (det som st�r foran upload feltet, standard 'Fil')
98
-    *           image_size: (st�rrelsen p� billedet. Standard original
99
-    *           type: full/only_upload
100
-    *           include_submit_button_name: hvis sat bliver der indsat en "Upload" knap efter fil-felt, men strengen som navn
101
-    */
89
+     * Denne funktion skal printe et upload field.
90
+     *
91
+     * Det skal p� en eller anden m�de v�re muligt at s�tte f�lgende parameter:
92
+     * @param checkbox_name: navnet p� den checkboks, som inds�ttes, n�r der er uploadet et billede
93
+     * @param upload_field_name: navnet p� type="file" input-felttet.
94
+     * @param submit_name: navnet p� submit-knappen, som f�rer til "V�lg fra filarkiv"
95
+     * @param options: array:
96
+     *       image_attr (mulighed for at s�tte attributer p� img-tag);
97
+     *           field_description: (det som st�r foran upload feltet, standard 'Fil')
98
+     *           image_size: (st�rrelsen p� billedet. Standard original
99
+     *           type: full/only_upload
100
+     *           include_submit_button_name: hvis sat bliver der indsat en "Upload" knap efter fil-felt, men strengen som navn
101
+     */
102 102
 
103 103
     function printFormUploadTag($checkbox_name, $upload_field_name, $submit_name, $options = array())
104 104
     {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         echo '<label for="'.$upload_field_name.'">'.t($options['field_description'], 'filehandler').'</label>';
134 134
         echo '<input name="'.$upload_field_name.'" type="file" id="'.$upload_field_name.'" />';
135 135
         if ($options['include_submit_button_name'] != '') {
136
-            echo ' <input type="submit" name="'.$options['include_submit_button_name'].'" value="'.t('upload', 'filehandler') . '" /> <br />';
136
+            echo ' <input type="submit" name="'.$options['include_submit_button_name'].'" value="'.t('upload', 'filehandler').'" /> <br />';
137 137
         }
138 138
         if ($this->file_handler->kernel->user->hasModuleAccess('filemanager') and $options['filemanager'] === true) {
139 139
             echo ' &nbsp; '.t('or').' &nbsp; <input type="submit" name="'.$submit_name.'" value="'.t('choose from filemanager', 'filehandler').'" />';
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
             $this->file_handler->createInstance('small');
156 156
 
157 157
             if ($options['div_style'] == '') {
158
-                $options['div_style'] = 'height: '.($this->file_handler->instance->get('height')+10).'px;';
158
+                $options['div_style'] = 'height: '.($this->file_handler->instance->get('height') + 10).'px;';
159 159
             }
160 160
             echo '<div class="show_file" style="'.$options['div_style'].'"><img src="'.$this->file_handler->instance->get('file_uri').'" style="width: '.$this->file_handler->instance->get('width').'px; height: '.$this->file_handler->instance->get('height').'px" /> '.$this->file_handler->get('file_name');
161 161
             if ($delete_link != '') {
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -79,6 +79,9 @@
 block discarded – undo
79 79
 {
80 80
     private $file_handler;
81 81
 
82
+    /**
83
+     * @param FileHandler $file_handler
84
+     */
82 85
     function __construct($file_handler)
83 86
     {
84 87
         $this->file_handler = $file_handler;
Please login to merge, or discard this patch.
src/Intraface/modules/controlpanel/Controller/templates/index.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
         </h2>
30 30
         <ul>
31 31
         <?php foreach ($files as $file) : ?>
32
-            <li><a href="<?php e(url('../../../../' . $file['url'])); ?>"><?php e(t($file['title'])); ?></a></li>
32
+            <li><a href="<?php e(url('../../../../'.$file['url'])); ?>"><?php e(t($file['title'])); ?></a></li>
33 33
         <?php endforeach; ?>
34 34
         </ul>
35 35
         </div>
Please login to merge, or discard this patch.
src/Intraface/modules/controlpanel/Controller/User.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,13 +36,13 @@
 block discarded – undo
36 36
 
37 37
     function renderHtml()
38 38
     {
39
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/user');
39
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/user');
40 40
         return $smarty->render($this, $this->getValues());
41 41
     }
42 42
 
43 43
     function renderHtmlEdit()
44 44
     {
45
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/useredit');
45
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/useredit');
46 46
         return $smarty->render($this, $this->getValues());
47 47
     }
48 48
 
Please login to merge, or discard this patch.
src/Intraface/modules/controlpanel/Controller/ChangePassword.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 
11 11
     function renderHtml()
12 12
     {
13
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/changepassword');
13
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/changepassword');
14 14
         return $smarty->render($this);
15 15
     }
16 16
 
Please login to merge, or discard this patch.
src/Intraface/modules/controlpanel/Controller/UserPreferences.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
 
36 36
     function renderHtml()
37 37
     {
38
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/userpreferences');
38
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/userpreferences');
39 39
         return $smarty->render($this);
40 40
     }
41 41
 
Please login to merge, or discard this patch.
src/Intraface/modules/administration/include_frontpage.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 if (!$intranet->isFilledIn()) :
11 11
     $_advice[] = array(
12 12
         'msg' => 'all information about the intranet has not been filled in',
13
-        'link' => $administration_module->getPath() . 'intranet?edit',
13
+        'link' => $administration_module->getPath().'intranet?edit',
14 14
         'module' => $administration_module->getName()
15 15
     );
16 16
 endif;
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 if (!$intranet->get('identifier')) :
19 19
     $_attention_needed[] = array(
20 20
         'msg' => 'identifier for the intranet is missing',
21
-        'link' => $administration_module->getPath() . 'intranet?edit',
21
+        'link' => $administration_module->getPath().'intranet?edit',
22 22
         'module' => $administration_module->getName()
23 23
     );
24 24
 endif;
Please login to merge, or discard this patch.