intraface / intraface.dk

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

Spacing +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <h1><?php e(t('Todo')); ?></h1>
 
 <ul class="options">
-    <li><a href="<?php e(url('create'));?>"><?php e(t('Create list')); ?></a></li>
+    <li><a href="<?php e(url('create')); ?>"><?php e(t('Create list')); ?></a></li>
 </ul>
 
 <?php if (count($todo_list) == 0) : ?>
 
-    <p><?php e(t('No lists available'))?>. <a href="<?php e(url('create'));?>"><?php e(t('Create list')); ?></a>.</p>
+    <p><?php e(t('No lists available'))?>. <a href="<?php e(url('create')); ?>"><?php e(t('Create list')); ?></a>.</p>
 
 <?php else : ?>
 

src/Intraface/modules/todo/Controller/Email.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
         $todo = new TodoList($this->getKernel(), $this->context->name());
         $value['id'] = $todo->get('id');
         $value['subject'] = 'Todoliste';
-        $value['body'] = $this->getKernel()->setting->get('user', 'todo.email.standardtext') . "\n\nMed venlig hilsen\n".$this->getKernel()->user->getAddress()->get('name') . "\n" . $this->getKernel()->intranet->get('name');
+        $value['body'] = $this->getKernel()->setting->get('user', 'todo.email.standardtext')."\n\nMed venlig hilsen\n".$this->getKernel()->user->getAddress()->get('name')."\n".$this->getKernel()->intranet->get('name');
 
         $contacts = $todo->getContacts();
 
@@ -31,7 +31,7 @@ 
             'value' => $value
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/email');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/email');
         return $tpl->render($this, $data);
     }
 
@@ -54,7 +54,7 @@ 
 
                 $email = new Email($this->getKernel());
                 $var = array(
-                    'body' => $_POST['body'] . "\n\n" . $contact->getLoginUrl(),
+                    'body' => $_POST['body']."\n\n".$contact->getLoginUrl(),
                     'subject' => $_POST['subject'],
                     'contact_id' => $contact->get('id'),
                     'type_id' => 6, // type_id 6 er todo

src/Intraface/modules/todo/Controller/Edit.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
             'kernel' => $this->getKernel()
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/edit');
         return $tpl->render($this, $data);
     }
 
@@ -51,7 +51,7 @@ 
                     $item_id = 0;
                 }
             }
-            return new k_SeeOther($this->url('../' . $todo->get('id')));
+            return new k_SeeOther($this->url('../'.$todo->get('id')));
         }
         return $this->render();
     }

src/Intraface/modules/todo/Controller/Todo.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
         $this->document()->addScript('todo/todo.js');
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/todo');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/todo');
         return $tpl->render($this, $data);
     }
 

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

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         	'email_shared' => $email_shared
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/index');
         return $tpl->render($this, $data);
     }
 

src/Intraface/modules/todo/Controller/Setting.php

Spacing +3 added lines, -3 removed lines

@@ -13,14 +13,14 @@
         $module = $this->getKernel()->module('todo');
         $translation = $this->getKernel()->getTranslation('todo');
 
-        $value['publiclist'] =  $kernel->setting->get('intranet', 'todo.publiclist');
-        $value['emailstandardtext'] =   $kernel->setting->get('user', 'todo.email.standardtext');
+        $value['publiclist'] = $kernel->setting->get('intranet', 'todo.publiclist');
+        $value['emailstandardtext'] = $kernel->setting->get('user', 'todo.email.standardtext');
 
         $data = array(
             'value' => $value
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/setting');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/setting');
         return $tpl->render($this, $data);
     }
 

src/Intraface/modules/modulepackage/include_front.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     } else {
         foreach ($list as $key => $module) {
             // check whether there is any expering within a month and if there is no other packages comming up in the same group.
-            if (strtotime($module['end_date']) < strtotime('+1 month') && (!isset($list[$key+1]) || $module['group'] != $list[$key+1]['group'])) {
+            if (strtotime($module['end_date']) < strtotime('+1 month') && (!isset($list[$key + 1]) || $module['group'] != $list[$key + 1]['group'])) {
                 $_advice[] = array(
                     'msg' => 'You have modules that expire within a month! Click here to extend the modules now to keep the functionality of your intranet',
                     'link' => $this->url('module/modulepackage'),

src/Intraface/modules/modulepackage/Manager.php

Spacing +43 added lines, -43 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
         <tbody>
         <?php foreach ($packages as $package) : ?>
             <tr>
-                <td><?php e($package['plan'] . ' '. $package['group']); ?></td>
+                <td><?php e($package['plan'].' '.$package['group']); ?></td>
                 <td><?php e($package['dk_start_date']); ?></td>
                 <td><?php e($package['dk_end_date']); ?></td>
                 <td><?php e(t($package['status'])); ?></td>
@@ -137,7 +137,7 @@ 
                         <p> DKK <?php e($packages[$group['id']][$plan['id']]['product']['price_incl_vat'].' '.t('per').' '.t($packages[$group['id']][$plan['id']]['product']['unit']['singular'])); ?></p>
                     <?php                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         } ?>
 
-                    <a href="<?php e(url('package/' . $packages[$group['id']][$plan['id']]['id'])); ?>"><?php e(t('choose')); ?></a>
+                    <a href="<?php e(url('package/'.$packages[$group['id']][$plan['id']]['id'])); ?>"><?php e(t('choose')); ?></a>
 
                 <?php } ?>
                 </td>