@@ -10,7 +10,7 @@ |
||
10 | 10 | |
11 | 11 | function renderHtml() |
12 | 12 | { |
13 | - $smarty = $this->template->create(dirname(__FILE__) . '/templates/index'); |
|
13 | + $smarty = $this->template->create(dirname(__FILE__).'/templates/index'); |
|
14 | 14 | return $smarty->render($this); |
15 | 15 | } |
16 | 16 |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | |
29 | 29 | function findById($id, $load_active = true) |
30 | 30 | { |
31 | - require_once dirname(__FILE__) . '/Year.php'; |
|
31 | + require_once dirname(__FILE__).'/Year.php'; |
|
32 | 32 | return new Year($this->kernel, $id, $load_active); |
33 | 33 | } |
34 | 34 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | { |
63 | 63 | $sql = "SELECT id FROM accounting_voucher |
64 | 64 | WHERE intranet_id = ".$this->kernel->intranet->get('id')." |
65 | - AND id = " . (int)$voucher_id . " |
|
65 | + AND id = " . (int)$voucher_id." |
|
66 | 66 | LIMIT 1"; |
67 | 67 | |
68 | 68 | $db = new DB_Sql; |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | return new k_SeeOther($this->url('selectyear')); |
26 | 26 | } |
27 | 27 | |
28 | - $this->document->setTitle('State procurement #' . $this->getProcurement()->get('id')); |
|
28 | + $this->document->setTitle('State procurement #'.$this->getProcurement()->get('id')); |
|
29 | 29 | |
30 | 30 | $data = array( |
31 | 31 | 'procurement' => $this->getProcurement(), |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | 'value' => $this->getValues(), |
37 | 37 | 'vat_account' => new Account($this->getYear(), $this->getYear()->getSetting('vat_in_account_id'))); |
38 | 38 | |
39 | - $smarty = $this->template->create(dirname(__FILE__) . '/../templates/state/procurement'); |
|
39 | + $smarty = $this->template->create(dirname(__FILE__).'/../templates/state/procurement'); |
|
40 | 40 | return $smarty->render($this, $data); |
41 | 41 | } |
42 | 42 | |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | function getProposeButton() |
119 | 119 | { |
120 | 120 | if ($this->add_propose_button === true) { |
121 | - return '<input type="submit" name="propose_changes" value="' . $this->t('Propose changes') . '" />'; |
|
121 | + return '<input type="submit" name="propose_changes" value="'.$this->t('Propose changes').'" />'; |
|
122 | 122 | } |
123 | 123 | } |
124 | 124 | } |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | |
11 | 11 | function renderHtml() |
12 | 12 | { |
13 | - $smarty = $this->template->create(dirname(__FILE__) . '/../templates/year/end'); |
|
13 | + $smarty = $this->template->create(dirname(__FILE__).'/../templates/year/end'); |
|
14 | 14 | return $smarty->render($this); |
15 | 15 | } |
16 | 16 | |
@@ -29,21 +29,21 @@ discard block |
||
29 | 29 | $workbook->setVersion(8); |
30 | 30 | |
31 | 31 | // sending HTTP headers |
32 | - $workbook->send($kernel->intranet->get('name') . ' - konti ' . $year->get('label') . '.xls'); |
|
32 | + $workbook->send($kernel->intranet->get('name').' - konti '.$year->get('label').'.xls'); |
|
33 | 33 | |
34 | 34 | // Creating a worksheet |
35 | - $worksheet =& $workbook->addWorksheet('Konti ' . $year->get('label')); |
|
35 | + $worksheet = & $workbook->addWorksheet('Konti '.$year->get('label')); |
|
36 | 36 | $worksheet->setInputEncoding('UTF-8'); |
37 | 37 | |
38 | - $format_bold =& $workbook->addFormat(); |
|
38 | + $format_bold = & $workbook->addFormat(); |
|
39 | 39 | $format_bold->setBold(); |
40 | 40 | $format_bold->setSize(8); |
41 | 41 | |
42 | - $format_italic =& $workbook->addFormat(); |
|
42 | + $format_italic = & $workbook->addFormat(); |
|
43 | 43 | $format_italic->setItalic(); |
44 | 44 | $format_italic->setSize(8); |
45 | 45 | |
46 | - $format =& $workbook->addFormat(); |
|
46 | + $format = & $workbook->addFormat(); |
|
47 | 47 | $format->setSize(8); |
48 | 48 | $i = 0; |
49 | 49 | $worksheet->write($i, 0, $kernel->intranet->get('name'), $format_bold); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | 'intranet' => $intranet, |
72 | 72 | 'user' => $user); |
73 | 73 | |
74 | - $smarty = $this->template->create(dirname(__FILE__) . '/../templates/user/show'); |
|
74 | + $smarty = $this->template->create(dirname(__FILE__).'/../templates/user/show'); |
|
75 | 75 | return $smarty->render($this, $data); |
76 | 76 | } |
77 | 77 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | |
105 | 105 | function renderHtmlEdit() |
106 | 106 | { |
107 | - $smarty = $this->template->create(dirname(__FILE__) . '/../templates/user/edit'); |
|
107 | + $smarty = $this->template->create(dirname(__FILE__).'/../templates/user/edit'); |
|
108 | 108 | return $smarty->render($this); |
109 | 109 | } |
110 | 110 |
@@ -10,7 +10,7 @@ |
||
10 | 10 | |
11 | 11 | function renderHtml() |
12 | 12 | { |
13 | - $smarty = $this->template->create(dirname(__FILE__) . '/templates/index'); |
|
13 | + $smarty = $this->template->create(dirname(__FILE__).'/templates/index'); |
|
14 | 14 | return $smarty->render($this); |
15 | 15 | } |
16 | 16 |
@@ -32,7 +32,7 @@ |
||
32 | 32 | # If there is subcategories to the category |
33 | 33 | if (is_array($category['categories']) && count($category['categories']) > 0) { |
34 | 34 | # We make the items for the next level the sub categories of this category |
35 | - $level_categories[$level+1] = $category['categories']; |
|
35 | + $level_categories[$level + 1] = $category['categories']; |
|
36 | 36 | |
37 | 37 | # We move to next level |
38 | 38 | $level++; |
@@ -196,14 +196,14 @@ discard block |
||
196 | 196 | if ($value['message'] != '') { |
197 | 197 | $value['message'] .= "\n\n"; |
198 | 198 | } |
199 | - $value['message'] .= "Kundekupon:". $input['customer_coupon']; |
|
199 | + $value['message'] .= "Kundekupon:".$input['customer_coupon']; |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | if (isset($input['customer_comment']) && $input['customer_comment'] != '') { |
203 | 203 | if ($value['message'] != '') { |
204 | 204 | $value['message'] .= "\n\n"; |
205 | 205 | } |
206 | - $value['message'] .= "Kommentar:\n". $input['customer_comment']; |
|
206 | + $value['message'] .= "Kommentar:\n".$input['customer_comment']; |
|
207 | 207 | } |
208 | 208 | |
209 | 209 | if (isset($input['payment_method']) && is_array($input['payment_method']) && !empty($input['payment_method'])) { |
@@ -328,15 +328,15 @@ discard block |
||
328 | 328 | $email = new Email($this->kernel); |
329 | 329 | |
330 | 330 | if ($this->shop->getConfirmationSubject()) { |
331 | - $subject = $this->shop->getConfirmationSubject() . ' (#' . $this->order->get('number') . ')'; |
|
331 | + $subject = $this->shop->getConfirmationSubject().' (#'.$this->order->get('number').')'; |
|
332 | 332 | } else { |
333 | - $subject = 'Bekræftelse på bestilling (#' . $this->order->get('number') . ')'; |
|
333 | + $subject = 'Bekræftelse på bestilling (#'.$this->order->get('number').')'; |
|
334 | 334 | } |
335 | 335 | |
336 | 336 | $body = $this->shop->getConfirmationText(); |
337 | 337 | |
338 | 338 | if ($this->shop->showPaymentUrl()) { |
339 | - $body .= "\n\n" . $this->shop->getPaymentUrl() . $this->order->getIdentifier(); |
|
339 | + $body .= "\n\n".$this->shop->getPaymentUrl().$this->order->getIdentifier(); |
|
340 | 340 | } |
341 | 341 | |
342 | 342 | // @todo improve this table |
@@ -352,19 +352,19 @@ discard block |
||
352 | 352 | $currency_iso_code = 'DKK'; |
353 | 353 | } |
354 | 354 | |
355 | - $table->addRow(array(round($item["quantity"]), substr($item["name"], 0, 40), $currency_iso_code.' ' . $amount)); |
|
355 | + $table->addRow(array(round($item["quantity"]), substr($item["name"], 0, 40), $currency_iso_code.' '.$amount)); |
|
356 | 356 | } |
357 | 357 | |
358 | - $body .= "\n\n" . $table->getTable(); |
|
358 | + $body .= "\n\n".$table->getTable(); |
|
359 | 359 | |
360 | 360 | if ($this->shop->getConfirmationGreeting()) { |
361 | - $body .= "\n\n" . $this->shop->getConfirmationGreeting(); |
|
361 | + $body .= "\n\n".$this->shop->getConfirmationGreeting(); |
|
362 | 362 | } else { |
363 | - $body .= "Venlig hilsen\n". $this->kernel->intranet->address->get('name'); |
|
363 | + $body .= "Venlig hilsen\n".$this->kernel->intranet->address->get('name'); |
|
364 | 364 | } |
365 | 365 | |
366 | 366 | if ($this->shop->showLoginUrl()) { |
367 | - $body .= "\n\n" . $this->contact->getLoginUrl(); |
|
367 | + $body .= "\n\n".$this->contact->getLoginUrl(); |
|
368 | 368 | } |
369 | 369 | |
370 | 370 | if (!$email->save(array('contact_id' => $this->contact->get('id'), |
@@ -439,9 +439,9 @@ discard block |
||
439 | 439 | $this->kernel->useShared('email'); |
440 | 440 | $email = new Email($this->kernel); |
441 | 441 | |
442 | - $subject = 'Bekræftelse på betaling (#' . $payment_id . ')'; |
|
442 | + $subject = 'Bekræftelse på betaling (#'.$payment_id.')'; |
|
443 | 443 | $body = 'Vi har modtaget din betaling. Hvis din ordre var afsendt inden kl. 12.00, sender vi den allerede i dag.'; |
444 | - $body .= "\n\nVenlig hilsen\n". $this->kernel->intranet->address->get('name'); |
|
444 | + $body .= "\n\nVenlig hilsen\n".$this->kernel->intranet->address->get('name'); |
|
445 | 445 | |
446 | 446 | if (!$email->save(array('contact_id' => $this->contact->get('id'), |
447 | 447 | 'subject' => $subject, |
@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | function findById($id) |
14 | 14 | { |
15 | - $this->db->query("SELECT site_id, id FROM cms_template WHERE id = " . $id . " AND intranet_id = " . $this->kernel->intranet->get('id')); |
|
15 | + $this->db->query("SELECT site_id, id FROM cms_template WHERE id = ".$id." AND intranet_id = ".$this->kernel->intranet->get('id')); |
|
16 | 16 | if (!$this->db->nextRecord()) { |
17 | 17 | return false; |
18 | 18 | } |