intraface / intraface.dk

src/Intraface/Filehandler/Controller/Batchedit.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
             'kernel' => $kernel,
             'gateway' => $gateway);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/../templates/batchedit');
+        $tpl = $this->template->create(dirname(__FILE__).'/../templates/batchedit');
         return $tpl->render($this, $data);
     }
 

src/Intraface/Filehandler/Controller/Sizes.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
             'instance_manager' => $instance_manager,
             'instances' => $instances);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/../templates/sizes');
+        $tpl = $this->template->create(dirname(__FILE__).'/../templates/sizes');
         return $tpl->render($this, $data);
     }
 
@@ -47,7 +47,7 @@ 
             'instance_manager' => $instance_manager,
             'value' => $value);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/../templates/sizes-edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/../templates/sizes-edit');
         return $tpl->render($this, $data);
     }
 

src/Intraface/Filehandler/Controller/Size.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
             'instance_manager' => $instance_manager,
             'value' => $value);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/../templates/sizes-edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/../templates/sizes-edit');
         return $tpl->render($this, $data);
     }
 

src/Intraface/shared/email/Email.php

Spacing +13 added lines, -13 removed lines

@@ -81,7 +81,7 @@ 
 
         $db = new DB_Sql;
         $db->query('SET NAMES utf8'); /* To be removed when everything is in utf-8 */
-        $sql = "SELECT id, email.date_sent, DATE_FORMAT(date_sent, '%d-%m-%Y') as date_sent_dk, subject, from_name, from_email, user_id, body, status, contact_id, contact_person_id, type_id, belong_to_id, status, bcc_to_user FROM email WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = " . $this->id;
+        $sql = "SELECT id, email.date_sent, DATE_FORMAT(date_sent, '%d-%m-%Y') as date_sent_dk, subject, from_name, from_email, user_id, body, status, contact_id, contact_person_id, type_id, belong_to_id, status, bcc_to_user FROM email WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = ".$this->id;
         $db->query($sql);
         if (!$db->nextRecord()) {
             return false;
@@ -174,12 +174,12 @@ 
         if ($this->id == 0) {
             $sql_type = "INSERT INTO ";
             $sql_end = ", date_created = NOW(),
-                belong_to_id = ".(int)$var['belong_to'] . ",
-                type_id = ".(int)$var['type_id'] . ",
+                belong_to_id = ".(int)$var['belong_to'].",
+                type_id = ".(int)$var['type_id'].",
                 contact_id=".$var['contact_id'];
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         }
 
         if (!empty($var['date_deadline'])) {
@@ -191,7 +191,7 @@ 
         // gemme userid hvis vi er inde i systemet
         if (is_object($this->kernel->user) and $this->kernel->user->get('id') > 0) {
             //$db->query("UPDATE email SET user_id = ".$this->kernel->user->get('id')." WHERE id = " . $this->id);
-            $sql_extra = ', user_id = ' . $db->quote($this->kernel->user->get('id'), 'integer');
+            $sql_extra = ', user_id = '.$db->quote($this->kernel->user->get('id'), 'integer');
         }
 
         if (!isset($var['contact_person_id'])) {
@@ -203,11 +203,11 @@ 
         }
 
         // status 1 = draft
-        $sql = $sql_type . " email SET
+        $sql = $sql_type." email SET
             contact_person_id = ".(int)$var['contact_person_id'].",
             bcc_to_user = ".(int)$var['bcc_to_user'].",
             date_updated = NOW(),
-            intranet_id = " . $this->kernel->intranet->get('id') . ",
+            intranet_id = " . $this->kernel->intranet->get('id').",
             subject = '".$var['subject']."',
             body = '".$var['body']."',
             date_deadline = ".$date_deadline.",
@@ -245,7 +245,7 @@ 
     function saveErrorMsg($error)
     {
         $db = new DB_Sql;
-        $db->query("UPDATE email SET error_msg = '".$error."' WHERE id = " . $this->id);
+        $db->query("UPDATE email SET error_msg = '".$error."' WHERE id = ".$this->id);
         return true;
     }
 
@@ -260,7 +260,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE email SET status = 3, date_sent = NOW() WHERE id = " . $this->id);
+        $db->query("UPDATE email SET status = 3, date_sent = NOW() WHERE id = ".$this->id);
         return true;
     }
 
@@ -291,7 +291,7 @@ 
 
         $db = new DB_Sql;
         // Putter e-mailen i outboxen (status = 2)
-        $db->query("UPDATE email SET status = 2 WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = " . $this->id);
+        $db->query("UPDATE email SET status = 2 WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = ".$this->id);
         return true;
     }
 
@@ -299,7 +299,7 @@ 
     {
         $contact = $this->getContact();
         if ($this->get('contact_id') == 0 or !is_object($contact)) {
-            $this->error->set('Der kunne ikke sendes e-mail til email #' . $this->get('id') . ' fordi der ikke var nogen kunde sat');
+            $this->error->set('Der kunne ikke sendes e-mail til email #'.$this->get('id').' fordi der ikke var nogen kunde sat');
             return false;
         }
 
@@ -383,7 +383,7 @@ 
     {
         $db = new DB_Sql;
         $db->query("SELECT file_id, filename FROM email_attachment
-            WHERE intranet_id = " .$this->kernel->intranet->get('id') . " AND email_id = " . $this->id);
+            WHERE intranet_id = " .$this->kernel->intranet->get('id')." AND email_id = ".$this->id);
         $file = array();
         $i = 0;
         while ($db->nextRecord()) {
@@ -414,7 +414,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("DELETE FROM email WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("DELETE FROM email WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         return true;
     }
 

src/Intraface/XMLRPC/Shop/Server0100.php

Spacing +14 added lines, -14 removed lines

@@ -72,40 +72,40 @@ 
         }
 
         // sublevel has to be used so other searches are not overwritten
-        $product->getDBQuery()->storeResult('use_stored', 'webshop_' . $area . '_' .  md5($this->credentials['session_id']), 'sublevel');
+        $product->getDBQuery()->storeResult('use_stored', 'webshop_'.$area.'_'.md5($this->credentials['session_id']), 'sublevel');
         $debug2 = serialize($mixed);
         if (isset($mixed['offset']) and is_numeric($mixed['offset']) and $mixed['offset'] > 0) {
             $product->getDBQuery()->useStored(true);
             $product->getDBQuery()->setPagingOffset((int)$mixed['offset']);
-            $debug2 .= 'offset ' . $mixed['offset'];
+            $debug2 .= 'offset '.$mixed['offset'];
         } elseif (isset($mixed['use_stored']) and array_key_exists('use_stored', $mixed) and $mixed['use_stored'] == 'true') {
             $product->getDBQuery()->useStored(true);
             $debug2 .= 'use_stored true';
         } else {
             if (array_key_exists('search', $mixed) and !empty($mixed['search'])) {
                 $product->getDBQuery()->setFilter('search', $mixed['search']);
-                $debug2 .= 'search ' . $mixed['search'];
+                $debug2 .= 'search '.$mixed['search'];
             }
 
             if (array_key_exists('keywords', $mixed) and !empty($mixed['keywords'])) {
                 $product->getDBQuery()->setFilter('keywords', $mixed['keywords']);
-                $debug2 .= 'keyword ' . $mixed['keywords'];
+                $debug2 .= 'keyword '.$mixed['keywords'];
             }
 
             if (array_key_exists('category', $mixed) and !empty($mixed['category'])) {
                 $product->getDBQuery()->setFilter('shop_id', $shop_id);
                 $product->getDBQuery()->setFilter('category', $mixed['category']);
-                $debug2 .= 'category ' . $mixed['category'];
+                $debug2 .= 'category '.$mixed['category'];
             }
 
             if (isset($mixed['ids']) and array_key_exists('ids', $mixed) and is_array($mixed['ids'])) {
                 $product->getDBQuery()->setFilter('ids', $mixed['ids']);
-                $debug2 .= 'ids ' . implode(', ', $mixed['ids']);
+                $debug2 .= 'ids '.implode(', ', $mixed['ids']);
             }
 
             if (array_key_exists('sorting', $mixed) and !empty($mixed['sorting'])) {
                 $product->getDBQuery()->setFilter('sorting', $mixed['sorting']);
-                $debug2 .= 'sorting ' . $mixed['sorting'];
+                $debug2 .= 'sorting '.$mixed['sorting'];
             }
         }
 
@@ -449,7 +449,7 @@ 
 
         if (PEAR::isError($db)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException($db->getMessage() . $db->getUserInfo(), -1);
+            throw new XML_RPC2_FaultException($db->getMessage().$db->getUserInfo(), -1);
         }
 
         $featured = new Intraface_modules_shop_FeaturedProducts($this->kernel->intranet, $this->webshop->getShop(), $db);
@@ -716,7 +716,7 @@ 
 
         if (!$order_id = $this->webshop->placeOrder($values)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('order could not be placed. It returned the following error: ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('order could not be placed. It returned the following error: '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
         }
 
         return $this->prepareResponseData($this->webshop->getOrderIdentifierKey());
@@ -746,7 +746,7 @@ 
 
         if (!$this->webshop->getBasket()->saveAddress($values)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
         }
 
         return $this->prepareResponseData(true);
@@ -787,7 +787,7 @@ 
         $customer_coupon = $this->processRequestData($customer_coupon);
         if (!$this->webshop->getBasket()->saveCustomerCoupon($customer_coupon)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
         }
 
         return $this->prepareResponseData(true);
@@ -828,7 +828,7 @@ 
         $customer_ean = $this->processRequestData($customer_ean);
         if (!$this->webshop->getBasket()->saveCustomerEan($customer_ean)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('ean could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('ean could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
         }
 
         return $this->prepareResponseData(true);
@@ -870,7 +870,7 @@ 
         $customer_comment = $this->processRequestData($customer_comment);
         if (!$this->webshop->getBasket()->saveCustomerComment($customer_comment)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
         }
 
         return $this->prepareResponseData(true);
@@ -929,7 +929,7 @@ 
         $payment_method = $this->processRequestData($payment_method);
         if (!$this->webshop->getBasket()->savePaymentMethod($payment_method)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
         }
 
         return $this->prepareResponseData(true);

src/Intraface/XMLRPC/Server0100.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
         if (count($credentials) != 2) { // -4
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('wrong argument count in $credentials - got ' . count($credentials) . ' arguments - need 2', -4);
+            throw new XML_RPC2_FaultException('wrong argument count in $credentials - got '.count($credentials).' arguments - need 2', -4);
         }
         if (empty($credentials['private_key'])) { // -5
             require_once 'XML/RPC2/Exception.php';

src/Intraface/XMLRPC/Contact/Server.php

Spacing +1 added lines, -1 removed lines

@@ -269,7 +269,7 @@
     {
         if (count($credentials) != 2) { // -4
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('wrong argument count in $credentials - got ' . count($credentials) . ' arguments - need 2', -4);
+            throw new XML_RPC2_FaultException('wrong argument count in $credentials - got '.count($credentials).' arguments - need 2', -4);
         }
         if (empty($credentials['private_key'])) { // -5
             require_once 'XML/RPC2/Exception.php';

src/Intraface/XMLRPC/Server.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
         if (count($credentials) != 2) { // -4
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('wrong argument count in $credentials - got ' . count($credentials) . ' arguments - need 2', -4);
+            throw new XML_RPC2_FaultException('wrong argument count in $credentials - got '.count($credentials).' arguments - need 2', -4);
         }
         if (empty($credentials['private_key'])) { // -5
             require_once 'XML/RPC2/Exception.php';

src/Intraface/User.php

Spacing +8 added lines, -8 removed lines

@@ -85,7 +85,7 @@ 
         $this->error       = $this->getError();
 
         if (PEAR::isError($this->db)) {
-            throw new Exception($this->db->getMessage() . $this->db->getUserInfo());
+            throw new Exception($this->db->getMessage().$this->db->getUserInfo());
         }
 
         if ($this->id > 0) {
@@ -108,7 +108,7 @@ 
      */
     protected function load()
     {
-        $result = $this->db->query("SELECT id, email, disabled FROM user WHERE id = " . $this->db->quote($this->id, 'integer'));
+        $result = $this->db->query("SELECT id, email, disabled FROM user WHERE id = ".$this->db->quote($this->id, 'integer'));
 
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
@@ -200,7 +200,7 @@ 
         if (!empty($this->modules[$module])) {
             return $module_id = $this->modules[$module];
         } else {
-            throw new Exception('user says unknown module ' . $module);
+            throw new Exception('user says unknown module '.$module);
         }
     }
 
@@ -260,7 +260,7 @@ 
      */
     public function hasModuleAccess($module, $intranet_id = 0)
     {
-        $filename = PATH_INCLUDE_MODULE . $module . '/Main' . ucfirst($module) . '.php';
+        $filename = PATH_INCLUDE_MODULE.$module.'/Main'.ucfirst($module).'.php';
         if (file_exists($filename)) {
             require_once $filename;
             $module_class = 'Main'.ucfirst($module);
@@ -465,7 +465,7 @@ 
     {
         $id = intval($id);
         if ($this->hasIntranetAccess($id)) {
-            $this->db->exec("UPDATE user SET active_intranet_id = ". $this->db->quote($id, 'integer')." WHERE id = ". $this->db->quote($this->get('id'), 'integer'));
+            $this->db->exec("UPDATE user SET active_intranet_id = ".$this->db->quote($id, 'integer')." WHERE id = ".$this->db->quote($this->get('id'), 'integer'));
             return $id;
         }
         return false;
@@ -568,7 +568,7 @@ 
         $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
         $new_password = Intraface_Kernel::randomKey(8);
 
-        $db->exec("UPDATE user SET password = '".md5($new_password)."' WHERE id =" . $row['id']);
+        $db->exec("UPDATE user SET password = '".md5($new_password)."' WHERE id =".$row['id']);
 
         return $new_password;
     }
@@ -579,7 +579,7 @@ 
             return false;
         }
 
-        $result = $this->db->query("SELECT * FROM user WHERE password = '".safeToDb(md5($old_password))."' AND id = " . $this->get('id'));
+        $result = $this->db->query("SELECT * FROM user WHERE password = '".safeToDb(md5($old_password))."' AND id = ".$this->get('id'));
         if ($result->numRows() < 1) {
             $this->error->set('error in old password');
         }
@@ -595,7 +595,7 @@ 
             return false;
         }
 
-        $this->db->query("UPDATE user SET password = '".safeToDb(md5($new_password))."' WHERE id = " . $this->get('id'));
+        $this->db->query("UPDATE user SET password = '".safeToDb(md5($new_password))."' WHERE id = ".$this->get('id'));
 
         return true;
     }