intraface / intraface.dk

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

src/Intraface/modules/cms/TemplateSection.php

Spacing +15 added lines, -15 removed lines

@@ -31,11 +31,11 @@ 
             throw new Exception('TemplateSection::__construct skal bruge CMS_Template');
         }
         $this->error    = new Intraface_Error;
-        $this->id       = (int) $id;
+        $this->id       = (int)$id;
         $this->template = $template;
         $this->kernel   = $template->kernel;
 
-        $this->value['identify_as'] = 'cms_template_section';  // bruges af parameter
+        $this->value['identify_as'] = 'cms_template_section'; // bruges af parameter
 
         $this->parameter = $this->createParameterObject();
 
@@ -75,7 +75,7 @@ 
                 // validering p� value
                 // kun v�re gyldige elementtyper
                 // object skal vre cmspage
-                $class = $class_prefix . ucfirst($value);
+                $class = $class_prefix.ucfirst($value);
                 return new $class($object);
                 break;
             case 'id':
@@ -84,12 +84,12 @@ 
                 $section_types = $cms_module->getSetting('section_types');
 
                 $db = new DB_Sql;
-                $db->query("SELECT id, type_key, template_id FROM cms_template_section WHERE id = " . $value . " AND intranet_id = " . $object->intranet->get('id'));
+                $db->query("SELECT id, type_key, template_id FROM cms_template_section WHERE id = ".$value." AND intranet_id = ".$object->intranet->get('id'));
                 if (!$db->nextRecord()) {
                     return false;
                 }
 
-                $class = $class_prefix . ucfirst($section_types[$db->f('type_key')]);
+                $class = $class_prefix.ucfirst($section_types[$db->f('type_key')]);
                 return new $class(CMS_Template::factory($object, 'id', $db->f('template_id')), $db->f('id'));
 
                 break;
@@ -99,12 +99,12 @@ 
                 $section_types = $cms_module->getSetting('section_types');
 
                 $db = new DB_Sql;
-                $db->query("SELECT id, type_key FROM cms_template_section WHERE id = " . $value . " AND intranet_id = " . $object->kernel->intranet->get('id'));
+                $db->query("SELECT id, type_key FROM cms_template_section WHERE id = ".$value." AND intranet_id = ".$object->kernel->intranet->get('id'));
                 if (!$db->nextRecord()) {
                     return false;
                 }
 
-                $class = $class_prefix . ucfirst($section_types[$db->f('type_key')]);
+                $class = $class_prefix.ucfirst($section_types[$db->f('type_key')]);
                 return new $class($object, $db->f('id'));
 
                 break;
@@ -117,7 +117,7 @@ 
     function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id, name, identifier, type_key, locked FROM cms_template_section WHERE cms_template_section.intranet_id = ".$this->template->cmssite->kernel->intranet->get('id')." AND cms_template_section.id = " . $this->id);
+        $db->query("SELECT id, name, identifier, type_key, locked FROM cms_template_section WHERE cms_template_section.intranet_id = ".$this->template->cmssite->kernel->intranet->get('id')." AND cms_template_section.id = ".$this->id);
         if (!$db->nextRecord()) {
             return 0;
         }
@@ -145,7 +145,7 @@ 
             $this->error->set('error in identifier - cannot be empty');
         }
 
-        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 identfier - allowed characters are a-z and 1-9');
         }
         if ($this->isIdentifierUnique($var['identifier'])) {
@@ -176,12 +176,12 @@ 
             $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_template_section SET
+        $sql = $sql_type." cms_template_section SET
                 name = '".safeToDb($var['name'])."',
                 identifier = '".safeToDb($var['identifier'])."',
-                site_id = " . $this->template->cmssite->get('id') . ",
+                site_id = " . $this->template->cmssite->get('id').",
                 intranet_id = ".$this->template->kernel->intranet->get('id').",
                 template_id = ".$this->template->get('id').",
                 type_key = ".$this->value['type_key'].",
@@ -211,14 +211,14 @@ 
     function delete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_template_section SET active = 0 WHERE id = " . $this->id);
+        $db->query("UPDATE cms_template_section SET active = 0 WHERE id = ".$this->id);
         return true;
     }
 
     function getList()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id, name, identifier, type_key FROM cms_template_section WHERE template_id = " . $this->template->get('id') . " AND intranet_id = " . $this->kernel->intranet->get('id') . " AND active = 1 ORDER BY position ASC");
+        $db->query("SELECT id, name, identifier, type_key FROM cms_template_section WHERE template_id = ".$this->template->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1 ORDER BY position ASC");
 
         $i = 0;
         $sections = array();
@@ -237,7 +237,7 @@ 
     function isIdentifierUnique($identifier)
     {
         $db = new DB_Sql;
-        $db->query("SELECT count(*) AS antal FROM cms_template_section WHERE identifier = '".$identifier."' AND intranet_id = " . $this->kernel->intranet->get('id') . " AND template_id = " . $this->template->get('id') . " AND active = 1 AND id != " . $this->id);
+        $db->query("SELECT count(*) AS antal FROM cms_template_section WHERE identifier = '".$identifier."' AND intranet_id = ".$this->kernel->intranet->get('id')." AND template_id = ".$this->template->get('id')." AND active = 1 AND id != ".$this->id);
         if (!$db->nextRecord()) {
             return 0;
         }

src/Intraface/modules/cms/Controller/templates/template-section-edit.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 
     case 'longtext':
         if (empty($value['html_format'])) {
-            $value['html_format'] = array ();
+            $value['html_format'] = array();
         }
 ?>
         <fieldset>

src/Intraface/modules/cms/Controller/templates/pages.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 </ul>
 
 <ul class="options">
-    <li><a class="new" href="<?php e(url(null, array('create' => '', 'type' => $type)));?>"><?php e(t('create '.$type)); ?></a></li>
+    <li><a class="new" href="<?php e(url(null, array('create' => '', 'type' => $type))); ?>"><?php e(t('create '.$type)); ?></a></li>
     <li><a  href="<?php e(url('../')); ?>"><?php e(t('go to site overview')); ?></a></li>
 </ul>
 

src/Intraface/modules/cms/Controller/templates/navigation.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -26,13 +26,13 @@
             <tr>
                 <td><input id="category_<?php e($category['id']); ?>" type="checkbox" name="category[]" value="<?php e($category['id']); ?>" /></td>
                 <td><?php e(str_repeat('- ', $level)); ?><a href="<?php e(url($category['id'])); ?>"><?php e($category['name']); ?></a></td>
-                <td><a href="<?php e(url($category['id'] . '/edit')); ?>"><?php e(t('Edit')); ?></a></td>
+                <td><a href="<?php e(url($category['id'].'/edit')); ?>"><?php e(t('Edit')); ?></a></td>
             </tr>
             <?php
             # 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++;