intraface / intraface.dk

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

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     {
         $this->getKernel()->module('controlpanel');
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
         return $smarty->render($this);
     }
 

src/Intraface/modules/webshop/Basket.php

Spacing +44 added lines, -44 removed lines

@@ -56,13 +56,13 @@ 
         }
 
         $this->webshop = $webshop;
-        $this->sql_extra = " session_id = '" . safeToDb($session_id) . "'";
+        $this->sql_extra = " session_id = '".safeToDb($session_id)."'";
 
         // rydder op i databasen efter fx to timer
         $clean_up_after = 2; // timer
 
         $db = new DB_Sql;
-        $db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL " . $clean_up_after . " HOUR) < NOW()");
+        $db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL ".$clean_up_after." HOUR) < NOW()");
     }
 
     /**
@@ -128,27 +128,27 @@ 
         }
 
         $db->query("SELECT id, quantity FROM basket WHERE product_id = $product_id
-                AND product_detail_id = " . $product_detail_id . "
-                AND basketevaluation_product = " . $basketevaluation . "
-                AND " . $this->sql_extra. "
+                AND product_detail_id = ".$product_detail_id."
+                AND basketevaluation_product = " . $basketevaluation."
+                AND " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
 
         if ($db->nextRecord()) {
             if ($quantity == 0) {
                 $db->query("DELETE FROM basket
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
-                        AND " . $this->sql_extra . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
+                        AND " . $this->sql_extra."
                         AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
             } else {
                 $db->query("UPDATE basket SET
                     quantity = $quantity,
                     date_changed = NOW(),
                     text = '".$text."'
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
 
-                        AND " . $this->sql_extra . "
+                        AND " . $this->sql_extra."
                         AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
             }
             return true;
@@ -158,10 +158,10 @@ 
                         quantity = $quantity,
                         date_changed = NOW(),
                         text = '".$text."',
-                        basketevaluation_product = " . $basketevaluation . ",
+                        basketevaluation_product = " . $basketevaluation.",
                         product_id = $product_id,
                         product_detail_id = ".$product_detail_id.",
-                        intranet_id = " . $this->webshop->kernel->intranet->get('id') . ",
+                        intranet_id = " . $this->webshop->kernel->intranet->get('id').",
                         " . $this->sql_extra);
             return true;
         }
@@ -186,10 +186,10 @@ 
         settype($input['email'], 'string');
         settype($input['phone'], 'string');
 
-        $sql = "name = \"".safeToDb($input['name'])."\"," .
-            "contactperson = \"".safeToDb($input['contactperson'])."\", " .
-            "address = \"".safeToDb($input['address'])."\", " .
-            "postcode = \"".safeToDb($input['postcode'])."\", " .
+        $sql = "name = \"".safeToDb($input['name'])."\",".
+            "contactperson = \"".safeToDb($input['contactperson'])."\", ".
+            "address = \"".safeToDb($input['address'])."\", ".
+            "postcode = \"".safeToDb($input['postcode'])."\", ".
             "city = \"".safeToDb($input['city'])."\", ".
             "country = \"".safeToDb($input['country'])."\", ".
             "cvr = \"".safeToDb($input['cvr'])."\", ".
@@ -252,13 +252,13 @@ 
     {
 
         $db = new DB_Sql;
-        $db->query("SELECT id FROM basket_details WHERE " . $this->sql_extra. "
+        $db->query("SELECT id FROM basket_details WHERE ".$this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if ($db->nextRecord()) {
             $db->query("UPDATE basket_details SET ".$sql.",
                 date_changed = NOW()
-                WHERE id = ".$db->f('id') . "
-                    AND " . $this->sql_extra . "
+                WHERE id = ".$db->f('id')."
+                    AND " . $this->sql_extra."
                     AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
             return true;
         } else {
@@ -266,7 +266,7 @@ 
                     SET ".$sql.",
                         date_changed = NOW(),
                            date_created = NOW(),
-                        intranet_id = " . $this->webshop->kernel->intranet->get('id') . ",
+                        intranet_id = " . $this->webshop->kernel->intranet->get('id').",
                         " . $this->sql_extra);
 
             return true;
@@ -285,7 +285,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -314,7 +314,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_coupon
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -335,7 +335,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_ean
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -356,7 +356,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_comment
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -379,9 +379,9 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket
-            WHERE " . $this->sql_extra . "
-                AND product_id = " . $product_id . "
-                AND intranet_id = " . $this->webshop->kernel->intranet->get('id') . "
+            WHERE " . $this->sql_extra."
+                AND product_id = " . $product_id."
+                AND intranet_id = " . $this->webshop->kernel->intranet->get('id')."
       AND quantity > 0 LIMIT 1");
 
         if (!$db->nextRecord()) {
@@ -401,14 +401,14 @@ 
         $price = 0;
 
         $db = new DB_Sql;
-        $db->query("SELECT product_id, quantity FROM basket WHERE " . $this->sql_extra);
+        $db->query("SELECT product_id, quantity FROM basket WHERE ".$this->sql_extra);
 
         while ($db->nextRecord()) {
             $product = new Product($this->webshop->kernel, $db->f("product_id"));
             if ($type == 'exclusive_vat') {
-                $price += $product->get('price') * $db->f("quantity");
+                $price += $product->get('price')*$db->f("quantity");
             } else {
-                $price += $product->get('price_incl_vat') * $db->f("quantity");
+                $price += $product->get('price_incl_vat')*$db->f("quantity");
             }
         }
 
@@ -432,9 +432,9 @@ 
                 ON product.id = basket.product_id
             INNER JOIN product_detail
                 ON product.id = product_detail.product_id
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND product_detail.active = 1
-                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id") . "
+                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id")."
                 AND basket.quantity > 0
             ");
 
@@ -442,7 +442,7 @@ 
         $weight = 0;
 
         while ($db->nextRecord()) {
-            $weight += $db->f('weight') * $db->f('quantity');
+            $weight += $db->f('weight')*$db->f('quantity');
         }
 
         return $weight;
@@ -471,9 +471,9 @@ 
                 ON product.id = basket.product_id
             INNER JOIN product_detail
                 ON product.id = product_detail.product_id
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND product_detail.active = 1
-                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id") . "
+                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id")."
             ORDER BY product_detail.vat DESC, basket.basketevaluation_product");
 
         $i = 0;
@@ -493,8 +493,8 @@ 
 
             // basket specific
             $items[$i]['quantity'] = $db->f('quantity');
-            $items[$i]['totalprice'] = $db->f('quantity') * $items[$i]['price'];
-            $items[$i]['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['price_incl_vat'];
+            $items[$i]['totalprice'] = $db->f('quantity')*$items[$i]['price'];
+            $items[$i]['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['price_incl_vat'];
 
             $i++;
         }
@@ -511,10 +511,10 @@ 
     public function removeEvaluationProducts()
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM basket " .
-                "WHERE basketevaluation_product = 1 " .
-                    "AND " . $this->sql_extra . " " .
-                    "AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
+        $db->query("DELETE FROM basket ".
+                "WHERE basketevaluation_product = 1 ".
+                    "AND ".$this->sql_extra." ".
+                    "AND intranet_id = ".$this->webshop->kernel->intranet->get("id"));
         return true;
 
     }
@@ -527,8 +527,8 @@ 
     public function reset()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE basket SET session_id = '' WHERE " . $this->sql_extra . " AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
-        $db->query("UPDATE basket_details SET session_id = '' WHERE " . $this->sql_extra . " AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
+        $db->query("UPDATE basket SET session_id = '' WHERE ".$this->sql_extra." AND intranet_id = ".$this->webshop->kernel->intranet->get("id"));
+        $db->query("UPDATE basket_details SET session_id = '' WHERE ".$this->sql_extra." AND intranet_id = ".$this->webshop->kernel->intranet->get("id"));
 
         return true;
     }

src/Intraface/modules/modulepackage/ActionStore.php

Spacing +13 added lines, -13 removed lines

@@ -65,12 +65,12 @@ 
         
         $identifier = md5($action->getOrderIdentifier().$this->intranet_id.time());
         
-        $result = $this->db->exec('INSERT INTO module_package_action SET ' .
-                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').', ' .
-                'identifier = '.$this->db->quote($identifier, 'text').', ' .
-                'order_debtor_identifier = '.$this->db->quote($action->getOrderIdentifier(), 'text').',  ' .
-                'date_created = NOW(), ' .
-                'action = '.$this->db->quote($action_serialized, 'text').', ' .
+        $result = $this->db->exec('INSERT INTO module_package_action SET '.
+                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').', '.
+                'identifier = '.$this->db->quote($identifier, 'text').', '.
+                'order_debtor_identifier = '.$this->db->quote($action->getOrderIdentifier(), 'text').',  '.
+                'date_created = NOW(), '.
+                'action = '.$this->db->quote($action_serialized, 'text').', '.
                 'active = 1');
         
         if (PEAR::isError($result)) {
@@ -97,9 +97,9 @@ 
     public function restore($identifier)
     {
         
-        $result = $this->db->query('SELECT id, action, identifier FROM module_package_action WHERE ' .
-                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND ' .
-                'identifier = '.$this->db->quote($identifier, 'text').' AND ' .
+        $result = $this->db->query('SELECT id, action, identifier FROM module_package_action WHERE '.
+                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND '.
+                'identifier = '.$this->db->quote($identifier, 'text').' AND '.
                 'active = 1 ');
         
         if (PEAR::isError($result)) {
@@ -133,8 +133,8 @@ 
     public static function restoreFromIdentifier($db, $identifier)
     {
         
-        $result = $db->query('SELECT id, action, identifier FROM module_package_action WHERE ' .
-                'identifier = '.$db->quote($identifier, 'text').' AND ' .
+        $result = $db->query('SELECT id, action, identifier FROM module_package_action WHERE '.
+                'identifier = '.$db->quote($identifier, 'text').' AND '.
                 'active = 1 ');
         
         if (PEAR::isError($result)) {
@@ -169,8 +169,8 @@ 
             return false;
         }
         
-        $result = $this->db->exec('UPDATE module_package_action SET active = 0 WHERE ' .
-                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND ' .
+        $result = $this->db->exec('UPDATE module_package_action SET active = 0 WHERE '.
+                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND '.
                 'id = '.$this->db->quote($this->id, 'integer'));
         
         if (PEAR::isError($result)) {

src/Intraface/modules/modulepackage/Manager.php

Spacing +43 added lines, -43 removed lines

@@ -48,7 +48,7 @@ 
         // Should we rather just take intranet_id as parameter?
         $this->intranet = &$intranet;
         $this->db = MDB2::singleton(DB_DSN);
-        $this->error =  new Intraface_Error;
+        $this->error = new Intraface_Error;
         $this->id = (int)$id;
 
         if ($this->id > 0) {
@@ -69,20 +69,20 @@ 
         }
 
         // TODO: This could actually easily use dbquery
-        $result = $this->db->query('SELECT intranet_module_package.id, ' .
-                'intranet_module_package.module_package_id, ' .
-                'intranet_module_package.start_date, ' .
-                'intranet_module_package.end_date, ' .
-                'intranet_module_package.order_debtor_id, ' .
-                'intranet_module_package.status_key, ' .
-                'module_package_plan.plan, ' .
-                'module_package_group.group_name, ' .
-                'DATE_FORMAT(intranet_module_package.start_date, "%d-%m-%Y") AS dk_start_date, ' .
-                'DATE_FORMAT(intranet_module_package.end_date, "%d-%m-%Y") AS dk_end_date ' .
-            'FROM intranet_module_package ' .
-            'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id ' .
-            'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id ' .
-            'INNER JOIN module_package_group ON module_package.module_package_group_id = module_package_group.id ' .
+        $result = $this->db->query('SELECT intranet_module_package.id, '.
+                'intranet_module_package.module_package_id, '.
+                'intranet_module_package.start_date, '.
+                'intranet_module_package.end_date, '.
+                'intranet_module_package.order_debtor_id, '.
+                'intranet_module_package.status_key, '.
+                'module_package_plan.plan, '.
+                'module_package_group.group_name, '.
+                'DATE_FORMAT(intranet_module_package.start_date, "%d-%m-%Y") AS dk_start_date, '.
+                'DATE_FORMAT(intranet_module_package.end_date, "%d-%m-%Y") AS dk_end_date '.
+            'FROM intranet_module_package '.
+            'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id '.
+            'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id '.
+            'INNER JOIN module_package_group ON module_package.module_package_group_id = module_package_group.id '.
             'WHERE intranet_id = '.$this->db->quote($this->intranet->get('id'), 'integer').' AND intranet_module_package.id = '.$this->db->quote($this->id, 'integer'));
 
         if (PEAR::isError($result)) {
@@ -161,8 +161,8 @@ 
             return false;
         }
 
-        $sql = "module_package_id = ".$this->db->quote($modulepackage->get('id'), 'integer').", " .
-                "start_date = ".$this->db->quote($start_date, 'date').", " .
+        $sql = "module_package_id = ".$this->db->quote($modulepackage->get('id'), 'integer').", ".
+                "start_date = ".$this->db->quote($start_date, 'date').", ".
                 "end_date = ".$this->db->quote($end_date, 'date');
 
         $result = $this->db->exec("INSERT INTO intranet_module_package SET ".$sql.", status_key = 1, active = 1, intranet_id = ".$this->intranet->get('id'));
@@ -197,8 +197,8 @@ 
             return false;
         }
 
-        $result = $this->db->exec('UPDATE intranet_module_package ' .
-            'SET order_debtor_identifier = '.$this->db->quote($order_identifier, 'text').' ' .
+        $result = $this->db->exec('UPDATE intranet_module_package '.
+            'SET order_debtor_identifier = '.$this->db->quote($order_identifier, 'text').' '.
             'WHERE intranet_id = '.$this->db->quote($this->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
 
         if (PEAR::isError($result)) {
@@ -221,7 +221,7 @@ 
 
         $result = $this->db->exec("UPDATE intranet_module_package SET status_key = 3 WHERE intranet_id = ".$this->intranet->get('id')." AND id = ".intval($this->id));
         if (PEAR::isError($result)) {
-            throw new Exception("Error in query in Intraface_modules_modulepackage_Manager->terminate :". $result->getUserInfo());
+            throw new Exception("Error in query in Intraface_modules_modulepackage_Manager->terminate :".$result->getUserInfo());
         }
 
         return $result;
@@ -239,7 +239,7 @@ 
         }
         $result = $this->db->exec("UPDATE intranet_module_package SET active = 0 WHERE intranet_id = ".$this->intranet->get('id')." AND id = ".intval($this->id));
         if (PEAR::isError($result)) {
-            throw new Exception("Error in query in Intraface_modules_modulepackage_Manager->delete :". $result->getUserInfo());
+            throw new Exception("Error in query in Intraface_modules_modulepackage_Manager->delete :".$result->getUserInfo());
         }
 
         return $result;
@@ -263,10 +263,10 @@ 
         }
 
         // TODO: If DBQuery had not needed kernel we could have used it here!
-        $result = $this->db->query('SELECT module_package_plan.plan_index FROM intranet_module_package ' .
-                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id ' .
-                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id ' .
-                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' ' .
+        $result = $this->db->query('SELECT module_package_plan.plan_index FROM intranet_module_package '.
+                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id '.
+                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id '.
+                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' '.
                 'ORDER BY end_date DESC');
 
         if (PEAR::isError($result)) {
@@ -301,10 +301,10 @@ 
         }
 
         // TODO: If DBQuery had not needed kernel we could have used it here!
-        $result = $this->db->query('SELECT intranet_module_package.end_date FROM intranet_module_package ' .
-                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id ' .
-                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id ' .
-                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' ' .
+        $result = $this->db->query('SELECT intranet_module_package.end_date FROM intranet_module_package '.
+                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id '.
+                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id '.
+                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' '.
                 'ORDER BY end_date DESC');
 
         if (PEAR::isError($result)) {
@@ -480,11 +480,11 @@ 
         $shop = new Intraface_modules_modulepackage_ShopExtension;
 
         // TODO: If DBQuery had not needed kernel we could have used it here!
-        $result = $this->db->query('SELECT intranet_module_package.id, intranet_module_package.status_key, intranet_module_package.start_date, intranet_module_package.end_date, intranet_module_package.order_debtor_id, intranet_module_package.module_package_id, module_package.product_id ' .
-                'FROM intranet_module_package ' .
-                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id ' .
-                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id ' .
-                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' ' .
+        $result = $this->db->query('SELECT intranet_module_package.id, intranet_module_package.status_key, intranet_module_package.start_date, intranet_module_package.end_date, intranet_module_package.order_debtor_id, intranet_module_package.module_package_id, module_package.product_id '.
+                'FROM intranet_module_package '.
+                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id '.
+                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id '.
+                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' '.
                 'ORDER BY end_date DESC');
 
         if (PEAR::isError($result)) {
@@ -567,15 +567,15 @@ 
             $this->dbquery->setSorting('module_package_group.sorting_index, module_package_plan.plan_index, intranet_module_package.start_date');
         }
 
-        $db = $this->dbquery->getRecordset('intranet_module_package.id, ' .
-                    'intranet_module_package.module_package_id, ' .
-                    'intranet_module_package.start_date, ' .
-                    'intranet_module_package.end_date, ' .
-                    'intranet_module_package.order_debtor_id, ' .
-                    'intranet_module_package.status_key, ' .
-                    'module_package_plan.plan, ' .
-                    'module_package_group.group_name, ' .
-                    'DATE_FORMAT(intranet_module_package.start_date, "%d-%m-%Y") AS dk_start_date, ' .
+        $db = $this->dbquery->getRecordset('intranet_module_package.id, '.
+                    'intranet_module_package.module_package_id, '.
+                    'intranet_module_package.start_date, '.
+                    'intranet_module_package.end_date, '.
+                    'intranet_module_package.order_debtor_id, '.
+                    'intranet_module_package.status_key, '.
+                    'module_package_plan.plan, '.
+                    'module_package_group.group_name, '.
+                    'DATE_FORMAT(intranet_module_package.start_date, "%d-%m-%Y") AS dk_start_date, '.
                     'DATE_FORMAT(intranet_module_package.end_date, "%d-%m-%Y") AS dk_end_date', '', false);
 
         $modulepackages = array();

src/Intraface/Keyword/Controller/Connect.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
             'keywords' => $keywords,
             'checked' => $checked);
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/connect');
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/connect');
         return $smarty->render($this, $data);
     }
 

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;
     }