intraface / intraface.dk

src/Intraface/modules/controlpanel/Controller/UserPreferences.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
     function renderHtml()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/userpreferences');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/userpreferences');
         return $smarty->render($this);
     }
 

src/Intraface/modules/controlpanel/Controller/Index.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
     function renderHtml()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
         return $smarty->render($this);
     }
 

src/Intraface/modules/stock/Controller/Index.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
     function renderHtml()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
         return $smarty->render($this);
     }
 

src/Intraface/modules/administration/include_frontpage.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 if (!$intranet->isFilledIn()) :
     $_advice[] = array(
         'msg' => 'all information about the intranet has not been filled in',
-        'link' => $administration_module->getPath() . 'intranet?edit',
+        'link' => $administration_module->getPath().'intranet?edit',
         'module' => $administration_module->getName()
     );
 endif;
@@ -18,7 +18,7 @@ 
 if (!$intranet->get('identifier')) :
     $_attention_needed[] = array(
         'msg' => 'identifier for the intranet is missing',
-        'link' => $administration_module->getPath() . 'intranet?edit',
+        'link' => $administration_module->getPath().'intranet?edit',
         'module' => $administration_module->getName()
     );
 endif;

src/Intraface/modules/administration/Controller/templates/intranet.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 } ?>
             <?php if (!empty($address['cvr']) and strlen($address['cvr']) == 8) : ?>
                 (<a href="http://www.cvr.dk/Site/Forms/PublicService/DisplayCompany.aspx?cvrnr=<?php e($address['cvr']); ?>">se opslaget på virk.dk</a>)
-            <?php endif;?>
+            <?php endif; ?>
         </td>
     </tr>
     <tr>

src/Intraface/modules/administration/Controller/Intranet.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
 
     function renderHtml()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/intranet');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/intranet');
         return $smarty->render($this);
     }
 
@@ -33,7 +33,7 @@ 
                     $values['pdf_header_file_id'] = $filehandler->get('id');
                     $intranet->update($values);
                 } else {
-                    $filehandler->error->set('Header should be a .jpg image - got '. $filehandler->get('file_type'));
+                    $filehandler->error->set('Header should be a .jpg image - got '.$filehandler->get('file_type'));
                 }
             }
         }
@@ -41,7 +41,7 @@ 
         $values = $intranet->get();
         $address = $intranet->address->get();
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/intranet-edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/intranet-edit');
         return $smarty->render($this, array('intranet' => $intranet, 'kernel' => $this->getKernel()));
     }
 
@@ -70,7 +70,7 @@ 
             if ($type['mime_type'] == 'image/jpeg' || $type['mime_type'] == 'image/pjpeg') {
                 $values['pdf_header_file_id'] = $id;
             } else {
-                $intranet->error->set('Header should be a .jpg image - got ' . $type['mime_type']);
+                $intranet->error->set('Header should be a .jpg image - got '.$type['mime_type']);
                 $filehandler->delete();
             }
         }

src/Intraface/modules/administration/Controller/Index.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
     function renderHtml()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
         return $smarty->render($this);
     }
 

src/Intraface/modules/procurement/ProcurementGateway.php

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
     function setNewContactId($old_id, $new_id)
     {
         $db = MDB2::singleton();
-        $db->query('UPDATE procurement SET contact_id = ' . $new_id . ' WHERE contact_id = ' . $old_id);
+        $db->query('UPDATE procurement SET contact_id = '.$new_id.' WHERE contact_id = '.$old_id);
     }
 
     function find()
@@ -158,14 +158,14 @@ 
     function any()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM procurement WHERE intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT id FROM procurement WHERE intranet_id = ".$this->kernel->intranet->get('id'));
         return $db->numRows();
     }
 
     function anyByContact($contact_id)
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM procurement WHERE intranet_id = " . $this->kernel->intranet->get('id')." AND contact_id = ".$contact_id." AND active = 1");
+        $db->query("SELECT id FROM procurement WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND contact_id = ".$contact_id." AND active = 1");
         return $db->numRows();
     }
 
@@ -214,7 +214,7 @@ 
     {
         $sql = "SELECT id
                 FROM procurement
-                WHERE intranet_id = " . $this->kernel->intranet->get("id") . "
+                WHERE intranet_id = " . $this->kernel->intranet->get("id")."
                     AND contact_id = ".(int)$contact_id."
                     AND active = 1";
 

src/Intraface/modules/procurement/Procurement.php

Spacing +17 added lines, -17 removed lines

@@ -414,7 +414,7 @@ 
         }
 
 
-        $text = $translation->get('procurement').'# ' . $this->get('number') . ': ' . $this->get('description');
+        $text = $translation->get('procurement').'# '.$this->get('number').': '.$this->get('description');
         require_once 'Intraface/modules/accounting/Voucher.php';
         $voucher = Voucher::factory($year, $voucher_number);
         $voucher->save(array(
@@ -433,7 +433,7 @@ 
             $credit_total += $amount;
 
             if (!empty($line['text'])) {
-                $line_text = $text. ' - ' . $line['text'];
+                $line_text = $text.' - '.$line['text'];
             } else {
                 $line_text = $text;
             }
@@ -487,7 +487,7 @@ 
             $voucher_date->convert2db();
         }
 
-        $db->query("UPDATE procurement SET date_stated = '".$voucher_date->get()."', voucher_id = ".intval($voucher_number)." WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("UPDATE procurement SET date_stated = '".$voucher_date->get()."', voucher_id = ".intval($voucher_number)." WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         return 1;
     }
 
@@ -570,15 +570,15 @@ 
         $total = 0;
         $vat = 0;
         foreach ($debet_accounts as $key => $debet_account) {
-            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', 'greater_than_zero')) {
+            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje '.($key + 1).' "'.$debet_account['text'].'"', 'greater_than_zero')) {
                 $amount = new Intraface_Amount($debet_account['amount']);
                 $amount->convert2db();
                 $total += $amount->get();
 
-                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', '', 'allow_empty');
+                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje '.($key + 1).' "'.$debet_account['text'].'"', '', 'allow_empty');
 
                 if (empty($debet_account['state_account_id'])) {
-                    $this->error->set('Linje ' . ($key + 1) . ' "' . $debet_account['text'] . '" ved ikke hvor den skal bogføres');
+                    $this->error->set('Linje '.($key + 1).' "'.$debet_account['text'].'" ved ikke hvor den skal bogføres');
                 } else {
                     require_once 'Intraface/modules/accounting/Account.php';
                     $account = Account::factory($year, $debet_account['state_account_id']);
@@ -586,9 +586,9 @@ 
                     // @todo check this. I changed it to make sure that we are able to state varekøb til videresalg
                     // || $account->get('type') != 'operating'
                     if ($account->get('id') == 0) {
-                        $this->error->set('Ugyldig konto for bogføring af linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"');
+                        $this->error->set('Ugyldig konto for bogføring af linje '.($key + 1).' "'.$debet_account['text'].'"');
                     } elseif ($account->get('vat') == 'in') {
-                        $vat += $amount->get() / 100 * $account->get('vat_percent');
+                        $vat += $amount->get()/100*$account->get('vat_percent');
                     }
                 }
             }
@@ -605,8 +605,8 @@ 
             }
 
             if (round($vat, 2) != $this->get('vat')) {
-                $expected = number_format($this->get('vat') * 4, 2, ',', '.');
-                $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede '.number_format($vat, 2, ',', '.').' i moms og det samlede beløb burde have været ' . $expected . '). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
+                $expected = number_format($this->get('vat')*4, 2, ',', '.');
+                $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede '.number_format($vat, 2, ',', '.').' i moms og det samlede beløb burde have været '.$expected.'). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
             }
         }
 
@@ -635,15 +635,15 @@ 
         $total = 0;
         $vat = 0;
         foreach ($debet_accounts as $key => $debet_account) {
-            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', 'greater_than_zero')) {
+            if ($validator->isNumeric($debet_account['amount'], 'Ugyldig beløb i linje '.($key + 1).' "'.$debet_account['text'].'"', 'greater_than_zero')) {
                 $amount = new Intraface_Amount($debet_account['amount']);
                 $amount->convert2db();
                 $total += $amount->get();
 
-                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"', '', 'allow_empty');
+                $validator->isString($debet_account['text'], 'Ugyldig tekst i linje '.($key + 1).' "'.$debet_account['text'].'"', '', 'allow_empty');
 
                 if (empty($debet_account['state_account_id'])) {
-                    $this->error->set('Linje ' . ($key + 1) . ' "' . $debet_account['text'] . '" ved ikke hvor den skal bogføres');
+                    $this->error->set('Linje '.($key + 1).' "'.$debet_account['text'].'" ved ikke hvor den skal bogføres');
                 } else {
                     require_once 'Intraface/modules/accounting/Account.php';
                     $account = Account::factory($year, $debet_account['state_account_id']);
@@ -651,9 +651,9 @@ 
                     // @todo check this. I changed it to make sure that we are able to state varekøb til videresalg
                     // || $account->get('type') != 'operating'
                     if ($account->get('id') == 0) {
-                        $this->error->set('Ugyldig konto for bogføring af linje ' . ($key + 1) . ' "' . $debet_account['text'] . '"');
+                        $this->error->set('Ugyldig konto for bogføring af linje '.($key + 1).' "'.$debet_account['text'].'"');
                     } elseif ($account->get('vat') == 'in') {
-                        $vat += $amount->get() / 100 * $account->get('vat_percent');
+                        $vat += $amount->get()/100*$account->get('vat_percent');
                     }
                 }
             }
@@ -670,8 +670,8 @@ 
 
         if (round($vat, 2) != $this->get('vat')) {
             $expected_vat = number_format($vat, 2, ',', '.');
-            $expected_value = number_format($this->get('vat') * 4, 2, ',', '.');
-            $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede ' . $expected_vat . ' i moms og det samlede beløb burde have været ' . $expected_value . '). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
+            $expected_value = number_format($this->get('vat')*4, 2, ',', '.');
+            $this->error->set('Momsen af de beløb du bogfører på konti med moms stemmer ikke overens med momsen på det samlede indkøb (vi forventede '.$expected_vat.' i moms og det samlede beløb burde have været '.$expected_value.'). Har du fået alle varer med? Har du husket at skrive beløbet uden moms for varerne?');
         }
         
         if ($this->error->isError()) {