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;

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
     private $cmssite;
     public $error;
 
+    /**
+     * @param CMS_Site $cmssite
+     */
     function __construct($cmssite)
     {
         if (!is_object($cmssite) or strtolower(get_class($cmssite)) != 'cms_site') {

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;
 

Doc Comments +6 added lines

@@ -58,11 +58,17 @@
         return new CMS_Parameter($this);
     }
 
+    /**
+     * @param string $key
+     */
     public function addParameter($key, $value)
     {
         return $this->parameter->save($key, $value);
     }
 
+    /**
+     * @param string $type
+     */
     public function factory($object, $type, $value)
     {
         $class_prefix = 'Intraface_modules_cms_section_';

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/Site.php

Spacing +7 added lines, -7 removed lines

@@ -71,14 +71,14 @@ 
 
         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 = new DB_Sql;
-        $db->query($sql_type . " cms_site
+        $db->query($sql_type." cms_site
             SET intranet_id = ".$this->kernel->intranet->get('id').",
             name = '".$var['name']."',
             url = '".$var['url']."',
@@ -88,7 +88,7 @@ 
             $this->id = $db->insertedId();
         }
 
-        $this->kernel->setting->set('intranet', 'cc_license', intval($var['cc_license']), 'site_id_' . $this->id);
+        $this->kernel->setting->set('intranet', 'cc_license', intval($var['cc_license']), 'site_id_'.$this->id);
 
         $this->load();
 
@@ -98,14 +98,14 @@ 
     function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id, name, url FROM cms_site WHERE id = " . $this->id . " AND intranet_id = ".$this->kernel->intranet->get('id')." LIMIT 1");
+        $db->query("SELECT id, name, url FROM cms_site WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id')." LIMIT 1");
         if (!$db->nextRecord()) {
             return 0;
         }
         $this->value['id'] = $db->f('id');
         $this->value['name'] = $db->f('name');
         $this->value['url'] = $db->f('url');
-        $this->value['cc_license'] = $this->kernel->setting->get('intranet', 'cc_license', 'site_id_' . $this->get('id'));
+        $this->value['cc_license'] = $this->kernel->setting->get('intranet', 'cc_license', 'site_id_'.$this->get('id'));
 
     }
 
@@ -116,14 +116,14 @@ 
             return 0;
         }
         $db = new Db_Sql;
-        $db->query("UPDATE cms_site SET active = 0 WHERE intranet_id=".$this->kernel->intranet->get('id')." AND id = " . $this->id);
+        $db->query("UPDATE cms_site SET active = 0 WHERE intranet_id=".$this->kernel->intranet->get('id')." AND id = ".$this->id);
         return 1;
     }
 
     function getList()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id, name FROM cms_site WHERE intranet_id = " . $this->kernel->intranet->get('id'). " AND active = 1");
+        $db->query("SELECT id, name FROM cms_site WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1");
         $i = 0;
         $sites = array();
         while ($db->nextRecord()) {

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

Doc Comments +6 added lines

@@ -62,11 +62,17 @@
         return new CMS_Parameter($this);
     }
 
+    /**
+     * @param string $key
+     */
     function addParameter($key, $value)
     {
         return $this->parameter->save($key, $value);
     }
 
+    /**
+     * @param string $type
+     */
     function factory($object, $type, $value)
     {
         $class_prefix = 'Intraface_modules_cms_templatesection_';

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>
 

Braces +30 added lines, -12 removed lines

@@ -6,20 +6,29 @@ 
         <?php e(t('you have to create a template')); ?>
         <?php if ($kernel->user->hasSubAccess('cms', 'edit_templates')) : ?>
             <a href="<?php e(url('../template/create')); ?>"><?php e(t('create template')); ?></a>.
-        <?php else : ?>
-            <strong><?php e(t('you cannot create templates')); ?></strong>
+        <?php else {
+    : ?>
+            <strong><?php e(t('you cannot create templates'));
+}
+?></strong>
         <?php endif; ?>
     </p>
 
-<?php else : ?>
+<?php else {
+    : ?>
 
 <ul class="options">
     <?php foreach ($cmspage->getTypes() as $page_type) : ?>
         <li>
             <?php if ($page_type == $type) : ?>
-                <strong><?php e(t($page_types_plural[$page_type])); ?></strong>
-            <?php else : ?>
-                <a  href="<?php e(url(null, array('type' => $page_type))); ?>"><?php e(t($page_types_plural[$page_type])); ?></a>
+                <strong><?php e(t($page_types_plural[$page_type]));
+}
+?></strong>
+            <?php else {
+    : ?>
+                <a  href="<?php e(url(null, array('type' => $page_type)));
+}
+?>"><?php e(t($page_types_plural[$page_type])); ?></a>
             <?php endif; ?>
         </li>
     <?php endforeach; ?>
@@ -34,22 +43,31 @@ 
     <?php
     if (!is_array($pages) or count($pages) == 0) : ?>
         <p><?php e(t('No pages found')); ?></p>
-    <?php                                                                                                         else: ?>
-        <?php include 'page/pages.tpl.php'; ?>
+    <?php                                                                                                         else {
+    : ?>
+        <?php include 'page/pages.tpl.php';
+}
+?>
     <?php endif; ?>
 <?php elseif ($type == 'article') : ?>
     <?php
     if (!is_array($articles) or count($articles) == 0) : ?>
         <p><?php e(t('No articles found')); ?></p>
-    <?php                                                                                                         else: ?>
-        <?php include 'page/articles.tpl.php'; ?>
+    <?php                                                                                                         else {
+    : ?>
+        <?php include 'page/articles.tpl.php';
+}
+?>
     <?php endif; ?>
 <?php elseif ($type == 'news') : ?>
     <?php
     if (!is_array($news) or count($news) == 0) : ?>
         <p><?php e(t('No news found')); ?></p>
-    <?php                                                                                                         else: ?>
-        <?php include 'page/news.tpl.php'; ?>
+    <?php                                                                                                         else {
+    : ?>
+        <?php include 'page/news.tpl.php';
+}
+?>
     <?php endif; ?>
 <?php endif; ?>
 

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

Braces +5 added lines, -2 removed lines

@@ -55,9 +55,12 @@
 <?php if (isset($product_id)) : ?>
     <input type="hidden" name="product_id" value="<?php e($product_id); ?>" />
     <input type="submit" name="append_product" value="<?php e(t('Select')); ?>" />
-<?php else : ?>
+<?php else {
+    : ?>
     <select name="action">
-        <option value=""><?php e(t('Choose...')); ?></option>
+        <option value=""><?php e(t('Choose...'));
+}
+?></option>
         <option value="delete"><?php e(t('Delete selected')); ?></option>
     </select>
 

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

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
                 }
                     $context->getKernel()->useModule('filemanager');
                     $filehandler = new FileHandler($kernel, $value['pic_id']);
-                    e('file_id ' . $filehandler->get('id') . ' chosen');
+                    e('file_id '.$filehandler->get('id').' chosen');
                     //$filehandler_html = new FileHandlerHTML($filehandler);
                     //$filehandler_html->printFormUploadTag('pic_id', 'new_pic', 'choose_file', array('image_size' => 'small'));
                 ?>

Braces +15 added lines, -6 removed lines

@@ -15,14 +15,20 @@ 
         <?php e(t('you have to create a template for this page type')); ?>
         <?php if ($kernel->user->hasSubAccess('cms', 'edit_templates')) : ?>
             <a href="<?php e(url('../../template/create')); ?>"><?php e(t('create template')); ?></a>.
-        <?php else : ?>
-            <strong><?php e(t('please ask your administrator to do create a template')); ?></strong>
+        <?php else {
+    : ?>
+            <strong><?php e(t('please ask your administrator to do create a template'));
+}
+?></strong>
         <?php endif; ?>
     </p>
 
-<?php else : ?>
+<?php else {
+    : ?>
 
-    <form method="post" action="<?php e(url(null, array($context->subview(), 'type' => $type))); ?>">
+    <form method="post" action="<?php e(url(null, array($context->subview(), 'type' => $type)));
+}
+?>">
 
         <fieldset>
             <legend><?php e(t('about the behavior of the page')); ?></legend>
@@ -55,8 +61,11 @@ 
                     <?php endforeach; ?>
                     </select>
                 </div>
-            <?php else : ?>
-                <input type="hidden" name="template_id" value="<?php e($templates[0]['id']); ?>" />
+            <?php else {
+    : ?>
+                <input type="hidden" name="template_id" value="<?php e($templates[0]['id']);
+}
+?>" />
             <?php endif; ?>
         </fieldset>