Completed
Pull Request — master (#26)
by Lars
14:13
created
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 1 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.
src/Intraface/modules/intranetmaintenance/Controller/Intranet/Show.php 1 patch
Spacing   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
                 $contact_module = $this->getKernel()->useModule('contact');
49 49
 
50 50
                 $redirect = Intraface_Redirect::factory($kernel, 'go');
51
-                $url = $redirect->setDestination($contact_module->getPath()."select_contact", NET_SCHEME . NET_HOST . $this->url());
51
+                $url = $redirect->setDestination($contact_module->getPath()."select_contact", NET_SCHEME.NET_HOST.$this->url());
52 52
                 $redirect->askParameter('contact_id');
53 53
                 $redirect->setIdentifier('contact');
54 54
 
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         // add existing user
62 62
         if ($this->query('add_user') == 1) {
63 63
             $redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
64
-            $url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('../../user'), NET_SCHEME . NET_HOST . $this->url(null));
64
+            $url = $redirect->setDestination(NET_SCHEME.NET_HOST.$this->url('../../user'), NET_SCHEME.NET_HOST.$this->url(null));
65 65
             $redirect->askParameter('user_id');
66 66
             $redirect->setIdentifier('add_user');
67 67
             return new k_SeeOther($url);
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
                 $user = new UserMaintenance($redirect->getParameter('user_id'));
78 78
                 $user->setIntranetAccess($intranet->get('id'));
79 79
                 $user_id = $user->get('id');
80
-                return new k_SeeOther($this->url('../../user/' . $user->get('id'), array('intranet_id' => $this->name())));
80
+                return new k_SeeOther($this->url('../../user/'.$user->get('id'), array('intranet_id' => $this->name())));
81 81
             }
82 82
         }
83 83
 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
         $gateway = new Intraface_ModuleGateway($this->mdb2);
93 93
         $modules = $gateway->getList();
94 94
 
95
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/show');
95
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/show');
96 96
         return $smarty->render($this, array('modules' => $modules));
97 97
     }
98 98
 
@@ -103,13 +103,13 @@  discard block
 block discarded – undo
103 103
         $modul = $this->getKernel()->module("intranetmaintenance");
104 104
         $translation = $this->getKernel()->getTranslation('intranetmaintenance');
105 105
 
106
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/edit');
106
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/edit');
107 107
         return $smarty->render($this);
108 108
     }
109 109
 
110 110
     function renderHtmlDelete()
111 111
     {
112
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/intranet/delete');
112
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/intranet/delete');
113 113
         return $smarty->render($this);
114 114
     }
115 115
 
@@ -141,70 +141,70 @@  discard block
 block discarded – undo
141 141
             throw new Exception('Du kan kun slette bambus beta og bambus - sune og lars');
142 142
         }
143 143
 
144
-        $db->query("DELETE FROM accounting_account WHERE intranet_id = " . $intranet_id);
145
-        $db->query("DELETE FROM accounting_post WHERE intranet_id = " . $intranet_id);
146
-        $db->query("DELETE FROM accounting_vat_period WHERE intranet_id = " . $intranet_id);
147
-        $db->query("DELETE FROM accounting_voucher WHERE intranet_id = " . $intranet_id);
148
-        $db->query("DELETE FROM accounting_voucher_file WHERE intranet_id = " . $intranet_id);
149
-        $db->query("DELETE FROM accounting_year WHERE intranet_id = " . $intranet_id);
150
-        $db->query("DELETE FROM accounting_year_end WHERE intranet_id = " . $intranet_id);
151
-        $db->query("DELETE FROM accounting_year_end_action WHERE intranet_id = " . $intranet_id);
144
+        $db->query("DELETE FROM accounting_account WHERE intranet_id = ".$intranet_id);
145
+        $db->query("DELETE FROM accounting_post WHERE intranet_id = ".$intranet_id);
146
+        $db->query("DELETE FROM accounting_vat_period WHERE intranet_id = ".$intranet_id);
147
+        $db->query("DELETE FROM accounting_voucher WHERE intranet_id = ".$intranet_id);
148
+        $db->query("DELETE FROM accounting_voucher_file WHERE intranet_id = ".$intranet_id);
149
+        $db->query("DELETE FROM accounting_year WHERE intranet_id = ".$intranet_id);
150
+        $db->query("DELETE FROM accounting_year_end WHERE intranet_id = ".$intranet_id);
151
+        $db->query("DELETE FROM accounting_year_end_action WHERE intranet_id = ".$intranet_id);
152 152
 
153 153
         // her skulle vi slette noget address
154 154
 
155
-        $db->query("DELETE FROM contact WHERE intranet_id = " . $intranet_id);
156
-        $db->query("DELETE FROM contact_person WHERE intranet_id = " . $intranet_id);
157
-        $db->query("DELETE FROM contact_message WHERE intranet_id  = " . $intranet_id);
155
+        $db->query("DELETE FROM contact WHERE intranet_id = ".$intranet_id);
156
+        $db->query("DELETE FROM contact_person WHERE intranet_id = ".$intranet_id);
157
+        $db->query("DELETE FROM contact_message WHERE intranet_id  = ".$intranet_id);
158 158
 
159
-        $db->query("DELETE FROM cms_element WHERE intranet_id = " . $intranet_id);
160
-        $db->query("DELETE FROM cms_page WHERE intranet_id = " . $intranet_id);
161
-        $db->query("DELETE FROM cms_parameter WHERE intranet_id = " . $intranet_id);
162
-        $db->query("DELETE FROM cms_section WHERE intranet_id = " . $intranet_id);
163
-        $db->query("DELETE FROM cms_site WHERE intranet_id = " . $intranet_id);
164
-        $db->query("DELETE FROM cms_template WHERE intranet_id = " . $intranet_id);
165
-        $db->query("DELETE FROM cms_template_section WHERE intranet_id = " . $intranet_id);
159
+        $db->query("DELETE FROM cms_element WHERE intranet_id = ".$intranet_id);
160
+        $db->query("DELETE FROM cms_page WHERE intranet_id = ".$intranet_id);
161
+        $db->query("DELETE FROM cms_parameter WHERE intranet_id = ".$intranet_id);
162
+        $db->query("DELETE FROM cms_section WHERE intranet_id = ".$intranet_id);
163
+        $db->query("DELETE FROM cms_site WHERE intranet_id = ".$intranet_id);
164
+        $db->query("DELETE FROM cms_template WHERE intranet_id = ".$intranet_id);
165
+        $db->query("DELETE FROM cms_template_section WHERE intranet_id = ".$intranet_id);
166 166
 
167
-        $db->query("DELETE FROM comment WHERE intranet_id = " . $intranet_id);
167
+        $db->query("DELETE FROM comment WHERE intranet_id = ".$intranet_id);
168 168
 
169
-        $db->query("DELETE FROM debtor WHERE intranet_id = " . $intranet_id);
170
-        $db->query("DELETE FROM debtor_item WHERE intranet_id = " . $intranet_id);
169
+        $db->query("DELETE FROM debtor WHERE intranet_id = ".$intranet_id);
170
+        $db->query("DELETE FROM debtor_item WHERE intranet_id = ".$intranet_id);
171 171
 
172
-        $db->query("DELETE FROM email WHERE intranet_id = " . $intranet_id);
173
-        $db->query("DELETE FROM email_attachment WHERE intranet_id = " . $intranet_id);
172
+        $db->query("DELETE FROM email WHERE intranet_id = ".$intranet_id);
173
+        $db->query("DELETE FROM email_attachment WHERE intranet_id = ".$intranet_id);
174 174
 
175
-        $db->query("DELETE FROM file_handler WHERE intranet_id = " . $intranet_id);
176
-        $db->query("DELETE FROM file_handler_instance WHERE intranet_id = " . $intranet_id);
177
-        $db->query("DELETE FROM filehandler_append_file WHERE intranet_id = " . $intranet_id);
175
+        $db->query("DELETE FROM file_handler WHERE intranet_id = ".$intranet_id);
176
+        $db->query("DELETE FROM file_handler_instance WHERE intranet_id = ".$intranet_id);
177
+        $db->query("DELETE FROM filehandler_append_file WHERE intranet_id = ".$intranet_id);
178 178
 
179
-        $db->query("DELETE FROM invoice_payment WHERE intranet_id = " . $intranet_id);
180
-        $db->query("DELETE FROM invoice_reminder WHERE intranet_id = " . $intranet_id);
181
-        $db->query("DELETE FROM invoice_reminder_item WHERE intranet_id = " . $intranet_id);
182
-        $db->query("DELETE FROM invoice_reminder_unpaid_reminder WHERE intranet_id = " . $intranet_id);
179
+        $db->query("DELETE FROM invoice_payment WHERE intranet_id = ".$intranet_id);
180
+        $db->query("DELETE FROM invoice_reminder WHERE intranet_id = ".$intranet_id);
181
+        $db->query("DELETE FROM invoice_reminder_item WHERE intranet_id = ".$intranet_id);
182
+        $db->query("DELETE FROM invoice_reminder_unpaid_reminder WHERE intranet_id = ".$intranet_id);
183 183
 
184
-        $db->query("DELETE FROM keyword WHERE intranet_id = " . $intranet_id);
185
-        $db->query("DELETE FROM keyword_x_object WHERE intranet_id = " . $intranet_id);
184
+        $db->query("DELETE FROM keyword WHERE intranet_id = ".$intranet_id);
185
+        $db->query("DELETE FROM keyword_x_object WHERE intranet_id = ".$intranet_id);
186 186
 
187
-        $db->query("DELETE FROM newsletter_archieve WHERE intranet_id = " . $intranet_id);
188
-        $db->query("DELETE FROM newsletter_list WHERE intranet_id = " . $intranet_id);
189
-        $db->query("DELETE FROM newsletter_subscriber WHERE intranet_id = " . $intranet_id);
187
+        $db->query("DELETE FROM newsletter_archieve WHERE intranet_id = ".$intranet_id);
188
+        $db->query("DELETE FROM newsletter_list WHERE intranet_id = ".$intranet_id);
189
+        $db->query("DELETE FROM newsletter_subscriber WHERE intranet_id = ".$intranet_id);
190 190
 
191
-        $db->query("DELETE FROM onlinepayment WHERE intranet_id = " . $intranet_id);
191
+        $db->query("DELETE FROM onlinepayment WHERE intranet_id = ".$intranet_id);
192 192
 
193
-        $db->query("DELETE FROM procurement WHERE intranet_id = " . $intranet_id);
194
-        $db->query("DELETE FROM procurement_item WHERE intranet_id = " . $intranet_id);
193
+        $db->query("DELETE FROM procurement WHERE intranet_id = ".$intranet_id);
194
+        $db->query("DELETE FROM procurement_item WHERE intranet_id = ".$intranet_id);
195 195
 
196
-        $db->query("DELETE FROM product WHERE intranet_id = " . $intranet_id);
197
-        $db->query("DELETE FROM product_detail WHERE intranet_id = " . $intranet_id);
198
-        $db->query("DELETE FROM product_related WHERE intranet_id = " . $intranet_id);
196
+        $db->query("DELETE FROM product WHERE intranet_id = ".$intranet_id);
197
+        $db->query("DELETE FROM product_detail WHERE intranet_id = ".$intranet_id);
198
+        $db->query("DELETE FROM product_related WHERE intranet_id = ".$intranet_id);
199 199
 
200
-        $db->query("DELETE FROM stock_adaptation WHERE intranet_id = " . $intranet_id);
201
-        $db->query("DELETE FROM stock_regulation WHERE intranet_id = " . $intranet_id);
200
+        $db->query("DELETE FROM stock_adaptation WHERE intranet_id = ".$intranet_id);
201
+        $db->query("DELETE FROM stock_regulation WHERE intranet_id = ".$intranet_id);
202 202
 
203
-        $db->query("DELETE FROM todo_list WHERE intranet_id = " . $intranet_id);
204
-        $db->query("DELETE FROM todo_item WHERE intranet_id = " . $intranet_id);
205
-        $db->query("DELETE FROM todo_contact WHERE intranet_id = " . $intranet_id);
203
+        $db->query("DELETE FROM todo_list WHERE intranet_id = ".$intranet_id);
204
+        $db->query("DELETE FROM todo_item WHERE intranet_id = ".$intranet_id);
205
+        $db->query("DELETE FROM todo_contact WHERE intranet_id = ".$intranet_id);
206 206
 
207
-        $this->removeDir('/home/intraface/upload/' . $intranet_id . '/');
207
+        $this->removeDir('/home/intraface/upload/'.$intranet_id.'/');
208 208
     }
209 209
 
210 210
     protected function removeDir($path)
@@ -214,8 +214,8 @@  discard block
 block discarded – undo
214 214
             $path .= "/";
215 215
         }
216 216
 
217
-        $normal_files = glob($path . "*");
218
-        $hidden_files = glob($path . "\.?*");
217
+        $normal_files = glob($path."*");
218
+        $hidden_files = glob($path."\.?*");
219 219
         $all_files = array_merge($normal_files, $hidden_files);
220 220
 
221 221
         foreach ($all_files as $file) {
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
             if (is_file($file) === true) {
228 228
                 // Remove each file in this Directory
229 229
                 unlink($file);
230
-                echo "Removed File: " . $file . "<br>";
230
+                echo "Removed File: ".$file."<br>";
231 231
             } elseif (is_dir($file) === true) {
232 232
                 // If this Directory contains a Subdirectory, run this Function on it
233 233
                 removeDir($file);
Please login to merge, or discard this patch.
src/Intraface/Controller/Payment.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,8 @@
 block discarded – undo
24 24
 
25 25
         $this->document->setTitle('Payment');
26 26
 
27
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/payment');
28
-        $content = $tpl-render($this, array('text' => $text));
27
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/payment');
28
+        $content = $tpl - render($this, array('text' => $text));
29 29
         return new k_HtmlResponse($content);
30 30
     }
31 31
 }
Please login to merge, or discard this patch.
src/Intraface/Controller/templates/main.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
     <![endif]-->
18 18
 
19 19
     <?php foreach ($context->document()->scripts() as $url) : ?>
20
-    <script type="text/javascript" src="<?php e(url('/javascript/' . $url)); ?>"></script>
20
+    <script type="text/javascript" src="<?php e(url('/javascript/'.$url)); ?>"></script>
21 21
     <?php endforeach; ?>
22 22
 
23 23
     <link rel="start" href="<?php e(url('.')); ?>" title="Home" />
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 </head>
30 30
 
31 31
 <body id="intraface-dk"<?php if (!empty($module_name)) {
32
-    echo ' class="' . $module_name . '"';
32
+    echo ' class="'.$module_name.'"';
33 33
 } ?>>
34 34
     <div id="container" class="clearfix">
35 35
 
Please login to merge, or discard this patch.
src/Intraface/Controller/templates/wrapper.tpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 </head>
28 28
 
29 29
 <body id="onlinefaktura-dk"<?php if (!empty($module_name)) {
30
-    echo ' class="' . $module_name . '"';
30
+    echo ' class="'.$module_name.'"';
31 31
 } ?>>
32 32
 
33 33
     <div id="container" class="clearfix">
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
             <span class="location"><?php e($context->getKernel()->intranet->address->get('city')); ?></span>
45 45
             <?php endif; ?>
46 46
             <?php if ($context->getKernel()->intranet->address->get('cvr') != "") : ?>
47
-                &bull; <span>CVR <?php e($context->getKernel()->intranet->address->get('cvr'));    ?> </span>
47
+                &bull; <span>CVR <?php e($context->getKernel()->intranet->address->get('cvr')); ?> </span>
48 48
             <?php endif; ?>
49 49
             </div>
50 50
         </div>
Please login to merge, or discard this patch.
src/Intraface/Controller/Signup.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     {
34 34
         $this->document->setTitle('Signup');
35 35
 
36
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/signup');
36
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/signup');
37 37
         return $smarty->render($this);
38 38
     }
39 39
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
         if (!Validate::email($this->body('email'))) {
43 43
             $this->error[] = 'E-mail ugyldig';
44 44
         }
45
-        if (!Validate::string($this->body('password'), VALIDATE_ALPHA . VALIDATE_NUM)) {
45
+        if (!Validate::string($this->body('password'), VALIDATE_ALPHA.VALIDATE_NUM)) {
46 46
             $this->error[] = 'Password ugyldigt';
47 47
         }
48 48
         if (!empty($error) and count($error) > 0) {
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
                     $db->query("INSERT INTO permission SET intranet_id = ".$db->quote($intranet_id, 'integer').", user_id = ".$db->quote($user_id, 'integer'));
78 78
 
79 79
                     // module access
80
-                    $modules = array('administration', 'modulepackage', 'onlinepayment', 'cms', 'filemanager', 'contact', 'debtor','quotation', 'invoice', 'order','accounting', 'product', 'stock', 'webshop');
80
+                    $modules = array('administration', 'modulepackage', 'onlinepayment', 'cms', 'filemanager', 'contact', 'debtor', 'quotation', 'invoice', 'order', 'accounting', 'product', 'stock', 'webshop');
81 81
 
82 82
                     foreach ($modules as $module) {
83 83
                         $res = $db->query("SELECT id FROM module WHERE name = ".$db->quote($module, 'text')." LIMIT 1");
Please login to merge, or discard this patch.
src/Intraface/Controller/RetrievePassword.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     {
32 32
         $this->document->setTitle('Retrieve forgotten password');
33 33
 
34
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/retrievepassword');
34
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/retrievepassword');
35 35
         return $smarty->render($this);
36 36
     }
37 37
 
@@ -40,9 +40,9 @@  discard block
 block discarded – undo
40 40
         $new_password = Intraface_User::generateNewPassword($this->body('email'));
41 41
 
42 42
         $body  = "Huha, det var heldigt, at vi stod på spring i kulissen, så vi kan hjælpe dig med at lave en ny adgangskode.\n\n";
43
-        $body .= "Din nye adgangskode er: " . $new_password . "\n\n";
43
+        $body .= "Din nye adgangskode er: ".$new_password."\n\n";
44 44
         $body .= "Du kan logge ind fra:\n\n";
45
-        $body .= "<".PATH_WWW . 'login'.">\n\n";
45
+        $body .= "<".PATH_WWW.'login'.">\n\n";
46 46
         $body .= "Med venlig hilsen\nDin hengivne webserver";
47 47
 
48 48
         $this->email
Please login to merge, or discard this patch.