intraface / intraface.dk

src/Intraface/modules/cms/PageGateway.php

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
         if ($this->dbquery) {
             return $this->dbquery;
         }
-        return ($this->dbquery = new Intraface_DBQuery($this->kernel, 'cms_page', 'cms_page.intranet_id = '.$this->kernel->intranet->get('id').' AND cms_page.active = 1 AND site_id = ' . $this->cmssite->get('id')));
+        return ($this->dbquery = new Intraface_DBQuery($this->kernel, 'cms_page', 'cms_page.intranet_id = '.$this->kernel->intranet->get('id').' AND cms_page.active = 1 AND site_id = '.$this->cmssite->get('id')));
     }
 
     function setDBQuery($dbquery)
@@ -50,7 +50,7 @@ 
 
     function findById($id)
     {
-        $this->db->query("SELECT id, site_id FROM cms_page WHERE id = " . (int)$id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $this->db->query("SELECT id, site_id FROM cms_page WHERE id = ".(int)$id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         if (!$this->db->nextRecord()) {
             return false;
         }
@@ -64,13 +64,13 @@ 
         $identifier = strip_tags($identifier);
 
         if (!empty($identifier)) {
-            $this->db->query("SELECT site_id, id FROM cms_page WHERE identifier = '" . $identifier . "' AND intranet_id = " . $this->kernel->intranet->get('id') . " AND active = 1 AND site_id = " . $site_id);
+            $this->db->query("SELECT site_id, id FROM cms_page WHERE identifier = '".$identifier."' AND intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 AND site_id = ".$site_id);
         } else {
             // @todo choose the default page - vi skal lige have noget med publish og expire date her ogs�
-            $this->db->query("SELECT site_id, id FROM cms_page WHERE intranet_id = " . $this->kernel->intranet->get('id') . " AND active = 1 AND status_key = 1 AND site_id = " . $site_id . " ORDER BY position ASC LIMIT 1");
+            $this->db->query("SELECT site_id, id FROM cms_page WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 AND status_key = 1 AND site_id = ".$site_id." ORDER BY position ASC LIMIT 1");
         }
         if (!$this->db->nextRecord()) {
-            $this->db->query("SELECT site_id, id FROM cms_page WHERE id = " . (int)$identifier . " AND intranet_id = " . $this->kernel->intranet->get('id') . " AND active = 1 AND site_id = " . $site_id);
+            $this->db->query("SELECT site_id, id FROM cms_page WHERE id = ".(int)$identifier." AND intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 AND site_id = ".$site_id);
             if (!$this->db->nextRecord()) {
                 return false;
             }
@@ -211,8 +211,8 @@ 
                 // til google sitemaps
                 // sp�rgsm�let er om vi ikke skal starte et objekt op for hver pages
 
-                $pages[$i]['url'] = $this->cmssite->get('url') . $pages[$i]['identifier'] . '/';
-                $pages[$i]['url_self'] = $pages[$i]['identifier'] . '/';
+                $pages[$i]['url'] = $this->cmssite->get('url').$pages[$i]['identifier'].'/';
+                $pages[$i]['url_self'] = $pages[$i]['identifier'].'/';
                 $pages[$i]['changefreq'] = 'weekly';
                 $pages[$i]['priority'] = 0.5;
 

src/Intraface/modules/cms/element/Map.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
                 $api = $this->get('api_key');
             }
 
-                $this->value['map']  = '<script type="text/javascript" src="http://api.maps.yahoo.com/ajaxymap?'.htmlentities('v=2.0&appid=' . $api) .'"></script>';
+                $this->value['map'] = '<script type="text/javascript" src="http://api.maps.yahoo.com/ajaxymap?'.htmlentities('v=2.0&appid='.$api).'"></script>';
                 /* flash version
                 $this->value['map'] .= '<script type="text/javascript">';
                 $this->value['map'] .= '    var latlon = new LatLon(' .$a['ResultSet']['Result']['Latitude'] . ', '. $a['ResultSet']['Result']['Longitude'].');';
@@ -51,7 +51,7 @@ 
                 $this->value['map'] .= '		var words = "title";';
                 $this->value['map'] .= '		marker.openSmartWindow(words);';
                 $this->value['map'] .= '	} ';
-                $this->value['map'] .= '	var latlon = new YGeoPoint(' .$this->get('latitude') . ', '. $this->get('longitude').');';
+                $this->value['map'] .= '	var latlon = new YGeoPoint('.$this->get('latitude').', '.$this->get('longitude').');';
                 $this->value['map'] .= '	var mymap = new  YMap(document.getElementById("mapContainer"));';
                 $this->value['map'] .= '	var marker = new YMarker(latlon);';
                 $this->value['map'] .= '	marker.addLabel("<b>A</b>"); ';
@@ -84,7 +84,7 @@ 
                 $this->value['map'] .= '    }';
                 $this->value['map'] .= '}';
                 $this->value['map'] .= 'load();';
-                $this->value['map'] .= '    var latlon = new YGeoPoint(' .$this->get('latitude') . ', '. $this->get('longitude').');';
+                $this->value['map'] .= '    var latlon = new YGeoPoint('.$this->get('latitude').', '.$this->get('longitude').');';
                 $this->value['map'] .= '    var mymap = new  YMap(document.getElementById("mapContainer"));';
                 $this->value['map'] .= '    var marker = new YMarker(latlon);';
                 $this->value['map'] .= '    marker.addLabel("<b>A</b>"); ';

src/Intraface/modules/cms/element/Delicious.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
         $url = parse_url($var['url']);
 
         // cleans up url
-        $var['url'] = $url['scheme'] . '://' . $url['host'] . $url['path'];
+        $var['url'] = $url['scheme'].'://'.$url['host'].$url['path'];
 
         $this->parameter->save('url', $var['url']);
 

src/Intraface/modules/cms/section/Mixed.php

Spacing +2 added lines, -2 removed lines

@@ -52,8 +52,8 @@
         $db = new DB_Sql;
         $db->query("SELECT id FROM cms_element
             WHERE intranet_id = ".$this->kernel->intranet->get('id')."
-                AND section_id = " . $this->id . "
-                AND active = 1 " . $sql_expire . $sql_publish . "
+                AND section_id = " . $this->id."
+                AND active = 1 " . $sql_expire.$sql_publish."
             ORDER BY position ASC");
         $i = 0;
 

src/Intraface/modules/invoice/Payment.php

Spacing +7 added lines, -7 removed lines

@@ -48,11 +48,11 @@ 
 
     public function load()
     {
-        $result = $this->db->query('SELECT id, amount, type, description, payment_date, payment_for_id, DATE_FORMAT(payment_date, "%d-%m-%Y") AS dk_payment_date, date_stated, voucher_id FROM invoice_payment ' .
-            'WHERE intranet_id = '.$this->kernel->intranet->get('id').' ' .
-                'AND payment_for = '.$this->payment_for_type_id.' ' .
-                'AND payment_for_id = '.$this->payment_for_id.' ' .
-                'AND type IN ('.implode(',', array_keys($this->getTypes())).')' .
+        $result = $this->db->query('SELECT id, amount, type, description, payment_date, payment_for_id, DATE_FORMAT(payment_date, "%d-%m-%Y") AS dk_payment_date, date_stated, voucher_id FROM invoice_payment '.
+            'WHERE intranet_id = '.$this->kernel->intranet->get('id').' '.
+                'AND payment_for = '.$this->payment_for_type_id.' '.
+                'AND payment_for_id = '.$this->payment_for_id.' '.
+                'AND type IN ('.implode(',', array_keys($this->getTypes())).')'.
                 'AND id = '.$this->id);
 
         if (PEAR::isError($result)) {
@@ -428,7 +428,7 @@ 
 
         $types = $this->getPaymentForTypes();
         // translation is needed!
-        $text = $translation->get('Payment') . ' ' . $this->get('description') . ' ('.$translation->get($types[$this->payment_for_type_id]).' #'.$this->payment_for->get('number') . ')';
+        $text = $translation->get('Payment').' '.$this->get('description').' ('.$translation->get($types[$this->payment_for_type_id]).' #'.$this->payment_for->get('number').')';
 
         $input_values = array(
             'voucher_number' => $voucher_number,
@@ -445,7 +445,7 @@ 
         }
 
         $db = new DB_sql;
-        $db->query("UPDATE invoice_payment SET date_stated = NOW(), voucher_id = ".$voucher->get('id') . " WHERE intranet_id = " . $this->kernel->intranet->getId() . ' AND id = ' . $this->id);
+        $db->query("UPDATE invoice_payment SET date_stated = NOW(), voucher_id = ".$voucher->get('id')." WHERE intranet_id = ".$this->kernel->intranet->getId().' AND id = '.$this->id);
 
         $this->load();
         return true;

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;