Completed
Pull Request — master (#27)
by Lars
11:57
created
src/Intraface/modules/filemanager/FileHandlerHTML.php 1 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.
src/Intraface/modules/filemanager/Append/File.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -19,19 +19,19 @@
 block discarded – undo
19 19
     {
20 20
         // @todo should add the template for intranet
21 21
         //$this->actAs('Intraface_Doctrine_Template_Intranet');
22
-        $options = array('created' =>  array('name'          => 'date_created',    // Name of created column
23
-                                             'type'          => 'timestamp',     // Doctrine column data type
24
-                                             'options'       => array(),         // Array of options for column
25
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
26
-                                             'disabled'      => false,           // Disable the created column(default)
27
-                                             'expression'    => 'NOW()'),        // Update column with database expression(default=false)
28
-                         'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default)
29
-                                             'type'          => 'timestamp',     // Doctrine column data type(default)
30
-                                             'options'       => array(),         // Array of options for column(default)
31
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
32
-                                             'disabled'      => false,           // Disable the updated column(default)
33
-                                             'expression'    => 'NOW()',         // Use a database expression to set column(default=false)
34
-                                             'onInsert'      => true));          // Whether or not to set column onInsert(default)
22
+        $options = array('created' =>  array('name'          => 'date_created', // Name of created column
23
+                                             'type'          => 'timestamp', // Doctrine column data type
24
+                                             'options'       => array(), // Array of options for column
25
+                                             'format'        => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default)
26
+                                             'disabled'      => false, // Disable the created column(default)
27
+                                             'expression'    => 'NOW()'), // Update column with database expression(default=false)
28
+                         'updated' =>  array('name'          => 'date_updated', // Name of updated column(default)
29
+                                             'type'          => 'timestamp', // Doctrine column data type(default)
30
+                                             'options'       => array(), // Array of options for column(default)
31
+                                             'format'        => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default)
32
+                                             'disabled'      => false, // Disable the updated column(default)
33
+                                             'expression'    => 'NOW()', // Use a database expression to set column(default=false)
34
+                                             'onInsert'      => true)); // Whether or not to set column onInsert(default)
35 35
 
36 36
         $this->actAs('Timestampable', $options);
37 37
 
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.
src/Intraface/modules/administration/Controller/templates/intranet.tpl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
 } ?>
76 76
             <?php if (!empty($address['cvr']) and strlen($address['cvr']) == 8) : ?>
77 77
                 (<a href="http://www.cvr.dk/Site/Forms/PublicService/DisplayCompany.aspx?cvrnr=<?php e($address['cvr']); ?>">se opslaget på virk.dk</a>)
78
-            <?php endif;?>
78
+            <?php endif; ?>
79 79
         </td>
80 80
     </tr>
81 81
     <tr>
Please login to merge, or discard this patch.
src/Intraface/modules/administration/Controller/Intranet.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
     function renderHtml()
13 13
     {
14
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/intranet');
14
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/intranet');
15 15
         return $smarty->render($this);
16 16
     }
17 17
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
                     $values['pdf_header_file_id'] = $filehandler->get('id');
34 34
                     $intranet->update($values);
35 35
                 } else {
36
-                    $filehandler->error->set('Header should be a .jpg image - got '. $filehandler->get('file_type'));
36
+                    $filehandler->error->set('Header should be a .jpg image - got '.$filehandler->get('file_type'));
37 37
                 }
38 38
             }
39 39
         }
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
         $values = $intranet->get();
42 42
         $address = $intranet->address->get();
43 43
 
44
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/intranet-edit');
44
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/intranet-edit');
45 45
         return $smarty->render($this, array('intranet' => $intranet, 'kernel' => $this->getKernel()));
46 46
     }
47 47
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
             if ($type['mime_type'] == 'image/jpeg' || $type['mime_type'] == 'image/pjpeg') {
71 71
                 $values['pdf_header_file_id'] = $id;
72 72
             } else {
73
-                $intranet->error->set('Header should be a .jpg image - got ' . $type['mime_type']);
73
+                $intranet->error->set('Header should be a .jpg image - got '.$type['mime_type']);
74 74
                 $filehandler->delete();
75 75
             }
76 76
         }
Please login to merge, or discard this patch.