intraface / intraface.dk

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

Indentation +4 added lines, -4 removed lines

@@ -192,10 +192,10 @@
     }
     
 /**
-     * Returns the store identifier which is generated on store and restore.
-     *
-     * @return string action store identifier
-     */
+ * Returns the store identifier which is generated on store and restore.
+ *
+ * @return string action store identifier
+ */
     public function getIdentifier()
     {
         return $this->identifier;

Doc Comments +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
      *
      * @param object action     An action object
      *
-     * @return boolean true or false
+     * @return null|string true or false
      */
     public function store($action)
     {

Spacing +13 added lines, -13 removed lines

@@ -65,12 +65,12 @@ 
         
         $identifier = md5($action->getOrderIdentifier().$this->intranet_id.time());
         
-        $result = $this->db->exec('INSERT INTO module_package_action SET ' .
-                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').', ' .
-                'identifier = '.$this->db->quote($identifier, 'text').', ' .
-                'order_debtor_identifier = '.$this->db->quote($action->getOrderIdentifier(), 'text').',  ' .
-                'date_created = NOW(), ' .
-                'action = '.$this->db->quote($action_serialized, 'text').', ' .
+        $result = $this->db->exec('INSERT INTO module_package_action SET '.
+                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').', '.
+                'identifier = '.$this->db->quote($identifier, 'text').', '.
+                'order_debtor_identifier = '.$this->db->quote($action->getOrderIdentifier(), 'text').',  '.
+                'date_created = NOW(), '.
+                'action = '.$this->db->quote($action_serialized, 'text').', '.
                 'active = 1');
         
         if (PEAR::isError($result)) {
@@ -97,9 +97,9 @@ 
     public function restore($identifier)
     {
         
-        $result = $this->db->query('SELECT id, action, identifier FROM module_package_action WHERE ' .
-                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND ' .
-                'identifier = '.$this->db->quote($identifier, 'text').' AND ' .
+        $result = $this->db->query('SELECT id, action, identifier FROM module_package_action WHERE '.
+                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND '.
+                'identifier = '.$this->db->quote($identifier, 'text').' AND '.
                 'active = 1 ');
         
         if (PEAR::isError($result)) {
@@ -133,8 +133,8 @@ 
     public static function restoreFromIdentifier($db, $identifier)
     {
         
-        $result = $db->query('SELECT id, action, identifier FROM module_package_action WHERE ' .
-                'identifier = '.$db->quote($identifier, 'text').' AND ' .
+        $result = $db->query('SELECT id, action, identifier FROM module_package_action WHERE '.
+                'identifier = '.$db->quote($identifier, 'text').' AND '.
                 'active = 1 ');
         
         if (PEAR::isError($result)) {
@@ -169,8 +169,8 @@ 
             return false;
         }
         
-        $result = $this->db->exec('UPDATE module_package_action SET active = 0 WHERE ' .
-                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND ' .
+        $result = $this->db->exec('UPDATE module_package_action SET active = 0 WHERE '.
+                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND '.
                 'id = '.$this->db->quote($this->id, 'integer'));
         
         if (PEAR::isError($result)) {

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/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>

Braces +5 added lines, -2 removed lines

@@ -9,8 +9,11 @@
         ?>
         <h3><?php e(t('success!')); ?></h3>
         <p><?php e(t('if everything went as it should, you can see your packages below, and you should be able to use them now.')); ?></p>
-    <?php else : ?>
-        <p><?php e(t('on this page you have an overview of your intraface account')); ?></p>
+    <?php else {
+    : ?>
+        <p><?php e(t('on this page you have an overview of your intraface account'));
+}
+?></p>
     <?php endif; ?>
 </div>
 

src/Intraface/modules/modulepackage/Controller/templates/add-package.tpl.php

Spacing +3 added lines, -3 removed lines

@@ -72,8 +72,8 @@ 
 $existing_modulepackages = $modulepackagemanager->getList();
 
 // default start date is today
-if ($add_type == 'extend' && count($existing_modulepackages) > 0 && isset($existing_modulepackages[count($existing_modulepackages)-1]['dk_start_date'])) {
-    $end_date_integer = strtotime($existing_modulepackages[count($existing_modulepackages)-1]['end_date']);
+if ($add_type == 'extend' && count($existing_modulepackages) > 0 && isset($existing_modulepackages[count($existing_modulepackages) - 1]['dk_start_date'])) {
+    $end_date_integer = strtotime($existing_modulepackages[count($existing_modulepackages) - 1]['end_date']);
     // the new start day is the day after the last package ends
     $start_date = date('d-m-Y', strtotime('+1 day', $end_date_integer));
 } else {
@@ -133,7 +133,7 @@ 
             <option value="24"><?php e('2 '.t('years'));
             if (isset($product['price_incl_vat'])) :
                 e(' (DKK '.($product['price_incl_vat']*24).')');
-            endif;  ?></option>
+            endif; ?></option>
         </select>
     </div>
 

Braces +3 added lines, -1 removed lines

@@ -19,8 +19,10 @@
         <span id="price"><?php $product = $modulepackageshop->getProduct((int)$modulepackage->get('product_id'));
         if (isset($product['product']['currency']['DKK']['price_incl_vat'])) :
             e('DKK '.$product['product']['currency']['DKK']['price_incl_vat'].' '.t('per').' '.t($product['product']['unit']['singular']));
-        else :
+        else {
+            :
             echo 'free!';
+        }
         endif; ?></span>
     </div>
 

src/Intraface/modules/modulepackage/Controller/Postform.php

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
             $this->body('amount'),
             $this->body('currency'),
             $language,
-            NET_SCHEME . NET_HOST. $this->url('../', array('status' => 'success')),
-            NET_SCHEME . NET_HOST. $this->url('../payment', array('action_store_identifier' => $this->body('action_store_identifier'), 'payment_error' => 'true')),
-            NET_SCHEME . NET_HOST. $this->url('/process', array('action_store_identifier' => $this->body('action_store_identifier'))),
+            NET_SCHEME.NET_HOST.$this->url('../', array('status' => 'success')),
+            NET_SCHEME.NET_HOST.$this->url('../payment', array('action_store_identifier' => $this->body('action_store_identifier'), 'payment_error' => 'true')),
+            NET_SCHEME.NET_HOST.$this->url('/process', array('action_store_identifier' => $this->body('action_store_identifier'))),
             $this->query(),
             $this->body()
         );
@@ -47,7 +47,7 @@ 
             'form_action' => $form_action,
             'language' => $language);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/postform');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/postform');
         return $tpl->render($this, $data);
     }