intraface / intraface.dk

src/Intraface/modules/procurement/Controller/templates/item-edit.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -46,6 +46,6 @@
     <input type="hidden" name="product_variation_detail_id" value="<?php e($procurement->item->get('product_variation_detail_id')); ?>" />
 
     <input type="submit" name="submit" value="Gem" class="save" />
-    <a href="<?php e(url('../'));  ?>">Fortryd</a>
+    <a href="<?php e(url('../')); ?>">Fortryd</a>
 </div>
 </form>

src/Intraface/modules/procurement/Controller/PurchasePrice.php

Spacing +1 added lines, -1 removed lines

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

src/Intraface/modules/procurement/Controller/Show.php

Spacing +3 added lines, -3 removed lines

@@ -55,7 +55,7 @@ 
                 $contact_module = $this->getKernel()->useModule('contact');
 
                 $redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
-                $url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('choosecontact'), NET_SCHEME . NET_HOST . $this->url());
+                $url = $redirect->setDestination(NET_SCHEME.NET_HOST.$this->url('choosecontact'), NET_SCHEME.NET_HOST.$this->url());
                 $redirect->askParameter('contact_id');
                 $redirect->setIdentifier('contact');
 
@@ -102,7 +102,7 @@ 
             'kernel' => $this->getKernel(),
             'append_file' => $append_file,
             'filehandler' => $filehandler);
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/show');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/show');
         return $tpl->render($this, $data);
     }
 
@@ -118,7 +118,7 @@ 
             'title' => $this->t("Edit procurement"),
             'gateway' => new Intraface_modules_procurement_ProcurementGateway($this->getKernel()),
             'values' => $this->getValues());
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/procurement-edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/procurement-edit');
         return $tpl->render($this, $data);
     }
 

src/Intraface/modules/procurement/ProcurementItem.php

Spacing +25 added lines, -25 removed lines

@@ -64,7 +64,7 @@ 
     {
         $this->procurement = $procurement;
         $this->error = new Intraface_Error;
-        $this->id = (int) $id;
+        $this->id = (int)$id;
 
         if ($this->id > 0) {
             $this->load();
@@ -86,7 +86,7 @@ 
 
         $db->query("SELECT procurement_item.* FROM procurement_item
                     INNER JOIN procurement ON procurement_item.procurement_id = procurement.id
-                    WHERE procurement_item.id = " . $this->id . " AND procurement.id = " . $this->procurement->get('id') . " AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id"));
+                    WHERE procurement_item.id = " . $this->id." AND procurement.id = ".$this->procurement->get('id')." AND procurement_item.intranet_id = ".$this->procurement->kernel->intranet->get("id"));
         if ($db->nextRecord()) {
             $this->value["id"] = $db->f("id");
             $this->value["product_id"] = $db->f("product_id");
@@ -282,20 +282,20 @@ 
             exit;
         }
 
-        $sql = "product_id = " . $product->getId() . ",
-                product_detail_id = " . $product_detail_id . ",
-                product_variation_id = " . $variation_id . ",
-                product_variation_detail_id = " . $variation_detail_id . ",
-                quantity = " . $input["quantity"] . ",
+        $sql = "product_id = ".$product->getId().",
+                product_detail_id = " . $product_detail_id.",
+                product_variation_id = " . $variation_id.",
+                product_variation_detail_id = " . $variation_detail_id.",
+                quantity = " . $input["quantity"].",
                 unit_purchase_price = " . $input["unit_purchase_price"];
 
         $db = new DB_Sql;
 
         if ($this->id == 0) {
-            $db->query("INSERT INTO procurement_item SET " . $sql . ", intranet_id = " . $this->procurement->kernel->intranet->get("id") . ", procurement_id = " . $this->procurement->get("id") . ", active = 1");
+            $db->query("INSERT INTO procurement_item SET ".$sql.", intranet_id = ".$this->procurement->kernel->intranet->get("id").", procurement_id = ".$this->procurement->get("id").", active = 1");
             $this->id = $db->InsertedId();
         } else {
-            $db->query("UPDATE procurement_item SET " . $sql . " WHERE id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id") . " AND intranet_id = " . $this->procurement->kernel->intranet->get("id"));
+            $db->query("UPDATE procurement_item SET ".$sql." WHERE id = ".$this->id." AND procurement_id = ".$this->procurement->get("id")." AND intranet_id = ".$this->procurement->kernel->intranet->get("id"));
         }
 
         return $this->id;
@@ -323,10 +323,10 @@ 
             return false;
         }
 
-        $sql = "unit_purchase_price = " . $unit_purchase_price->get();
+        $sql = "unit_purchase_price = ".$unit_purchase_price->get();
 
         $db = new DB_Sql;
-        $db->query("UPDATE procurement_item SET " . $sql . " WHERE id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id") . " AND intranet_id = " . $this->procurement->kernel->intranet->get("id"));
+        $db->query("UPDATE procurement_item SET ".$sql." WHERE id = ".$this->id." AND procurement_id = ".$this->procurement->get("id")." AND intranet_id = ".$this->procurement->kernel->intranet->get("id"));
         return true;
     }
 
@@ -376,7 +376,7 @@ 
             product_variation_detail_id = ".$variation_detail_id;
 
         $db = new DB_Sql;
-        $db->query("UPDATE procurement_item SET " . $sql . " WHERE id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id") . " AND intranet_id = " . $this->procurement->kernel->intranet->get("id"));
+        $db->query("UPDATE procurement_item SET ".$sql." WHERE id = ".$this->id." AND procurement_id = ".$this->procurement->get("id")." AND intranet_id = ".$this->procurement->kernel->intranet->get("id"));
 
         return true;
     }
@@ -388,7 +388,7 @@ 
     public function delete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE procurement_item SET active = 0 WHERE intranet_id = " . $this->procurement->kernel->intranet->get('id') . " AND id = " . $this->id . " AND procurement_id = " . $this->procurement->get("id"));
+        $db->query("UPDATE procurement_item SET active = 0 WHERE intranet_id = ".$this->procurement->kernel->intranet->get('id')." AND id = ".$this->id." AND procurement_id = ".$this->procurement->get("id"));
         $this->id = 0;
 
         return 1;
@@ -402,13 +402,13 @@ 
     public function getList()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM procurement_item WHERE active = 1 AND intranet_id = " . $this->procurement->kernel->intranet->get("id") . " AND procurement_id = " . $this->procurement->get("id") . " ORDER BY id ASC");
+        $db->query("SELECT * FROM procurement_item WHERE active = 1 AND intranet_id = ".$this->procurement->kernel->intranet->get("id")." AND procurement_id = ".$this->procurement->get("id")." ORDER BY id ASC");
         $i = 0;
-        $item = array ();
+        $item = array();
 
         if ($this->procurement->get("price_items") > 0) {
             // calculates shipment etc per item price kr
-            $calculated = $this->procurement->get("price_shipment_etc") / $this->procurement->get("price_items");
+            $calculated = $this->procurement->get("price_shipment_etc")/$this->procurement->get("price_items");
         } else {
             $calculated = 0;
         }
@@ -424,17 +424,17 @@ 
                 $item[$i]["unit"] = $unit['plural'];
             }
             $item[$i]["unit_purchase_price"] = $db->f("unit_purchase_price");
-            $item[$i]["calculated_unit_price"] = $db->f("unit_purchase_price") + $db->f("unit_purchase_price") * $calculated;
+            $item[$i]["calculated_unit_price"] = $db->f("unit_purchase_price") + $db->f("unit_purchase_price")*$calculated;
             $item[$i]["quantity"] = $db->f("quantity");
             $item[$i]["vat"] = $product->get("vat");
             $item[$i]["product_id"] = $product->get("id");
-            $item[$i]["amount"] = $db->f("quantity") * $db->f("unit_purchase_price");
+            $item[$i]["amount"] = $db->f("quantity")*$db->f("unit_purchase_price");
 
             if ($product->get('has_variation')) {
                 $variation = $product->getVariation($db->f('product_variation_id'));
                 $detail = $variation->getDetail($db->f('product_variation_detail_id'));
                 $item[$i]["name"] = $product->get("name").' - '.$variation->getName();
-                $item[$i]["number"]= $product->get("number").'.'.$variation->getNumber();
+                $item[$i]["number"] = $product->get("number").'.'.$variation->getNumber();
                 $item[$i]["price"] = $detail->getPrice($product);
             } else {
                 $item[$i]["name"] = $product->get("name");
@@ -451,7 +451,7 @@ 
      */
     public function getQuantity($status, $product_id, $product_variation_id, $from_date = "")
     {
-        if (!in_array($status, array (
+        if (!in_array($status, array(
                 'ordered',
                 'delivered'
             ))) {
@@ -465,8 +465,8 @@ 
                         FROM procurement_item INNER JOIN procurement
                             ON procurement_item.procurement_id = procurement.id
                         WHERE procurement_item.active = 1 AND procurement.active = 1
-                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id") . " AND procurement.intranet_id = " . $this->procurement->kernel->intranet->get("id") . "
-                            AND procurement_item.product_id = " . $product_id . " AND procurement.status_key = 0
+                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id")." AND procurement.intranet_id = ".$this->procurement->kernel->intranet->get("id")."
+                            AND procurement_item.product_id = " . $product_id." AND procurement.status_key = 0
                             AND procurement_item.product_variation_id = ".$product_variation_id);
             $db->nextRecord(); // a post will always be present
             return intval($db->f("on_order"));
@@ -476,11 +476,11 @@ 
                         FROM procurement_item INNER JOIN procurement
                             ON procurement_item.procurement_id = procurement.id
                         WHERE procurement_item.active = 1 AND procurement.active = 1
-                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id") . " AND procurement.intranet_id = " . $this->procurement->kernel->intranet->get("id") . "
-                            AND procurement_item.product_id = " . $product_id . "
+                            AND procurement_item.intranet_id = " . $this->procurement->kernel->intranet->get("id")." AND procurement.intranet_id = ".$this->procurement->kernel->intranet->get("id")."
+                            AND procurement_item.product_id = " . $product_id."
                             AND procurement_item.product_variation_id = ".$product_variation_id."
                             AND procurement.status_key = 1
-                            AND procurement.date_recieved > \"" . $from_date . "\"");
+                            AND procurement.date_recieved > \"" . $from_date."\"");
             $db->nextRecord(); // a post will always be present
             return intval($db->f("stock_in"));
         }

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