intraface / intraface.dk

src/Intraface/modules/shop/Basket.php

Spacing +41 added lines, -41 removed lines

@@ -69,16 +69,16 @@ 
         $this->resetItemCache();
 
         $this->conditions = array(
-            'session_id = ' . $this->db->quote($this->session_id, 'text'),
-            'shop_id = ' . $this->db->quote($this->webshop->getId(), 'integer'),
-            'intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer'));
+            'session_id = '.$this->db->quote($this->session_id, 'text'),
+            'shop_id = '.$this->db->quote($this->webshop->getId(), 'integer'),
+            'intranet_id = '.$this->db->quote($this->intranet->getId(), 'integer'));
 
         $this->cleanUp();
     }
 
     private function cleanUp()
     {
-        return $this->db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL " . $this->db->quote(self::CLEAN_UP_AFTER, 'integer') . " HOUR) < NOW()");
+        return $this->db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL ".$this->db->quote(self::CLEAN_UP_AFTER, 'integer')." HOUR) < NOW()");
     }
 
     /**
@@ -165,23 +165,23 @@ 
                 FROM basket
                 WHERE product_id = ".$product_id."
                     AND product_variation_id = ".$product_variation_id."
-                    AND product_detail_id = " . $product_detail_id . "
-                    AND basketevaluation_product = " . $basketevaluation . "
+                    AND product_detail_id = " . $product_detail_id."
+                    AND basketevaluation_product = " . $basketevaluation."
                     AND " . $sql_extra);
 
         if ($db->nextRecord()) {
             if ($quantity == 0) {
                 $db->query("DELETE FROM basket
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
                         AND " . $sql_extra);
             } 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 " . $sql_extra);
             }
             return true;
@@ -192,7 +192,7 @@ 
                         quantity = $quantity,
                         date_changed = NOW(),
                         text = '".$text."',
-                        basketevaluation_product = " . $basketevaluation . ",
+                        basketevaluation_product = " . $basketevaluation.",
                         product_id = ".$product_id.",
                         product_variation_id = ".$product_variation_id.",
                         product_detail_id = ".$product_detail_id.",
@@ -220,10 +220,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'])."\", ".
@@ -305,13 +305,13 @@ 
         $sql_extra = implode(" AND ", $this->conditions);
 
         $db = new DB_Sql;
-        $db->query("SELECT id FROM basket_details WHERE " . $sql_extra. "
+        $db->query("SELECT id FROM basket_details WHERE ".$sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if ($db->nextRecord()) {
             $db->query("UPDATE basket_details SET ".$sql.",
                 date_changed = NOW()
-                WHERE id = ".$db->f('id') . "
-                    AND " . $sql_extra . "
+                WHERE id = ".$db->f('id')."
+                    AND " . $sql_extra."
                     AND intranet_id = " . $this->intranet->getId());
             return true;
         } else {
@@ -339,7 +339,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -369,7 +369,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_coupon
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -391,7 +391,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_ean
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -413,7 +413,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_comment
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord()) {
             return array();
@@ -435,7 +435,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT payment_method_key
             FROM basket_details
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND intranet_id = " . $this->intranet->getId());
         if (!$db->nextRecord() || $db->f('payment_method_key') == 0) {
             return array();
@@ -460,10 +460,10 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket
-            WHERE " . $sql_extra . "
-                AND product_id = " . $product_id . "
+            WHERE " . $sql_extra."
+                AND product_id = " . $product_id."
                 AND product_variation_id = ".$product_variation_id."
-                AND intranet_id = " . $this->intranet->getId() . "
+                AND intranet_id = " . $this->intranet->getId()."
       AND quantity > 0 LIMIT 1");
 
         if (!$db->nextRecord()) {
@@ -574,9 +574,9 @@ 
                 ON product.id = basket.product_id
             INNER JOIN product_detail
                 ON product.id = product_detail.product_id
-            WHERE " . $sql_extra . "
+            WHERE " . $sql_extra."
                 AND product_detail.active = 1
-                AND basket.intranet_id = " . $this->intranet->getId() . "
+                AND basket.intranet_id = " . $this->intranet->getId()."
             ORDER BY product_detail.vat DESC, basket.basketevaluation_product");
 
         $i = 0;
@@ -627,16 +627,16 @@ 
 
             // basket specific
             $items[$i]['quantity'] = $db->f('quantity');
-            $items[$i]['totalweight'] = $items[$i]['weight'] * $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]['totalweight'] = $items[$i]['weight']*$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]['currency']['DKK']['totalprice'] = $db->f('quantity') * $items[$i]['currency']['DKK']['price'];
-            $items[$i]['currency']['DKK']['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['currency']['DKK']['price_incl_vat'];
+            $items[$i]['currency']['DKK']['totalprice'] = $db->f('quantity')*$items[$i]['currency']['DKK']['price'];
+            $items[$i]['currency']['DKK']['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['currency']['DKK']['price_incl_vat'];
             if (is_object($currencies) && $currencies->count() > 0) {
                 foreach ($currencies as $currency) {
-                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice'] = $db->f('quantity') * $items[$i]['currency'][$currency->getType()->getIsoCode()]['price'];
-                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['currency'][$currency->getType()->getIsoCode()]['price_incl_vat'];
+                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice'] = $db->f('quantity')*$items[$i]['currency'][$currency->getType()->getIsoCode()]['price'];
+                    $items[$i]['currency'][$currency->getType()->getIsoCode()]['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['currency'][$currency->getType()->getIsoCode()]['price_incl_vat'];
                 }
             }
 
@@ -665,10 +665,10 @@ 
     {
         $sql_extra = implode(" AND ", $this->conditions);
         $db = new DB_Sql;
-        $db->query("DELETE FROM basket " .
-                "WHERE basketevaluation_product = 1 " .
-                    "AND " . $sql_extra . " " .
-                    "AND intranet_id = " . $this->intranet->getId());
+        $db->query("DELETE FROM basket ".
+                "WHERE basketevaluation_product = 1 ".
+                    "AND ".$sql_extra." ".
+                    "AND intranet_id = ".$this->intranet->getId());
 
         $this->resetItemCache();
 
@@ -687,8 +687,8 @@ 
 
         $sql_extra = implode(" AND ", $this->conditions);
         $db = new DB_Sql;
-        $db->query("UPDATE basket SET session_id = '' WHERE " . $sql_extra . " AND intranet_id = " . $this->intranet->getId());
-        $db->query("UPDATE basket_details SET session_id = '' WHERE " . $sql_extra . " AND intranet_id = " . $this->intranet->getId());
+        $db->query("UPDATE basket SET session_id = '' WHERE ".$sql_extra." AND intranet_id = ".$this->intranet->getId());
+        $db->query("UPDATE basket_details SET session_id = '' WHERE ".$sql_extra." AND intranet_id = ".$this->intranet->getId());
 
         return true;
     }

src/Intraface/modules/shop/Controller/tpl/categories.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
             # If there is subcategories to the category
             if (is_array($category['categories']) && count($category['categories']) > 0) {
                 # We make the items for the next level the sub categories of this category
-                $level_categories[$level+1] = $category['categories'];
+                $level_categories[$level + 1] = $category['categories'];
 
                 # We move to next level
                 $level++;

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

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
         if (!is_null($options)) {
             $config = HTMLPurifier_Config::createDefault();
             foreach ($options as $option) {
-                $config->set($option[0] . '.' . $option[1], $option[2]);
+                $config->set($option[0].'.'.$option[1], $option[2]);
             }
         }
         $this->_htmlPurifier = new HTMLPurifier($config);
@@ -45,7 +45,7 @@ 
     {
         $options = array(
             array('Cache', 'SerializerPath',
-                PATH_CACHE . '/htmlpurifier'
+                PATH_CACHE.'/htmlpurifier'
             ),
             //array('HTML', 'Doctype', 'XHTML 1.0 Strict'),
             array('HTML', 'Allowed',
@@ -149,12 +149,12 @@ 
         $shops = Doctrine::getTable('Intraface_modules_shop_Shop')->findByIntranetId($this->getKernel()->intranet->getId());
 
         if (count($shops) == 0) {
-            $tpl = $this->template->create(dirname(__FILE__) . '/tpl/empty-table');
+            $tpl = $this->template->create(dirname(__FILE__).'/tpl/empty-table');
             return $tpl->render($this, array('message' => 'No shops has been created yet.'));
         }
 
         $data = array('shops' => $shops);
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/shops');
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/shops');
         return $tpl->render($this, $data);
     }
 
@@ -192,7 +192,7 @@ 
             'settings' => $settings,
             'currencies' => $currencies,
             'languages' => $langs);
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/edit');
         return $tpl->render($this, $data);
     }
 
@@ -242,7 +242,7 @@ 
 
     function wrapHtml($content)
     {
-        $tpl = $this->template->create(dirname(__FILE__) . '/tpl/content');
+        $tpl = $this->template->create(dirname(__FILE__).'/tpl/content');
         return $tpl->render($this, array('content' => $content));
     }
 

src/Intraface/modules/cms/Page.php

Spacing +21 added lines, -21 removed lines

@@ -80,7 +80,7 @@ 
         }
 
         $this->id         = (int)$id;
-        $this->cmssite    =  $cmssite;
+        $this->cmssite    = $cmssite;
         $this->navigation = new CMS_Navigation($this);
         $this->template   = new CMS_Template($this->cmssite);
         $this->kernel     = $this->cmssite->kernel;
@@ -120,7 +120,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')));
     }
 
     /**
@@ -212,7 +212,7 @@ 
         $validator->isNumeric($var['allow_comments'], 'error in comments - allowed values are 0 and 1');
         $validator->isNumeric($var['hidden'], 'error in hidden - allowed values are 0 and 1');
 
-        if (!Validate::string($var['identifier'], array('format' => VALIDATE_ALPHA . VALIDATE_NUM . '-_'))) {
+        if (!Validate::string($var['identifier'], array('format' => VALIDATE_ALPHA.VALIDATE_NUM.'-_'))) {
             $this->error->set('error in unique page address. allowed values are a-z 1-9 _ -');
         }
         if (!$this->isIdentifierAvailable($var['identifier'])) {
@@ -228,7 +228,7 @@ 
     function isIdentifierAvailable($identifier)
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM cms_page WHERE site_id = " . $this->cmssite->get('id') . " AND identifier = '".$identifier."' AND active = 1 AND id != " . (int)$this->get('id'));
+        $db->query("SELECT * FROM cms_page WHERE site_id = ".$this->cmssite->get('id')." AND identifier = '".$identifier."' AND active = 1 AND id != ".(int)$this->get('id'));
         return ($db->numRows() == 0);
     }
 
@@ -268,7 +268,7 @@ 
         }
 
         if (empty($var['identifier'])) {
-            $var['identifier'] = md5(date('d-m-Y H:i:s') . $type_key . serialize($var));
+            $var['identifier'] = md5(date('d-m-Y H:i:s').$type_key.serialize($var));
         }
 
         settype($var['date_expire'], 'string');
@@ -282,7 +282,7 @@ 
             $sql_end = ", date_created = NOW()";
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = ", date_updated = NOW() WHERE id = " . $this->id;
+            $sql_end = ", date_updated = NOW() WHERE id = ".$this->id;
         }
 
         $sql_extra = '';
@@ -295,11 +295,11 @@ 
         }
 
         // if the page is to updated
-        $sql = $sql_type . " cms_page SET
+        $sql = $sql_type." cms_page SET
             intranet_id = '".$this->kernel->intranet->get('id')."',
             user_id = '".$this->kernel->user->get('id')."',
-            title = '" .$var['title']. "',
-            keywords = '" .$var['keywords']. "',
+            title = '" .$var['title']."',
+            keywords = '" .$var['keywords']."',
             description = '".$var['description']."',
             date_publish = ".$sql_publish.",
             allow_comments = ".$var['allow_comments'].",
@@ -311,7 +311,7 @@ 
             site_id = '".(int)$this->cmssite->get('id')."',
             template_id = ".$var['template_id'].",
             pic_id = ".intval($var['pic_id']).",
-            identifier = '".$var['identifier']."'" . $sql_end;
+            identifier = '".$var['identifier']."'".$sql_end;
         // password = '".$var['password']."',
         $db = new DB_Sql;
         $db->query($sql);
@@ -326,11 +326,11 @@ 
 
 
         //position
-        $db->query("SELECT position FROM cms_page WHERE id = " . $this->id);
+        $db->query("SELECT position FROM cms_page WHERE id = ".$this->id);
         if ($db->nextRecord()) {
             if ($db->f('position') == 0 and count($this->getList($this->value['type']) > 0)) {
                 $next_pos = $this->getPosition(MDB2::singleton(DB_DSN))->getMaxPosition() + 1;
-                $db->query("UPDATE cms_page SET position = " . $next_pos . " WHERE id = " . $this->id);
+                $db->query("UPDATE cms_page SET position = ".$next_pos." WHERE id = ".$this->id);
             }
         }
 
@@ -367,7 +367,7 @@ 
             $sql_publish = " AND date_publish < NOW() AND status_key > 0";
         }
 
-        $sql = "SELECT *, DATE_FORMAT(date_publish, '%d-%m-%Y') AS date_publish_dk FROM cms_page WHERE intranet_id = ".$this->cmssite->kernel->intranet->get('id')." AND id = " .$this->id . $sql_expire . $sql_publish;
+        $sql = "SELECT *, DATE_FORMAT(date_publish, '%d-%m-%Y') AS date_publish_dk FROM cms_page WHERE intranet_id = ".$this->cmssite->kernel->intranet->get('id')." AND id = ".$this->id.$sql_expire.$sql_publish;
 
         $db = new DB_Sql();
         $db->query($sql);
@@ -386,8 +386,8 @@ 
         if (empty($this->value['identifier'])) {
             $this->value['identifier'] = $db->f('id');
         }
-        $this->value['url'] =  $this->cmssite->get('url') . $this->value['identifier'] . '/';
-        $this->value['url_self'] =  $this->value['identifier'] . '/';
+        $this->value['url'] = $this->cmssite->get('url').$this->value['identifier'].'/';
+        $this->value['url_self'] = $this->value['identifier'].'/';
 
         $this->value['child_of_id'] = $db->f('child_of_id');
         $this->value['name'] = $db->f('title'); //  bruges til keywords - m�ske skulle vi have et felt ogs�, s� title var webrelateret?
@@ -464,7 +464,7 @@ 
 
         foreach ($template_sections as $template_section) {
             $db = new DB_Sql;
-            $db->query("SELECT id FROM cms_section WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND page_id = ".$this->get('id')." AND site_id = ".$this->cmssite->get('id')." AND template_section_id = " . $template_section['id']);
+            $db->query("SELECT id FROM cms_section WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND page_id = ".$this->get('id')." AND site_id = ".$this->cmssite->get('id')." AND template_section_id = ".$template_section['id']);
 
             // opretter de sektioner der ikke er oprettet p� siden
             if (!$db->nextRecord()) {
@@ -480,7 +480,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT cms_section.id FROM cms_section INNER JOIN cms_template_section ON cms_section.template_section_id = cms_template_section.id
             WHERE cms_section.intranet_id = ".$this->kernel->intranet->get('id')."
-                AND cms_section.page_id = " . $this->id . " ORDER BY cms_template_section.position ASC");
+                AND cms_section.page_id = " . $this->id." ORDER BY cms_template_section.position ASC");
         $i = 0;
         $section = array();
         while ($db->nextRecord()) {
@@ -755,7 +755,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE cms_page SET status_key = " . array_search($status, $this->status) . " WHERE id = " . $this->id . " AND intranet_id = " . $this->cmssite->kernel->intranet->get('id'));
+        $db->query("UPDATE cms_page SET status_key = ".array_search($status, $this->status)." WHERE id = ".$this->id." AND intranet_id = ".$this->cmssite->kernel->intranet->get('id'));
         $this->value['status_key'] = array_search($status, $this->status);
         return true;
     }
@@ -799,7 +799,7 @@ 
         // @todo: BUT it can be a mess and the position of the pages is not corrected
         $db->query('UPDATE cms_page SET child_of_id = '.intval($this->get('child_of_id')).' WHERE child_of_id = '.intval($this->id));
 
-        $sql = "UPDATE cms_page SET active = 0 WHERE id=" . $this->id . " AND site_id = ".$this->cmssite->get('id');
+        $sql = "UPDATE cms_page SET active = 0 WHERE id=".$this->id." AND site_id = ".$this->cmssite->get('id');
         $db->query($sql);
         $this->value['active'] = 0;
         $this->load();
@@ -858,7 +858,7 @@ 
     function publish()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_page SET status_key = " . array_search('published', $this->status) . " WHERE id = " . $this->id . " AND intranet_id = " . $this->cmssite->kernel->intranet->get('id'));
+        $db->query("UPDATE cms_page SET status_key = ".array_search('published', $this->status)." WHERE id = ".$this->id." AND intranet_id = ".$this->cmssite->kernel->intranet->get('id'));
         $this->value['status_key'] = 1;
         $this->load();
         return true;
@@ -867,7 +867,7 @@ 
     function unpublish()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_page SET status_key = " . array_search('draft', $this->status) . " WHERE id = " . $this->id . " AND intranet_id = " . $this->cmssite->kernel->intranet->get('id'));
+        $db->query("UPDATE cms_page SET status_key = ".array_search('draft', $this->status)." WHERE id = ".$this->id." AND intranet_id = ".$this->cmssite->kernel->intranet->get('id'));
         $this->value['status_key'] = 0;
         $this->load();
         return true;

src/Intraface/modules/cms/Stylesheet.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
     function __construct($cmssite)
     {
         if (!is_object($cmssite) or strtolower(get_class($cmssite)) != 'cms_site') {
-            throw new Exception('CMS_Stylesheet::__construct needs CMS_Site - got ' . get_class($cmssite));
+            throw new Exception('CMS_Stylesheet::__construct needs CMS_Site - got '.get_class($cmssite));
         }
         $this->cmssite = $cmssite;
         $this->error = new Intraface_Error;

src/Intraface/modules/cms/Section.php

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
         $this->db = MDB2::singleton(DB_DSN);
         $this->cmspage = $cmspage;
         $this->kernel = $cmspage->kernel;
-        $this->id = (int) $id;
+        $this->id = (int)$id;
         //$template_class = 'CMS_Template_' . $this->value['type'];
 
         $this->error = new Intraface_Error();
@@ -184,16 +184,16 @@ 
         if ($this->id == 0) {
             $sql_type = "INSERT INTO ";
             $sql_end = ", date_created = NOW(),
-                type_key = ".$var['type_key'] . ",
+                type_key = ".$var['type_key'].",
                 template_section_id = ".$var['template_section_id'];
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         }
-        $sql = $sql_type . " cms_section SET
+        $sql = $sql_type." cms_section SET
                 intranet_id = ".$this->cmspage->kernel->intranet->get('id').",
-                page_id=". (int)$this->cmspage->get('id') . ",
-                site_id=". (int)$this->cmspage->cmssite->get('id') . ",
+                page_id=". (int)$this->cmspage->get('id').",
+                site_id=". (int)$this->cmspage->cmssite->get('id').",
                 date_updated = NOW()
             " . $sql_end;
 

src/Intraface/modules/cms/Template.php

Spacing +8 added lines, -8 removed lines

@@ -67,7 +67,7 @@ 
 
     function getPosition($db)
     {
-        return new Ilib_Position($db, 'cms_template', $this->id, 'site_id = ' . $this->cmssite->get('id'), 'id', 'position');
+        return new Ilib_Position($db, 'cms_template', $this->id, 'site_id = '.$this->cmssite->get('id'), 'id', 'position');
     }
 
     /**
@@ -78,7 +78,7 @@ 
         switch ($type) {
             case 'id':
                 $db = new DB_Sql;
-                $db->query("SELECT site_id, id FROM cms_template WHERE id = " . $id . " AND intranet_id = " . $kernel->intranet->get('id'));
+                $db->query("SELECT site_id, id FROM cms_template WHERE id = ".$id." AND intranet_id = ".$kernel->intranet->get('id'));
                 if (!$db->nextRecord()) {
                     return false;
                 }
@@ -97,7 +97,7 @@ 
     function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id, name, site_id, identifier, for_page_type FROM cms_template WHERE intranet_id = " . $this->cmssite->kernel->intranet->get('id') . " AND id = " . $this->id);
+        $db->query("SELECT id, name, site_id, identifier, for_page_type FROM cms_template WHERE intranet_id = ".$this->cmssite->kernel->intranet->get('id')." AND id = ".$this->id);
 
         if (!$db->nextRecord()) {
             return 0;
@@ -146,12 +146,12 @@ 
         $db = new DB_Sql;
         if ($this->id > 0) {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         } else {
             $sql_type = "INSERT INTO ";
             $sql_end = ", date_created = NOW()";
         }
-        $db->query($sql_type . " cms_template SET
+        $db->query($sql_type." cms_template SET
             name = '".safeToDb($var['name'])."',
             date_updated = NOW(),
             intranet_id = ".safeToDb($this->cmssite->kernel->intranet->get('id')).",
@@ -179,7 +179,7 @@ 
             $sql_extra = '';
         }
 
-        $db->query("SELECT id, name, identifier, for_page_type FROM cms_template WHERE ".$sql_extra." intranet_id = " . $this->cmssite->kernel->intranet->get('id') . " AND site_id = " . $this->cmssite->get('id') . " AND active = 1 ORDER BY name");
+        $db->query("SELECT id, name, identifier, for_page_type FROM cms_template WHERE ".$sql_extra." intranet_id = ".$this->cmssite->kernel->intranet->get('id')." AND site_id = ".$this->cmssite->get('id')." AND active = 1 ORDER BY name");
         $i = 0;
         $templates = array();
         while ($db->nextRecord()) {
@@ -212,14 +212,14 @@ 
     function delete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_template SET active = 0 WHERE id = " . $this->id);
+        $db->query("UPDATE cms_template SET active = 0 WHERE id = ".$this->id);
         return true;
     }
 
     function isIdentifierUnique($identifier)
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM cms_template WHERE site_id = " . $this->cmssite->get('id') . " AND identifier = '".$identifier."' AND active = 1 AND id != " . $this->id);
+        $db->query("SELECT id FROM cms_template WHERE site_id = ".$this->cmssite->get('id')." AND identifier = '".$identifier."' AND active = 1 AND id != ".$this->id);
         if ($db->numRows() == 0) {
             return true;
         } else {

src/Intraface/modules/cms/Parameter.php

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
     public function save($parameter, $value)
     {
         if ($this->object->get('id') == 0) {
-            throw new Exception('Parameter::save() object cannot be 0 - problems in ' . get_class($this->object));
+            throw new Exception('Parameter::save() object cannot be 0 - problems in '.get_class($this->object));
         }
 
         # mangler noget validering - skal sikkert kunne s�ttes fra elementet?
@@ -91,13 +91,13 @@ 
 
         // hvis parameteren tidligere er oprettet opdateres den!
         if (!empty($old_parameter)) {
-            $db->query("UPDATE cms_parameter SET value='".$value."' WHERE type_key = ".$this->type_key." AND intranet_id = ".$this->object->kernel->intranet->get('id')." AND belong_to_id=". $this->object->get('id') . " AND parameter='".$parameter."'");
+            $db->query("UPDATE cms_parameter SET value='".$value."' WHERE type_key = ".$this->type_key." AND intranet_id = ".$this->object->kernel->intranet->get('id')." AND belong_to_id=".$this->object->get('id')." AND parameter='".$parameter."'");
         } elseif (!empty($value) and empty($old_parameter)) {
             // hvis parameteren ikke findes oprettes den
             $db->query("INSERT INTO cms_parameter SET type_key=".$this->type_key.", belong_to_id = '".$this->object->get('id')."', parameter='".$parameter."', value='".$value."', intranet_id = ".$this->object->kernel->intranet->get('id'));
         } elseif (empty($value) and !empty($old_parameter)) {
             // hvis parametervvalue er tom skal den gamle parameter slettes
-            $db->query("DELETE FROM cms_parameter WHERE belong_to_id = '".$this->object->get('id')."' AND parameter='".$parameter."' AND intranet_id = ".$this->object->kernel->intranet->get('id') . " AND type_key =" .$this->type_key);
+            $db->query("DELETE FROM cms_parameter WHERE belong_to_id = '".$this->object->get('id')."' AND parameter='".$parameter."' AND intranet_id = ".$this->object->kernel->intranet->get('id')." AND type_key =".$this->type_key);
         }
 
         $this->load();
@@ -114,11 +114,11 @@ 
     private function load()
     {
         if ($this->object->get('id') == 0) {
-            throw new Exception('Parameter::save() object cannot be 0 - problems with ' . get_class($this->object));
+            throw new Exception('Parameter::save() object cannot be 0 - problems with '.get_class($this->object));
         }
 
         $db = new DB_Sql;
-        $sql = "SELECT parameter, value FROM cms_parameter WHERE intranet_id = ".$this->object->kernel->intranet->get('id')." AND belong_to_id = " . $this->object->get('id') . " AND type_key = " . $this->type_key; //  . " AND parameter = '"  .$parameter . "'"
+        $sql = "SELECT parameter, value FROM cms_parameter WHERE intranet_id = ".$this->object->kernel->intranet->get('id')." AND belong_to_id = ".$this->object->get('id')." AND type_key = ".$this->type_key; //  . " AND parameter = '"  .$parameter . "'"
         $db->query($sql);
 
         while ($db->nextRecord()) {

src/Intraface/modules/cms/Element.php

Spacing +12 added lines, -12 removed lines

@@ -41,9 +41,9 @@ 
      */
     function __construct($section, $id = 0)
     {
-        $this->value['identify_as'] = 'cms_element';  // bruges af parameter
+        $this->value['identify_as'] = 'cms_element'; // bruges af parameter
 
-        $this->id        = (int) $id;
+        $this->id        = (int)$id;
         $this->kernel    = $section->kernel;
         $this->section   = $section;
         $this->error     = new Intraface_Error;
@@ -63,7 +63,7 @@ 
 
     function getPosition(DB_Sql $db)
     {
-        return new Ilib_Position($db, "cms_element", $this->id, "section_id=".$this->section->get('id')." AND active = 1 AND intranet_id = " . $this->kernel->intranet->get('id'), "position", "id");
+        return new Ilib_Position($db, "cms_element", $this->id, "section_id=".$this->section->get('id')." AND active = 1 AND intranet_id = ".$this->kernel->intranet->get('id'), "position", "id");
     }
 
     /**
@@ -125,7 +125,7 @@ 
         }
 
         $db = new DB_Sql;
-        $db->query("SELECT id, section_id, date_expire, date_publish, type_key, position FROM cms_element WHERE intranet_id = ".$this->section->kernel->intranet->get('id')." AND id = " . $this->id);
+        $db->query("SELECT id, section_id, date_expire, date_publish, type_key, position FROM cms_element WHERE intranet_id = ".$this->section->kernel->intranet->get('id')." AND id = ".$this->id);
         if (!$db->nextRecord()) {
             return 0;
         }
@@ -147,7 +147,7 @@ 
         $this->value['extra_class'] = '';
 
         if ($this->get('elm_width')) {
-            $this->value['extra_style'] .= 'width: ' . $this->get('elm_width') . ';';
+            $this->value['extra_style'] .= 'width: '.$this->get('elm_width').';';
         }
 
         if ($this->get('elm_properties') == 'float') {
@@ -161,7 +161,7 @@ 
             $this->value['extra_style'] .= ' clear: both;';
         }
         if ($this->get('elm_adjust')) {
-            $this->value['extra_class'] .= ' cms-align-' . $this->get('elm_adjust');
+            $this->value['extra_class'] .= ' cms-align-'.$this->get('elm_adjust');
         }
 
         if ($this->get('elm_box') == 'box') {
@@ -237,11 +237,11 @@ 
             $sql_end = ", date_created = NOW()";
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         }
-        $sql = $sql_type . " cms_element SET
+        $sql = $sql_type." cms_element SET
                 intranet_id = ".$this->section->kernel->intranet->get('id').",
-                section_id=". (int)$this->section->get('id') . ",
+                section_id=". (int)$this->section->get('id').",
                 type_key = ".safeToDb($this->value['type_key']).",
                 date_changed = NOW(),
                 date_publish = ".$date_publish.",
@@ -254,7 +254,7 @@ 
             $this->id = $db->insertedId();
 
             $next_pos = $this->getPosition($db)->getMaxPosition() + 1;
-            $db->query("UPDATE cms_element SET position = " . $next_pos . " WHERE id = " . $this->id);
+            $db->query("UPDATE cms_element SET position = ".$next_pos." WHERE id = ".$this->id);
         }
 
         $this->load();
@@ -290,7 +290,7 @@ 
     public function delete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_element SET active = 0 WHERE id = " . $this->id);
+        $db->query("UPDATE cms_element SET active = 0 WHERE id = ".$this->id);
         return true;
     }
 
@@ -302,7 +302,7 @@ 
     public function undelete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_element SET active = 1 WHERE id = " . $this->id);
+        $db->query("UPDATE cms_element SET active = 1 WHERE id = ".$this->id);
         return true;
     }