intraface / intraface.dk

src/Intraface/modules/webshop/Webshop.php

Spacing +4 added lines, -4 removed lines

@@ -186,14 +186,14 @@ 
             if ($value['message'] != '') {
                 $value['message'] .= "\n\n";
             }
-            $value['message'] .= "Kundekupon:". $input['customer_coupon'];
+            $value['message'] .= "Kundekupon:".$input['customer_coupon'];
         }
 
         if (isset($input['customer_comment']) && $input['customer_comment'] != '') {
             if ($value['message'] != '') {
                 $value['message'] .= "\n\n";
             }
-            $value['message'] .= "Kommentar:\n". $input['customer_comment'];
+            $value['message'] .= "Kommentar:\n".$input['customer_comment'];
         }
 
 
@@ -301,8 +301,8 @@ 
         $email = new Email($this->kernel);
 
         if (!$email->save(array('contact_id' => $this->contact->get('id'),
-                                'subject' => 'Bekræftelse på bestilling #' . $order_id,
-                                'body' => $this->kernel->setting->get('intranet', 'webshop.confirmation_text') . "\n" . $this->contact->getLoginUrl() . "\n\nVenlig hilsen\n" . $this->kernel->intranet->address->get('name'),
+                                'subject' => 'Bekræftelse på bestilling #'.$order_id,
+                                'body' => $this->kernel->setting->get('intranet', 'webshop.confirmation_text')."\n".$this->contact->getLoginUrl()."\n\nVenlig hilsen\n".$this->kernel->intranet->address->get('name'),
                                 'from_email' => $this->kernel->intranet->address->get('email'),
                                 'from_name' => $this->kernel->intranet->address->get('name'),
                                 'type_id' => 12, // webshop

src/Intraface/modules/webshop/BasketEvaluation.php

Spacing +16 added lines, -16 removed lines

@@ -55,7 +55,7 @@ 
             die($this->db->getMessage());
         }
 
-        $this->value['settings'] = array (
+        $this->value['settings'] = array(
             'evaluate_target' => array(
                 0 => 'price',
                 1 => 'weight',
@@ -94,7 +94,7 @@ 
         $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->db->quote($this->kernel->intranet->get('id'), 'integer')." AND id = ".$this->db->quote($this->id, 'integer'));
 
         if (PEAR::isError($result)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
         }
 
         if ($result->numRows() == 0) {
@@ -152,35 +152,35 @@ 
             return false;
         }
 
-        $sql = "running_index = ".$this->db->quote($input['running_index'], 'integer').", " .
-                 "evaluate_target_key = ".$this->db->quote($input['evaluate_target_key'], 'integer').", " .
-                 "evaluate_method_key = ".$this->db->quote($input['evaluate_method_key'], 'integer').", " .
-                 "evaluate_value = ".$this->db->quote($input['evaluate_value'], 'text').", " .
-                 "evaluate_value_case_sensitive = ".$this->db->quote($input['evaluate_value_case_sensitive'], 'integer').", " .
-                 "go_to_index_after = ".$this->db->quote($input['go_to_index_after'], 'integer').", " .
-                 "action_action_key = ".$this->db->quote($input['action_action_key'], 'integer').", " .
-                 "action_value = ".$this->db->quote($input['action_value'], 'text').", " .
-                 "action_quantity = ".$this->db->quote($input['action_quantity'], 'integer').", " .
+        $sql = "running_index = ".$this->db->quote($input['running_index'], 'integer').", ".
+                 "evaluate_target_key = ".$this->db->quote($input['evaluate_target_key'], 'integer').", ".
+                 "evaluate_method_key = ".$this->db->quote($input['evaluate_method_key'], 'integer').", ".
+                 "evaluate_value = ".$this->db->quote($input['evaluate_value'], 'text').", ".
+                 "evaluate_value_case_sensitive = ".$this->db->quote($input['evaluate_value_case_sensitive'], 'integer').", ".
+                 "go_to_index_after = ".$this->db->quote($input['go_to_index_after'], 'integer').", ".
+                 "action_action_key = ".$this->db->quote($input['action_action_key'], 'integer').", ".
+                 "action_value = ".$this->db->quote($input['action_value'], 'text').", ".
+                 "action_quantity = ".$this->db->quote($input['action_quantity'], 'integer').", ".
                  "action_unit_key = ".$this->db->quote($input['action_unit_key'], 'integer');
 
         if ($this->id != 0) {
             $result = $this->db->exec("UPDATE webshop_basket_evaluation SET ".$sql." WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = ".$this->id);
 
             if (PEAR::isError($result)) {
-                throw new Exception($result->getMessage() . $result->getUserInfo());
+                throw new Exception($result->getMessage().$result->getUserInfo());
                 return false;
             }
         } else {
             $result = $this->db->query("INSERT INTO webshop_basket_evaluation SET ".$sql.", intranet_id = ".$this->kernel->intranet->get('id').", id = ".$this->id);
 
             if (PEAR::isError($result)) {
-                throw new Exception($result->getMessage() . $result->getUserInfo());
+                throw new Exception($result->getMessage().$result->getUserInfo());
                 return false;
             }
 
             $this->id = $this->db->lastInsertID();
             if (PEAR::isError($this->id)) {
-                throw new Exception($result->getMessage() . $result->getUserInfo());
+                throw new Exception($result->getMessage().$result->getUserInfo());
             }
         }
 
@@ -196,7 +196,7 @@ 
     {
         $result = $this->db->exec("UPDATE webshop_basket_evaluation SET active = 0 WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = ".$this->id);
         if (PEAR::isError($result)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
             return false;
         }
         return true;
@@ -212,7 +212,7 @@ 
         $result = $this->db->query("SELECT * FROM webshop_basket_evaluation WHERE active = 1 AND intranet_id = ".$this->kernel->intranet->get('id').' ORDER BY running_index');
 
         if (PEAR::isError($this->id)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
         }
 
         $i = 0;

src/Intraface/modules/order/include_front.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
         );
     } else {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM debtor WHERE type = 2 AND status = 0 AND active = 1 AND intranet_id = " . $kernel->intranet->get('id'));
+        $db->query("SELECT * FROM debtor WHERE type = 2 AND status = 0 AND active = 1 AND intranet_id = ".$kernel->intranet->get('id'));
         $orders = $db->numRows();
         if ($orders > 0) {
             $_attention_needed[] = array(

src/Intraface/modules/currency/Controller/tpl/add.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
                 <?php if (!empty($data['selected_type_iso_code']) and $type->getIsoCode() == $data['selected_type_iso_code']) {
                     echo ' selected="selected"';
 } ?>
-                ><?php e($type->getIsoCode() . ' ' . $type->getDescription()); ?></option>
+                ><?php e($type->getIsoCode().' '.$type->getDescription()); ?></option>
             <?php endforeach; ?>
             </select>
         </div>

src/Intraface/modules/todo/TodoList.php

Spacing +14 added lines, -14 removed lines

@@ -34,7 +34,7 @@ 
         }
 
         $this->kernel = $kernel;
-        $this->id = (int) $id;
+        $this->id = (int)$id;
 
         if ($this->id > 0) {
             $this->load();
@@ -59,7 +59,7 @@ 
         }
 
         $db = new DB_Sql;
-        $db->query("SELECT * FROM todo_item WHERE " . $sql_status . " todo_list_id =" . (int)$this->getId() . "  AND active = 1 ORDER BY status ASC, position ASC");
+        $db->query("SELECT * FROM todo_item WHERE ".$sql_status." todo_list_id =".(int)$this->getId()."  AND active = 1 ORDER BY status ASC, position ASC");
         $ids = array();
         $i = 0;
         while ($db->nextRecord()) {
@@ -100,7 +100,7 @@ 
     public function setAllItemsUndone()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE todo_item SET status = 0 WHERE todo_list_id = " . $this->getId());
+        $db->query("UPDATE todo_item SET status = 0 WHERE todo_list_id = ".$this->getId());
         return true;
     }
 
@@ -140,7 +140,7 @@ 
     public function deleteAllItems()
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM todo_item WHERE todo_list_id = " . $this->id. " AND active = 1 AND status = 0");
+        $db->query("DELETE FROM todo_item WHERE todo_list_id = ".$this->id." AND active = 1 AND status = 0");
         return true;
     }
 
@@ -152,7 +152,7 @@ 
     private function load()
     {
         $db = new Db_Sql;
-        $db->query("SELECT * FROM todo_list WHERE id = " . $this->id . " LIMIT 1");
+        $db->query("SELECT * FROM todo_list WHERE id = ".$this->id." LIMIT 1");
         if ($db->nextRecord()) {
             $this->value['id'] = $db->f('id');
             $this->value['list_name'] = $db->f('name');
@@ -218,13 +218,13 @@ 
 
         if ($this->id == 0) {
             $sql_type = "INSERT INTO ";
-            $sql_end = ", date_created = NOW(), public_key = '" .$this->kernel->randomKey(10) . "'";
+            $sql_end = ", date_created = NOW(), public_key = '".$this->kernel->randomKey(10)."'";
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         }
         $db = new DB_Sql;
-        $db->query($sql_type. " todo_list SET description = '".$var['list_description']."', name = '".$var['list_name']."', date_changed=NOW(),intranet_id = " . $this->kernel->intranet->get('id') . $sql_end);
+        $db->query($sql_type." todo_list SET description = '".$var['list_description']."', name = '".$var['list_name']."', date_changed=NOW(),intranet_id = ".$this->kernel->intranet->get('id').$sql_end);
 
         if ($this->id == 0) {
             $this->id = $db->insertedId();
@@ -246,12 +246,12 @@ 
         $db->query("SELECT * FROM todo_list
             WHERE intranet_id = " . $this->kernel->intranet->get('id'));
         $ids = array();
-        $i=0;
+        $i = 0;
         while ($db->nextRecord()) {
             $todo = new TodoList($this->kernel, $db->f('id'));
             if ($type == 'done' and $todo->howManyLeft() > 0) {
                 continue;
-            } elseif ($type != 'done'  and $todo->howManyLeft() == 0) {
+            } elseif ($type != 'done' and $todo->howManyLeft() == 0) {
                 continue;
             }
             $ids[$i]['id'] = $db->f('id');
@@ -270,7 +270,7 @@ 
     public function howManyLeft()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM todo_item WHERE status = 0 AND active = 1 AND todo_list_id = " . $this->id);
+        $db->query("SELECT * FROM todo_item WHERE status = 0 AND active = 1 AND todo_list_id = ".$this->id);
         return $db->numRows();
     }
 
@@ -283,11 +283,11 @@ 
     {
         $id = (int)$id;
         $db = new DB_Sql;
-        $db->query("SELECT * FROM todo_contact WHERE contact_id = " . $id);
+        $db->query("SELECT * FROM todo_contact WHERE contact_id = ".$id);
         if ($db->nextRecord()) {
             return true;
         }
-        $db->query("INSERT INTO todo_contact SET contact_id = " . $id . ", list_id = ".$this->get('id').", intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("INSERT INTO todo_contact SET contact_id = ".$id.", list_id = ".$this->get('id').", intranet_id = ".$this->kernel->intranet->get('id'));
         return true;
     }
 
@@ -301,7 +301,7 @@ 
         $db = new DB_Sql;
         $i = 0;
         $contacts = array();
-        $db->query("SELECT * FROM todo_contact WHERE intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT * FROM todo_contact WHERE intranet_id = ".$this->kernel->intranet->get('id'));
         while ($db->nextRecord()) {
             $contacts[$i] = $db->f('contact_id');
             $i++;

src/Intraface/modules/todo/TodoItem.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
             throw new Exception('Todo kr�ver Kernel');
         }
         $this->todo = $todo;
-        $this->id = (int) $id;
+        $this->id = (int)$id;
 
         if ($this->id > 0) {
             $this->load();
@@ -44,7 +44,7 @@ 
     private function load()
     {
         $db = new Db_Sql;
-        $db->query("SELECT * FROM todo_item WHERE id = " . $this->id);
+        $db->query("SELECT * FROM todo_item WHERE id = ".$this->id);
         if ($db->nextRecord()) {
             $this->value['id'] = $db->f('id');
             $this->value['item'] = $db->f('item');
@@ -103,20 +103,20 @@ 
         $db = new DB_Sql;
 
         if ($this->id == 0) {
-            $db->query("SELECT position FROM todo_item WHERE todo_list_id = " . $this->todo->get('id') . " ORDER BY position DESC LIMIT 1");
+            $db->query("SELECT position FROM todo_item WHERE todo_list_id = ".$this->todo->get('id')." ORDER BY position DESC LIMIT 1");
             $db->nextRecord();
             $new_position = $db->f('position') + 1;
         }
 
         if ($this->id == 0) {
             $sql_type = "INSERT INTO ";
-            $sql_end = ", date_created = NOW(), position = " . $new_position;
+            $sql_end = ", date_created = NOW(), position = ".$new_position;
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         }
 
-        $db->query($sql_type. " todo_item SET intranet_id = ".$this->todo->kernel->intranet->get('id').", item = '".$var."', todo_list_id = ".(int)$this->todo->get('id').", responsible_user_id = " .$user_id. " " . $sql_end);
+        $db->query($sql_type." todo_item SET intranet_id = ".$this->todo->kernel->intranet->get('id').", item = '".$var."', todo_list_id = ".(int)$this->todo->get('id').", responsible_user_id = ".$user_id." ".$sql_end);
 
         if ($this->id == 0) {
             $this->id = $db->insertedId();
@@ -135,7 +135,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE todo_item SET status = 1 WHERE id = " . $this->id);
+        $db->query("UPDATE todo_item SET status = 1 WHERE id = ".$this->id);
         return true;
     }
 
@@ -150,7 +150,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE todo_item SET active = 0 WHERE id = " . $this->id);
+        $db->query("UPDATE todo_item SET active = 0 WHERE id = ".$this->id);
         return true;
     }
 

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