intraface / intraface.dk

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>
 

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

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
 <?php foreach ($templates as $s) : ?>
     <tr>
-        <td><a href="<?php e(url($s['id'])); ?>"><?php e($s['name']);  ?></a></td>
+        <td><a href="<?php e(url($s['id'])); ?>"><?php e($s['name']); ?></a></td>
         <td><?php e($s['identifier']); ?></td>
         <td>
             <?php

Braces +5 added lines, -2 removed lines

@@ -7,9 +7,12 @@
 
 <?php if (count($templates) == 0) : ?>
     <p><?php e(t('No templates found')); ?></p>
-<?php else : ?>
+<?php else {
+    : ?>
 <table>
-<caption><?php e(t('Templates')); ?></caption>
+<caption><?php e(t('Templates'));
+}
+?></caption>
 <thead>
 <tr>
     <th><?php e(t('Template name')); ?></th>

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

Spacing +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
             <td><?php e($s['type']); ?></td>
             <td class="options"><a href="<?php e(url(null, array('moveup' =>  $s['id']))); ?>"><?php e(t('Up')); ?></a>
             <a href="<?php e(url(null, array('movedown' =>  $s['id']))); ?>"><?php e(t('Down')); ?></a>
-            <a class="edit" href="<?php e(url('section/' . $s['id'], array('edit'))); ?>"><?php e(t('Edit settings')); ?></a>
-            <a class="delete" href="<?php e(url('section/' . $s['id'], array('delete'))); ?>"><?php e(t('Delete')); ?></a></td>
+            <a class="edit" href="<?php e(url('section/'.$s['id'], array('edit'))); ?>"><?php e(t('Edit settings')); ?></a>
+            <a class="delete" href="<?php e(url('section/'.$s['id'], array('delete'))); ?>"><?php e(t('Delete')); ?></a></td>
         </tr>
     <?php endforeach; ?>
         </tbody>

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

Indentation +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
             echo '<fieldset>';
         }
         include 'section/shorttext.tpl.php';
-                     break;
+                        break;
     case 'longtext':
         if (!array_key_exists($section->get('id'), $error) and !empty($test) and $test != 'longtext') {
             echo '</fieldset>';
@@ -71,19 +71,19 @@ 
             echo '<fieldset>';
         }
         include 'section/longtext.tpl.php';
-                     break;
+                        break;
     case 'picture':
         if (!array_key_exists($section->get('id'), $error) and !empty($test)) {
             echo '</fieldset>';
         }
         include 'section/picture.tpl.php';
-                     break;
+                        break;
     case 'mixed':
         if (!array_key_exists($section->get('id'), $error)) {
             echo '</fieldset>';
         }
         include 'section/mixed.tpl.php';
-                     break;
+                        break;
             ?> <?php
     }
     $test = $section->get('type');

Switch Indentation +31 added lines, -31 removed lines

@@ -54,37 +54,37 @@
     }
 
     ?> <?php switch ($section->get('type')) {
-    case 'shorttext':
-        if (!array_key_exists($section->get('id'), $context->error) and !empty($test) and $test != 'shorttext') {
-            echo '</fieldset>';
-        }
-        if ($test != 'shorttext') {
-            echo '<fieldset>';
-        }
-        include 'section/shorttext.tpl.php';
-                     break;
-    case 'longtext':
-        if (!array_key_exists($section->get('id'), $error) and !empty($test) and $test != 'longtext') {
-            echo '</fieldset>';
-        }
-        if ($test != 'longtext') {
-            echo '<fieldset>';
-        }
-        include 'section/longtext.tpl.php';
-                     break;
-    case 'picture':
-        if (!array_key_exists($section->get('id'), $error) and !empty($test)) {
-            echo '</fieldset>';
-        }
-        include 'section/picture.tpl.php';
-                     break;
-    case 'mixed':
-        if (!array_key_exists($section->get('id'), $error)) {
-            echo '</fieldset>';
-        }
-        include 'section/mixed.tpl.php';
-                     break;
-            ?> <?php
+        case 'shorttext':
+            if (!array_key_exists($section->get('id'), $context->error) and !empty($test) and $test != 'shorttext') {
+                echo '</fieldset>';
+            }
+            if ($test != 'shorttext') {
+                echo '<fieldset>';
+            }
+            include 'section/shorttext.tpl.php';
+                         break;
+        case 'longtext':
+            if (!array_key_exists($section->get('id'), $error) and !empty($test) and $test != 'longtext') {
+                echo '</fieldset>';
+            }
+            if ($test != 'longtext') {
+                echo '<fieldset>';
+            }
+            include 'section/longtext.tpl.php';
+                         break;
+        case 'picture':
+            if (!array_key_exists($section->get('id'), $error) and !empty($test)) {
+                echo '</fieldset>';
+            }
+            include 'section/picture.tpl.php';
+                         break;
+        case 'mixed':
+            if (!array_key_exists($section->get('id'), $error)) {
+                echo '</fieldset>';
+            }
+            include 'section/mixed.tpl.php';
+                         break;
+                ?> <?php
     }
     $test = $section->get('type');
 

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
         href="<?php e(url('../../', array('type' => $cmspage->get('type')))); ?>"><?php e(t('close')); ?></a></li>
         <?php if ($kernel->user->hasSubAccess('cms', 'edit_templates')) : ?>
     <li><a
-        href="<?php e(url('../../../templates/' . $cmspage->get('template_id'))); ?>"><?php e(t('edit template')); ?></a></li>
+        href="<?php e(url('../../../templates/'.$cmspage->get('template_id'))); ?>"><?php e(t('edit template')); ?></a></li>
         <?php endif; ?>
 </ul>
 
@@ -28,7 +28,7 @@ 
 <p class="warning"><?php echo e(t('no sections added to the template')); ?>
         <?php if ($kernel->user->hasSubAccess('cms', 'edit_templates')) :
 ?> <a
-    href="<?php e(url('../../template/' . $cmspage->get('template_id'))); ?>"><?php e(t('edit template')); ?></a>.
+    href="<?php e(url('../../template/'.$cmspage->get('template_id'))); ?>"><?php e(t('edit template')); ?></a>.
     <?php else :
 ?> <strong><?php echo e(t('you cannot edit templates')); ?></strong>
     <?php endif; ?></p>

Braces +13 added lines, -5 removed lines

@@ -14,8 +14,11 @@ 
 <fieldset class="<?php e($cmspage->getStatus()); ?>"><?php if (!$cmspage->isPublished()) : ?>
         <?php e(t('this page is not published')); ?> <input type="submit"
     value="<?php e(t('publish now')); ?>" name="publish" /> <?php
-else : ?>
-        <?php e(t('this page is published')); ?> <input type="submit"
+else {
+    : ?>
+        <?php e(t('this page is published'));
+}
+?> <input type="submit"
     value="<?php e(t('set as draft')); ?>" name="unpublish" /> <?php
 endif; ?>
 <input type="hidden" value="<?php e($cmspage->get('id')); ?>" name="id" />
@@ -29,14 +32,19 @@ 
         <?php if ($kernel->user->hasSubAccess('cms', 'edit_templates')) :
 ?> <a
     href="<?php e(url('../../template/' . $cmspage->get('template_id'))); ?>"><?php e(t('edit template')); ?></a>.
-    <?php else :
-?> <strong><?php echo e(t('you cannot edit templates')); ?></strong>
+    <?php else {
+    :
+?> <strong><?php echo e(t('you cannot edit templates'));
+}
+?></strong>
     <?php endif; ?></p>
-    <?php else : ?>
+    <?php else {
+    : ?>
 
     <?php
     if (!empty($context->error) and is_array($context->error) and array_key_exists($section->get('id'), $context->error)) {
         echo '<p class="error">'.e(t('error in a section - please see below')).'</p>';
+}
     }
     ?>
 

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

Spacing +4 added lines, -4 removed lines

@@ -19,11 +19,11 @@
 <tbody>
 <?php foreach ($sites as $s) : ?>
 <tr>
-    <td><a href="<?php e(url($s['id'])); ?>"><?php e($s['name']);  ?></a></td>
+    <td><a href="<?php e(url($s['id'])); ?>"><?php e($s['name']); ?></a></td>
     <td>
-        <a href="<?php e(url($s['id'] . '/pages', array('type' => 'page'))); ?>"><?php e(t('pages'));  ?></a>,
-        <a href="<?php e(url($s['id'] . '/pages', array('type' => 'article'))); ?>"><?php e(t('articles'));  ?></a>,
-        <a href="<?php e(url($s['id'] . '/pages', array('type' => 'news'))); ?>"><?php e(t('news'));  ?></a>
+        <a href="<?php e(url($s['id'].'/pages', array('type' => 'page'))); ?>"><?php e(t('pages')); ?></a>,
+        <a href="<?php e(url($s['id'].'/pages', array('type' => 'article'))); ?>"><?php e(t('articles')); ?></a>,
+        <a href="<?php e(url($s['id'].'/pages', array('type' => 'news'))); ?>"><?php e(t('news')); ?></a>
     </td>
     <td class="options">
         <a class="edit" href="<?php e(url($s['id'], array('edit'))); ?>"><?php e(t('edit settings')); ?></a>

Braces +5 added lines, -2 removed lines

@@ -6,9 +6,12 @@
 
 <?php if (is_array($sites) and count($sites) == 0) : ?>
     <p><?php e(t('no sites created')); ?></p>
-<?php else : ?>
+<?php else {
+    : ?>
 <table>
-<caption><?php e(t('Sites')); ?></caption>
+<caption><?php e(t('Sites'));
+}
+?></caption>
 <thead>
     <tr>
         <th><?php e(t('Name')); ?></th>

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

Spacing +5 added lines, -5 removed lines

@@ -36,22 +36,22 @@
 <h2><?php e(t('pages')); ?></h2>
 
 <ul class="options">
-    <li><a href="<?php e(url('pages', array('type' => 'page'))); ?>"><?php e(t('go to pages'));  ?></a></li>
-    <li><a href="<?php e(url('pages', array('create', 'type' => 'page'))); ?>"><?php e(t('create a new page'));  ?></a></li>
+    <li><a href="<?php e(url('pages', array('type' => 'page'))); ?>"><?php e(t('go to pages')); ?></a></li>
+    <li><a href="<?php e(url('pages', array('create', 'type' => 'page'))); ?>"><?php e(t('create a new page')); ?></a></li>
 </ul>
 
 <h2><?php e(t('articles')); ?></h2>
 
 <ul class="options">
-    <li><a href="<?php e(url('pages', array('type' => 'article'))); ?>"><?php e(t('go to articles'));  ?></a></li>
+    <li><a href="<?php e(url('pages', array('type' => 'article'))); ?>"><?php e(t('go to articles')); ?></a></li>
     <li><a href="<?php e(url('pages', array('create', 'type' => 'article'))); ?>"><?php e(t('create a new article')); ?></a></li>
 </ul>
 
 <h2><?php e(t('news')); ?></h2>
 
 <ul class="options">
-    <li><a href="<?php e(url('pages', array('type' => 'news'))); ?>"><?php e(t('go to news'));  ?></a></li>
-    <li><a href="<?php e(url('pages', array('create', 'type' => 'news'))); ?>"><?php e(t('create a news'));  ?></a></li>
+    <li><a href="<?php e(url('pages', array('type' => 'news'))); ?>"><?php e(t('go to news')); ?></a></li>
+    <li><a href="<?php e(url('pages', array('create', 'type' => 'news'))); ?>"><?php e(t('create a news')); ?></a></li>
 </ul>
 
 <?php endif; ?>

Braces +10 added lines, -4 removed lines

@@ -17,15 +17,21 @@
         <?php e(t('you have to create a template')); ?>
         <?php if ($kernel->user->hasSubAccess('cms', 'edit_templates')) : ?>
             <a href="<?php e(url('templates', array('create'))); ?>"><?php e(t('create template')); ?></a>.
-        <?php else : ?>
-            <strong><?php e(t('please ask your administrator to do that')); ?></strong>
+        <?php else {
+    : ?>
+            <strong><?php e(t('please ask your administrator to do that'));
+}
+?></strong>
         <?php endif; ?>
     </p>
 
-<?php else : ?>
+<?php else {
+    : ?>
 
 <div class="message">
-    <p><?php e(t('your website can consist of the following types of content:')); ?></p>
+    <p><?php e(t('your website can consist of the following types of content:'));
+}
+?></p>
     <ul>
         <li><?php e(t('pages are your common structure on the website reflecting the navigation on the website. pages can be hierarchically ordered.')); ?></li>
         <li><?php e(t('articles are categorized content which is often persistent. you can categorized it with the use of keywords')); ?></li>

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

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
             </thead>
             <?php foreach ($pages as $p) :?>
                 <tr>
-                    <td><a href="<?php e(url($p['id'])); ?>"><?php e(str_repeat("- ", $p['level']) . $p['navigation_name']); ?></a></td>
+                    <td><a href="<?php e(url($p['id'])); ?>"><?php e(str_repeat("- ", $p['level']).$p['navigation_name']); ?></a></td>
                     <td><?php e($p['identifier']); ?></td>
                     <td>
                         <?php if ($p['status'] == 'published') {

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

Braces +10 added lines, -4 removed lines

@@ -3,8 +3,11 @@ 
 <ul class="options">
     <?php if (count($section->cmspage->getSections()) > 1) : ?>
     <li><a href="<?php e(url('../')); ?>"><?php e(t('close')); ?></a></li>
-    <?php else : ?>
-    <li><a class="edit" href="<?php e(url('../../', array('edit'))); ?>"><?php e(t('edit page settings')); ?></a></li>
+    <?php else {
+    : ?>
+    <li><a class="edit" href="<?php e(url('../../', array('edit')));
+}
+?>"><?php e(t('edit page settings')); ?></a></li>
     <li><a href="<?php e(url('../../../', array('type' =>$section->cmspage->get('type')))); ?>"><?php e(t('close')); ?></a></li>
     <?php endif; ?>
 </ul>
@@ -14,8 +17,11 @@ 
     <?php if (!$section->cmspage->isPublished()) : ?>
     <?php e('this page is not published'); ?>
     <input type="submit" value="<?php e(t('publish now')); ?>" name="publish" />
-    <?php else : ?>
-    <?php e('this page is published'); ?>
+    <?php else {
+    : ?>
+    <?php e('this page is published');
+}
+?>
     <input type="submit" value="<?php e(t('set as draft')); ?>" name="unpublish" />
     <?php endif; ?>
     <input type="hidden" value="<?php e($section->get('id')); ?>" name="id" />

src/Intraface/modules/cms/Controller/templates/element/htmltext.tpl.php

Indentation +3 added lines, -3 removed lines

@@ -70,9 +70,9 @@
     require_once dirname(__FILE__) . '/../../../CKEditor.php';
     $config['language'] = 'da';
     $config['toolbar'] = array(
-         array( 'Source', '-', 'Cut','Copy','Paste','PasteText','PasteFromWord', '', 'Undo','Redo', '-', 'Format', 'Bold', 'Italic', 'Strike' ),
-         array( 'Image', 'Link', 'Unlink', 'NumberedList', 'BulletedList', 'Blockquote', 'Outdent', 'Indent', '-', 'Maximize' )
-     );
+            array( 'Source', '-', 'Cut','Copy','Paste','PasteText','PasteFromWord', '', 'Undo','Redo', '-', 'Format', 'Bold', 'Italic', 'Strike' ),
+            array( 'Image', 'Link', 'Unlink', 'NumberedList', 'BulletedList', 'Blockquote', 'Outdent', 'Indent', '-', 'Maximize' )
+        );
     $config['filebrowserBrowseUrl'] = url('/restricted/module/filemanager/ckeditor', array('images' => 1));
     $CKEditor = new CKEditor();
     echo $CKEditor->editor("text", $value['text'], $config);

Spacing +3 added lines, -3 removed lines

@@ -67,11 +67,11 @@
     if (!isset($value['text'])) {
         $value['text'] = '';
     }
-    require_once dirname(__FILE__) . '/../../../CKEditor.php';
+    require_once dirname(__FILE__).'/../../../CKEditor.php';
     $config['language'] = 'da';
     $config['toolbar'] = array(
-         array( 'Source', '-', 'Cut','Copy','Paste','PasteText','PasteFromWord', '', 'Undo','Redo', '-', 'Format', 'Bold', 'Italic', 'Strike' ),
-         array( 'Image', 'Link', 'Unlink', 'NumberedList', 'BulletedList', 'Blockquote', 'Outdent', 'Indent', '-', 'Maximize' )
+         array('Source', '-', 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '', 'Undo', 'Redo', '-', 'Format', 'Bold', 'Italic', 'Strike'),
+         array('Image', 'Link', 'Unlink', 'NumberedList', 'BulletedList', 'Blockquote', 'Outdent', 'Indent', '-', 'Maximize')
      );
     $config['filebrowserBrowseUrl'] = url('/restricted/module/filemanager/ckeditor', array('images' => 1));
     $CKEditor = new CKEditor();