intraface / intraface.dk

src/Intraface/modules/invoice/Invoice.php

Spacing +10 added lines, -10 removed lines

@@ -32,7 +32,7 @@ 
     {
         $db = new DB_Sql;
         $sql = "SELECT id FROM debtor
-            WHERE type=3 AND status=1 AND active = 1 AND due_date < NOW() AND intranet_id = ".$this->kernel->intranet->get("id")." AND contact_id = " . $contact_id;
+            WHERE type=3 AND status=1 AND active = 1 AND due_date < NOW() AND intranet_id = ".$this->kernel->intranet->get("id")." AND contact_id = ".$contact_id;
         $db->query($sql);
 
         return $db->numRows();
@@ -129,12 +129,12 @@ 
             for ($i = 0, $max = count($items); $i < $max; $i++) {
                 $product = new Product($this->kernel, $items[$i]['product_id']);
                 if ($product->get('state_account_id') == 0) {
-                    $this->error->set('Produktet ' . $product->get('name') . ' ved ikke hvor den skal bogf�res');
+                    $this->error->set('Produktet '.$product->get('name').' ved ikke hvor den skal bogf�res');
                 } else {
                     require_once 'Intraface/modules/accounting/Account.php';
                     $account = Account::factory($year, $product->get('state_account_id'));
                     if ($account->get('id') == 0 || $account->get('type') != 'operating') {
-                        $this->error->set('Ugyldig konto for bogføring af produktet ' . $product->get('name'));
+                        $this->error->set('Ugyldig konto for bogføring af produktet '.$product->get('name'));
                         $return = false;
                     }
                 }
@@ -207,7 +207,7 @@ 
             $debet_account_number = $debet_account->get('number');
             $voucher = Voucher::factory($year, $voucher_number);
 
-            $amount = $item['quantity'] * $item['price']->getAsIso(2);
+            $amount = $item['quantity']*$item['price']->getAsIso(2);
 
             // hvis bel�bet er mindre end nul, skal konti byttes om og bel�bet skal g�res positivt
             if ($amount < 0) {
@@ -224,11 +224,11 @@ 
                 'debet_account_number' => $debet_account_number,
                 'credit_account_number' => $credit_account_number,
                 'vat_off' => 1,
-                'text' => $text . ' - ' . $item['name']
+                'text' => $text.' - '.$item['name']
             );
 
             if ($credit_account->get('vat') == 'out') {
-                $total_with_vat += $item["quantity"] * $item["price"]->getAsIso(2);
+                $total_with_vat += $item["quantity"]*$item["price"]->getAsIso(2);
             }
 
             if (!$voucher->saveInDaybook($input_values, true)) {
@@ -241,16 +241,16 @@ 
         if ($total_with_vat > 0) {
             $voucher = Voucher::factory($year, $voucher_number);
             $credit_account = new Account($year, $year->getSetting('vat_out_account_id'));
-            $debet_account =    new Account($year, $year->getSetting('debtor_account_id'));
+            $debet_account = new Account($year, $year->getSetting('debtor_account_id'));
             $input_values = array(
                     'voucher_number' => $voucher_number,
                     'reference' => $this->get('number'),
                     'date' => $voucher_date,
-                    'amount' => number_format($total_with_vat * $this->kernel->setting->get('intranet', 'vatpercent') / 100, 2, ",", "."), // opm�rksom p� at vat bliver rigtig defineret
+                    'amount' => number_format($total_with_vat*$this->kernel->setting->get('intranet', 'vatpercent')/100, 2, ",", "."), // opm�rksom p� at vat bliver rigtig defineret
                     'debet_account_number' => $debet_account->get('number'),
                     'credit_account_number' => $credit_account->get('number'),
                     'vat_off' => 1,
-                    'text' => $text . ' - ' . $credit_account->get('name')
+                    'text' => $text.' - '.$credit_account->get('name')
             );
             if (!$voucher->saveInDaybook($input_values, true)) {
                 $this->error->merge($voucher->error->getMessage());
@@ -259,7 +259,7 @@ 
 
         require_once 'Intraface/modules/accounting/VoucherFile.php';
         $voucher_file = new VoucherFile($voucher);
-        if (!$voucher_file->save(array('description' => $text, 'belong_to'=>'invoice','belong_to_id'=>$this->get('id')))) {
+        if (!$voucher_file->save(array('description' => $text, 'belong_to'=>'invoice', 'belong_to_id'=>$this->get('id')))) {
             $this->error->merge($voucher_file->error->getMessage());
             $this->error->set('Filen blev ikke overflyttet');
         }

src/Intraface/modules/invoice/Reminder.php

Spacing +6 added lines, -6 removed lines

@@ -126,7 +126,7 @@ 
 
     function isNumberFree($number)
     {
-        $sql = "SELECT id FROM invoice_reminder WHERE number = ".intval($number)." AND id != ".$this->id . " AND intranet_id = " . $this->kernel->intranet->get('id');
+        $sql = "SELECT id FROM invoice_reminder WHERE number = ".intval($number)." AND id != ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id');
         $this->db->query($sql);
         if ($this->db->nextRecord()) {
             return false;
@@ -339,7 +339,7 @@ 
         }
 
         $db = new Db_Sql;
-        $db->query("UPDATE invoice_reminder SET status = ".$status_id.", ".$sql."  WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("UPDATE invoice_reminder SET status = ".$status_id.", ".$sql."  WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         $this->load();
         return true;
     }
@@ -477,14 +477,14 @@ 
         }
         $db = new DB_Sql;
         $db->query("SELECT id
-            FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND active = 1 AND contact_id=" . $contact_id);
+            FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND active = 1 AND contact_id=".$contact_id);
         return $db->numRows();
     }
 
     function isFilledIn()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM invoice_reminder WHERE intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT id FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get('id'));
         return $db->numRows();
     }
 
@@ -500,7 +500,7 @@ 
     {
         // FIXME - check on date
         $db = new DB_Sql;
-        $db->query("UPDATE invoice_reminder SET date_stated = '" . $voucher_date . "', voucher_id = '".$voucher_id."' WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("UPDATE invoice_reminder SET date_stated = '".$voucher_date."', voucher_id = '".$voucher_id."' WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         return true;
     }
 
@@ -647,7 +647,7 @@ 
 
         require_once 'Intraface/modules/accounting/VoucherFile.php';
         $voucher_file = new VoucherFile($voucher);
-        if (!$voucher_file->save(array('description' => $text, 'belong_to'=>'reminder','belong_to_id'=>$this->get('id')))) {
+        if (!$voucher_file->save(array('description' => $text, 'belong_to'=>'reminder', 'belong_to_id'=>$this->get('id')))) {
             $this->error->merge($voucher_file->error->getMessage());
             $this->error->set('Filen blev ikke overflyttet');
         }

src/Intraface/modules/invoice/ReminderGateway.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 
     function findById($id)
     {
-        require_once dirname(__FILE__) . '/Reminder.php';
+        require_once dirname(__FILE__).'/Reminder.php';
         return new Reminder($this->kernel, $id);
     }
 
@@ -39,14 +39,14 @@ 
         }
         $db = new DB_Sql;
         $db->query("SELECT id
-            FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND active = 1 AND contact_id=" . $contact_id);
+            FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get("id")." AND active = 1 AND contact_id=".$contact_id);
         return $db->numRows();
     }
 
     function setNewContactId($old_contact_id, $new_contact_id)
     {
         $db = new DB_Sql;
-        $db->query('UPDATE invoice_reminder SET contact_id = ' . $new_contact_id . ' WHERE contact_id = ' . $old_contact_id);
+        $db->query('UPDATE invoice_reminder SET contact_id = '.$new_contact_id.' WHERE contact_id = '.$old_contact_id);
         return true;
     }
 
@@ -157,7 +157,7 @@ 
     function isFilledIn()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM invoice_reminder WHERE intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT id FROM invoice_reminder WHERE intranet_id = ".$this->kernel->intranet->get('id'));
         return $db->numRows();
     }
 

src/Intraface/modules/invoice/PaymentGateway.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     function findById($id)
     {
         $db = new DB_Sql;
-        $db->query('SELECT * FROM invoice_payment WHERE id = ' . $id);
+        $db->query('SELECT * FROM invoice_payment WHERE id = '.$id);
 
         if (!$db->nextRecord()) {
             return false;

src/Intraface/modules/invoice/Depreciation.php

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
         }
 
         $db = new DB_sql;
-        $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());
+        $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());
 
         $this->load();
         return true;

src/Intraface/modules/invoice/CreditNote.php

Spacing +9 added lines, -9 removed lines

@@ -78,12 +78,12 @@ 
             for ($i = 0, $max = count($items); $i < $max; $i++) {
                 $product = new Product($this->kernel, $items[$i]['product_id']);
                 if ($product->get('state_account_id') == 0) {
-                    $this->error->set('Produktet ' . $product->get('name') . ' ved ikke hvor den skal bogf�res');
+                    $this->error->set('Produktet '.$product->get('name').' ved ikke hvor den skal bogf�res');
                 } else {
                     require_once 'Intraface/modules/accounting/Account.php';
                     $account = Account::factory($year, $product->get('state_account_id'));
                     if ($account->get('id') == 0 || $account->get('type') != 'operating') {
-                        $this->error->set('Ugyldig konto for bogf�ring af produktet ' . $product->get('name'));
+                        $this->error->set('Ugyldig konto for bogf�ring af produktet '.$product->get('name'));
                         $return = false;
                     }
                 }
@@ -133,7 +133,7 @@ 
         $voucher->save(array(
             'voucher_number' => $voucher_number,
             'date' => $voucher_date,
-            'text' => 'Kreditnota #' . $this->get('number')
+            'text' => 'Kreditnota #'.$this->get('number')
         ));
 
 
@@ -148,7 +148,7 @@ 
             $credit_account_number = $credit_account->get('number');
             $voucher = Voucher::factory($year, $voucher_number);
 
-            $amount = $item['quantity'] * $item['price']->getAsIso(2);
+            $amount = $item['quantity']*$item['price']->getAsIso(2);
 
             // hvis bel�bet er mindre end nul, skal konti byttes om og bel�bet skal g�res positivt
             if ($amount < 0) {
@@ -165,10 +165,10 @@ 
                 'debet_account_number' => $debet_account_number,
                 'credit_account_number' => $credit_account_number,
                 'vat_off' => 1,
-                'text' => $text.' #' . $this->get('number') . ' - ' . $item['name']
+                'text' => $text.' #'.$this->get('number').' - '.$item['name']
             );
             if ($debet_account->get('vat') == 'out') {
-                $total_with_vat += $item["quantity"] * $item["price"]->getAsIso(2);
+                $total_with_vat += $item["quantity"]*$item["price"]->getAsIso(2);
             }
 
             if (!$voucher->saveInDaybook($input_values, true)) {
@@ -185,11 +185,11 @@ 
                     'voucher_number' => $voucher_number,
                     'reference' => $this->get('number'),
                     'date' => $voucher_date,
-                    'amount' => number_format($total_with_vat * $this->kernel->setting->get('intranet', 'vatpercent') / 100, 2, ",", "."), // opm�rksom p� at vat bliver rigtig defineret
+                    'amount' => number_format($total_with_vat*$this->kernel->setting->get('intranet', 'vatpercent')/100, 2, ",", "."), // opm�rksom p� at vat bliver rigtig defineret
                     'debet_account_number' => $debet_account->get('number'),
                     'credit_account_number' => $credit_account->get('number'),
                     'vat_off' => 1,
-                    'text' => $text.' #' . $this->get('number') . ' - ' . $debet_account->get('name')
+                    'text' => $text.' #'.$this->get('number').' - '.$debet_account->get('name')
             );
             if (!$voucher->saveInDaybook($input_values, true)) {
                 $this->error->merge($voucher->error->getMessage());
@@ -198,7 +198,7 @@ 
 
         require_once 'Intraface/modules/accounting/VoucherFile.php';
         $voucher_file = new VoucherFile($voucher);
-        if (!$voucher_file->save(array('description' => $text.' #' . $this->get('number'), 'belong_to'=>'credit_note','belong_to_id'=>$this->get('id')))) {
+        if (!$voucher_file->save(array('description' => $text.' #'.$this->get('number'), 'belong_to'=>'credit_note', 'belong_to_id'=>$this->get('id')))) {
             $this->error->merge($voucher_file->error->getMessage());
             $this->error->set('Filen blev ikke overflyttet');
         }

src/Intraface/modules/invoice/Pdf/Reminder.php

Spacing +7 added lines, -7 removed lines

@@ -61,7 +61,7 @@ 
             if ($line == "") {
                 $this->doc->setY('-'.$this->doc->get('font_spacing'));
 
-                if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                     $this->doc->nextPage(true);
                 }
             } else {
@@ -71,7 +71,7 @@ 
               
                     $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
 
-                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                         $this->doc->nextPage(true);
                     }
                 }
@@ -82,7 +82,7 @@ 
 
         $this->doc->setY('-20'); // space to product list
 
-        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 3) {
+        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*3) {
             $this->doc->nextPage(true);
         }
 
@@ -96,7 +96,7 @@ 
         $this->doc->addText($apointX["text"], $this->doc->get('y'), $this->doc->get("font_size"), "Beskrivelse");
         $this->doc->addText($apointX["invoice_date"], $this->doc->get('y'), $this->doc->get("font_size"), "Dato");
         $this->doc->addText($apointX["due_date"], $this->doc->get('y'), $this->doc->get("font_size"), "Forfaldsdato");
-        $this->doc->addText($apointX["amount"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Beløb") -3, $this->doc->get('y'), $this->doc->get("font_size"), "Bel�b");
+        $this->doc->addText($apointX["amount"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Beløb") - 3, $this->doc->get('y'), $this->doc->get("font_size"), "Bel�b");
 
         $this->doc->setY('-'.($this->doc->get("font_spacing") - $this->doc->get("font_size")));
 
@@ -129,7 +129,7 @@ 
             $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
             $total += $items[$i]["arrears"];
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
         }
@@ -154,7 +154,7 @@ 
             $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
             $total += $items[$i]["reminder_fee"];
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
         }
@@ -175,7 +175,7 @@ 
             $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
             $total += $reminder->get("reminder_fee");
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
         }

src/Intraface/modules/email/Controller/templates/show.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
     <?php if ($email->get('status') != 'sent') : ?>
     <li><a href="<?php e(url(null, array('edit'))); ?>"><?php e(t('Edit')); ?></a></li>
     <?php endif; ?>
-    <li><a class="pdf" href="<?php e(url(null . '.pdf')); ?>"><?php e(t('Pdf')); ?></a></li>
+    <li><a class="pdf" href="<?php e(url(null.'.pdf')); ?>"><?php e(t('Pdf')); ?></a></li>
 </ul>
 
 <?php if ($email->get('status') == 'sent') : ?>

src/Intraface/modules/email/Controller/Email.php

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
         $value = $email->get();
         $contact = $email->getContact();
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/show');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/show');
         $data = array(
             'contact' => $contact,
             'value' => $value,
@@ -35,18 +35,18 @@ 
         $size = 12; // font size
 
         // udskriv adressehoved
-        $text = $this->getEmail()->getContact()->address->get('name') .
-            "\n" . $this->getEmail()->getContact()->address->get('address') .
-            "\n" . $this->getEmail()->getContact()->address->get('postcode') .
-            "  " . $this->getEmail()->getContact()->address->get('city') . "\n\n\n";
+        $text = $this->getEmail()->getContact()->address->get('name').
+            "\n".$this->getEmail()->getContact()->address->get('address').
+            "\n".$this->getEmail()->getContact()->address->get('postcode').
+            "  ".$this->getEmail()->getContact()->address->get('city')."\n\n\n";
 
         $pdf->ezText($text, $size);
 
         // uskriv subject
-        $pdf->ezText($this->getEmail()->get('subject') . "\n\n", $size);
+        $pdf->ezText($this->getEmail()->get('subject')."\n\n", $size);
 
         // udskriv body
-        $pdf->ezText($this->getEmail()->get('body') . "\n", $size);
+        $pdf->ezText($this->getEmail()->get('body')."\n", $size);
 
         // udskriv greeting
 
@@ -104,7 +104,7 @@ 
         $contact = $email->getContact();
         $redirect = Intraface_Redirect::factory($this->getKernel(), 'receive');
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/edit');
         $data = array(
             'contact' => $contact,
             'value' => $value,