intraface / intraface.dk

src/Intraface/modules/shop/DiscountCampaignGateway.php

Doc Comments +1 added lines

@@ -65,6 +65,7 @@
     /**
      * Find a variation from id
      * 
+     * @param integer $id
      * @return object Intraface_modules_product_Variation_OneAttributeGroup or Intraface_modules_product_Variation_TwoAttributeGroups
      */
     public function findById($id)

src/Intraface/modules/shop/Shop.php

Doc Comments +3 added lines

@@ -87,6 +87,9 @@
         return 'Create';
     }
 
+    /**
+     * @return string
+     */
     function getType()
     {
         return $this->context->context->getType();

src/Intraface/modules/todo/TodoItem.php

Doc Comments +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
     /**
      * Constructor
      *
-     * @param object  $todo Todo liste
+     * @param TodoList  $todo Todo liste
      * @param integer $id   Id for item
      *
      * @return void
@@ -159,7 +159,7 @@ 
      *
      * @param object $db Database object
      *
-     * @return object
+     * @return Ilib_Position
      */
     public function getPosition($db)
     {

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

Doc Comments +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
      *
      * @param integer $id Id for specific item
      *
-     * @return array
+     * @return TodoItem
      */
     public function getItem($id = 0)
     {
@@ -124,7 +124,7 @@ 
      *
      * @deprecated
      *
-     * @return array
+     * @return TodoItem
      */
     private function loadItem($id = 0)
     {

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/webshop/BasketEvaluation.php

Doc Comments +3 added lines

@@ -112,6 +112,9 @@
         return true;
     }
 
+    /**
+     * @param Struct $input
+     */
     function validate($input)
     {
         $validator = new Intraface_Validator($this->error);

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;

Indentation +9 added lines, -9 removed lines

@@ -147,15 +147,15 @@
         }
 
         $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');
+                    "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->db->quote($this->intranet->getId(), 'integer')." AND id = ".$this->db->quote($this->id, 'integer')  . " AND shop_id = ".$this->db->quote($this->shop->getId(), 'integer'));

src/Intraface/modules/webshop/Webshop.php

Doc Comments +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
     /**
      * Construktor
      *
-     * @param object $kernel     Kernel object
+     * @param Intraface_Kernel $kernel     Kernel object
      * @param string $session_id Unikt session id
      *
      * @return void
@@ -79,7 +79,7 @@ 
     /**
      * Convenience method to create the basket
      *
-     * @return object
+     * @return Basket
      */
     private function createBasket()
     {
@@ -325,9 +325,9 @@ 
      * @param integer $order_id
      * @param integer $transaction_number
      * @param integer $transaction_status
-     * @param float   $transaction_amount
+     * @param integer $amount
      *
-     * @return boolean
+     * @return integer
      */
     public function addOnlinePayment($order_id, $transaction_number, $transaction_status, $amount)
     {

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

Doc Comments +2 added lines, -2 removed lines

@@ -142,7 +142,7 @@ 
     /**
      * Creates a redirect object on the go page
      *
-     * @param object $kernel kernel
+     * @param FakeRedirectKernel $kernel kernel
      * @param string $query_variable the variable used in the querystring for going to the redirect page
      * @param string $query_return_variable the variable  used in the querystring when returning from the redirect page.
      *
@@ -191,7 +191,7 @@ 
      * @param string $query_variable the variable used in the querystring for going to the redirect page
      * @param string $query_return_variable the variable  used in the querystring when returning from the redirect page.
      *
-     * @return object
+     * @return string
      */
     static function factory($kernel, $type, $query_variable = 'redirect_id', $query_return_variable = 'return_redirect_id')
     {

Indentation +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
     public function __construct($kernel, $id = 0)
     {
         $options = array(
-             'extra_db_condition' => array('intranet_id = '.$kernel->intranet->get('id'))
+                'extra_db_condition' => array('intranet_id = '.$kernel->intranet->get('id'))
         );
 
         $db = MDB2::singleton(DB_DSN);

src/Intraface/Setting.php

Doc Comments +1 added lines

@@ -115,6 +115,7 @@
      * @param string  $type    Can be either system, intranet, user
      * @param string  $setting The actual setting
      * @param integer $sub_id  @todo What is this exactly
+     * @param integer $value
      *
      * @return boolean
      */

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
     {
         global $_setting;
 
-        require_once dirname(__FILE__) . '/config/setting_kernel.php';
+        require_once dirname(__FILE__).'/config/setting_kernel.php';
 
         $this->db = new DB_Sql;
         $this->system = &$_setting; // don't remove the & - otherwise it will not work
@@ -170,7 +170,7 @@ 
     private function loadSettings()
     {
         $this->settings = array();
-        $this->db->query("SELECT setting, value, sub_id, user_id FROM setting WHERE intranet_id = " . $this->db->quote($this->intranet_id, 'integer')." AND (user_id = ".$this->db->quote($this->user_id, 'integer')." OR user_id = 0)");
+        $this->db->query("SELECT setting, value, sub_id, user_id FROM setting WHERE intranet_id = ".$this->db->quote($this->intranet_id, 'integer')." AND (user_id = ".$this->db->quote($this->user_id, 'integer')." OR user_id = 0)");
         while ($this->db->nextRecord()) {
             $this->settings[$this->intranet_id][$this->db->f('user_id')][$this->db->f('setting')][$this->db->f('sub_id')] = $this->db->f('value');
         }

src/Intraface/shared/keyword/Keyword.php

Doc Comments +1 added lines, -1 removed lines

@@ -272,7 +272,7 @@
     /**
      * Adds keyword to object
      *
-     * @param integer $keyword_id
+     * @param integer $keyword
      *
      * @return boolean
      */

Spacing +18 added lines, -18 removed lines

@@ -63,7 +63,7 @@ 
         $condition['keyword.type'] = $this->type;
 
         foreach ($condition as $column => $value) {
-            $c[] = $column . " = '" . $value . "'";
+            $c[] = $column." = '".$value."'";
         }
 
         $db = new DB_Sql;
@@ -127,7 +127,7 @@ 
         $condition['active'] = 1;
 
         foreach ($condition as $column => $value) {
-            $c[] = $column . " = '" . $value . "'";
+            $c[] = $column." = '".$value."'";
         }
 
         $db = new DB_Sql;
@@ -148,11 +148,11 @@ 
             $condition['type'] = $this->type;
 
             foreach ($condition as $column => $value) {
-                $c[] = $column . " = '" . $value . "'";
+                $c[] = $column." = '".$value."'";
             }
 
             $sql_type = 'UPDATE ';
-            $sql_end = ' WHERE ' . implode(' AND ', $c);
+            $sql_end = ' WHERE '.implode(' AND ', $c);
         } else {
             $c = array();
             $condition = array();
@@ -160,14 +160,14 @@ 
             $condition['type'] = $this->type;
 
             foreach ($condition as $column => $value) {
-                $c[] = $column . " = '" . $value . "'";
+                $c[] = $column." = '".$value."'";
             }
 
             $sql_type = "INSERT INTO ";
-            $sql_end = ", " . implode(', ', $c);
+            $sql_end = ", ".implode(', ', $c);
         }
 
-        $sql = $sql_type . "keyword SET keyword = '".$var['keyword']."'" . $sql_end;
+        $sql = $sql_type."keyword SET keyword = '".$var['keyword']."'".$sql_end;
         $db->query($sql);
 
         if ($this->id == 0) {
@@ -192,7 +192,7 @@ 
         $condition['id'] = $this->id;
         $condition['type'] = $this->type;
         foreach ($condition as $column => $value) {
-            $c[] = $column . " = '" . $value . "'";
+            $c[] = $column." = '".$value."'";
         }
 
         $db = new DB_Sql;
@@ -215,11 +215,11 @@ 
         $condition['keyword.type'] = $this->type;
         $condition['keyword.active'] = 1;
         foreach ($condition as $column => $value) {
-            $c[] = $column . " = '" . $value . "'";
+            $c[] = $column." = '".$value."'";
         }
 
         $sql = "SELECT * FROM keyword
-            WHERE " . implode(' AND ', $c) . "
+            WHERE " . implode(' AND ', $c)."
             ORDER BY keyword ASC";
         $db = new DB_Sql;
         $db->query($sql);
@@ -283,7 +283,7 @@ 
         $condition['keyword_x_object.belong_to'] = $this->getBelongToId();
 
         foreach ($condition as $column => $value) {
-            $c[] = $column . " = '" . $value . "'";
+            $c[] = $column." = '".$value."'";
         }
 
         $sql = "SELECT * FROM keyword_x_object
@@ -333,7 +333,7 @@ 
         $condition['keyword.active'] = 1;
 
         foreach ($condition as $column => $value) {
-            $c[] = $column . " = '" . $value . "'";
+            $c[] = $column." = '".$value."'";
         }
 
         $db = new DB_Sql;
@@ -341,7 +341,7 @@ 
             FROM keyword_x_object x
             INNER JOIN keyword keyword
                 ON x.keyword_id = keyword.id
-            WHERE " . implode(' AND ', $c) . "
+            WHERE " . implode(' AND ', $c)."
             ORDER BY keyword ASC");
 
         $i = 0;
@@ -374,7 +374,7 @@ 
         $condition['keyword_x_object.belong_to'] = $this->getBelongToId();
 
         foreach ($condition as $column => $value) {
-            $c[] = $column . " = '" . $value . "'";
+            $c[] = $column." = '".$value."'";
         }
 
         $db = new DB_Sql;
@@ -382,7 +382,7 @@ 
                 FROM keyword_x_object
                 INNER JOIN keyword
                     ON keyword_x_object.keyword_id = keyword.id
-                WHERE " . implode(' AND ', $c) . " AND keyword.keyword != ''
+                WHERE " . implode(' AND ', $c)." AND keyword.keyword != ''
                 ORDER BY keyword.keyword";
         $db->query($sql);
 
@@ -414,7 +414,7 @@ 
         $condition['keyword_x_object.belong_to'] = $this->getBelongToId();
 
         foreach ($condition as $column => $value) {
-            $c[] = $column . " = '" . $value . "'";
+            $c[] = $column." = '".$value."'";
         }
 
 
@@ -502,7 +502,7 @@ 
         $result = array();
 
         while (list($arg, $val) = each($getstrings)) {
-            if ($instring==1) {
+            if ($instring == 1) {
                 //Add the whole string, untouched to the result array.
                 if (!empty($val)) {
                     $result[] = $val;
@@ -511,7 +511,7 @@ 
             } else {
                 //Break up the string according to the delimiter character
                 //Each string has extraneous delimiters around it (inc the ones we added above), so they need to be stripped off
-                $temparray = explode($splitter, substr($val, $delimlen, strlen($val)-$delimlen-$delimlen));
+                $temparray = explode($splitter, substr($val, $delimlen, strlen($val) - $delimlen - $delimlen));
 
                 while (list($iarg, $ival) = each($temparray)) {
                     if (!empty($ival)) {