intraface / intraface.dk

src/Intraface/modules/webshop/Basket.php

Doc Comments +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
      * @param integer $product_id Product to remove
      * @param integer $quantity   How many should be removed
      *
-     * @return boelean
+     * @return boolean
      */
     public function remove($product_id, $quantity = 1)
     {

Spacing +44 added lines, -44 removed lines

@@ -56,13 +56,13 @@ 
         }
 
         $this->webshop = $webshop;
-        $this->sql_extra = " session_id = '" . safeToDb($session_id) . "'";
+        $this->sql_extra = " session_id = '".safeToDb($session_id)."'";
 
         // rydder op i databasen efter fx to timer
         $clean_up_after = 2; // timer
 
         $db = new DB_Sql;
-        $db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL " . $clean_up_after . " HOUR) < NOW()");
+        $db->query("DELETE FROM basket WHERE DATE_ADD(date_changed, INTERVAL ".$clean_up_after." HOUR) < NOW()");
     }
 
     /**
@@ -128,27 +128,27 @@ 
         }
 
         $db->query("SELECT id, quantity FROM basket WHERE product_id = $product_id
-                AND product_detail_id = " . $product_detail_id . "
-                AND basketevaluation_product = " . $basketevaluation . "
-                AND " . $this->sql_extra. "
+                AND product_detail_id = ".$product_detail_id."
+                AND basketevaluation_product = " . $basketevaluation."
+                AND " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
 
         if ($db->nextRecord()) {
             if ($quantity == 0) {
                 $db->query("DELETE FROM basket
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
-                        AND " . $this->sql_extra . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
+                        AND " . $this->sql_extra."
                         AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
             } else {
                 $db->query("UPDATE basket SET
                     quantity = $quantity,
                     date_changed = NOW(),
                     text = '".$text."'
-                    WHERE id = ".$db->f('id') . "
-                        AND basketevaluation_product = " . $basketevaluation . "
+                    WHERE id = ".$db->f('id')."
+                        AND basketevaluation_product = " . $basketevaluation."
 
-                        AND " . $this->sql_extra . "
+                        AND " . $this->sql_extra."
                         AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
             }
             return true;
@@ -158,10 +158,10 @@ 
                         quantity = $quantity,
                         date_changed = NOW(),
                         text = '".$text."',
-                        basketevaluation_product = " . $basketevaluation . ",
+                        basketevaluation_product = " . $basketevaluation.",
                         product_id = $product_id,
                         product_detail_id = ".$product_detail_id.",
-                        intranet_id = " . $this->webshop->kernel->intranet->get('id') . ",
+                        intranet_id = " . $this->webshop->kernel->intranet->get('id').",
                         " . $this->sql_extra);
             return true;
         }
@@ -186,10 +186,10 @@ 
         settype($input['email'], 'string');
         settype($input['phone'], 'string');
 
-        $sql = "name = \"".safeToDb($input['name'])."\"," .
-            "contactperson = \"".safeToDb($input['contactperson'])."\", " .
-            "address = \"".safeToDb($input['address'])."\", " .
-            "postcode = \"".safeToDb($input['postcode'])."\", " .
+        $sql = "name = \"".safeToDb($input['name'])."\",".
+            "contactperson = \"".safeToDb($input['contactperson'])."\", ".
+            "address = \"".safeToDb($input['address'])."\", ".
+            "postcode = \"".safeToDb($input['postcode'])."\", ".
             "city = \"".safeToDb($input['city'])."\", ".
             "country = \"".safeToDb($input['country'])."\", ".
             "cvr = \"".safeToDb($input['cvr'])."\", ".
@@ -252,13 +252,13 @@ 
     {
 
         $db = new DB_Sql;
-        $db->query("SELECT id FROM basket_details WHERE " . $this->sql_extra. "
+        $db->query("SELECT id FROM basket_details WHERE ".$this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if ($db->nextRecord()) {
             $db->query("UPDATE basket_details SET ".$sql.",
                 date_changed = NOW()
-                WHERE id = ".$db->f('id') . "
-                    AND " . $this->sql_extra . "
+                WHERE id = ".$db->f('id')."
+                    AND " . $this->sql_extra."
                     AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
             return true;
         } else {
@@ -266,7 +266,7 @@ 
                     SET ".$sql.",
                         date_changed = NOW(),
                            date_created = NOW(),
-                        intranet_id = " . $this->webshop->kernel->intranet->get('id') . ",
+                        intranet_id = " . $this->webshop->kernel->intranet->get('id').",
                         " . $this->sql_extra);
 
             return true;
@@ -285,7 +285,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -314,7 +314,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_coupon
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -335,7 +335,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_ean
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -356,7 +356,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT customer_comment
             FROM basket_details
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND intranet_id = " . $this->webshop->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return array();
@@ -379,9 +379,9 @@ 
         $db = new DB_Sql;
         $db->query("SELECT *
             FROM basket
-            WHERE " . $this->sql_extra . "
-                AND product_id = " . $product_id . "
-                AND intranet_id = " . $this->webshop->kernel->intranet->get('id') . "
+            WHERE " . $this->sql_extra."
+                AND product_id = " . $product_id."
+                AND intranet_id = " . $this->webshop->kernel->intranet->get('id')."
       AND quantity > 0 LIMIT 1");
 
         if (!$db->nextRecord()) {
@@ -401,14 +401,14 @@ 
         $price = 0;
 
         $db = new DB_Sql;
-        $db->query("SELECT product_id, quantity FROM basket WHERE " . $this->sql_extra);
+        $db->query("SELECT product_id, quantity FROM basket WHERE ".$this->sql_extra);
 
         while ($db->nextRecord()) {
             $product = new Product($this->webshop->kernel, $db->f("product_id"));
             if ($type == 'exclusive_vat') {
-                $price += $product->get('price') * $db->f("quantity");
+                $price += $product->get('price')*$db->f("quantity");
             } else {
-                $price += $product->get('price_incl_vat') * $db->f("quantity");
+                $price += $product->get('price_incl_vat')*$db->f("quantity");
             }
         }
 
@@ -432,9 +432,9 @@ 
                 ON product.id = basket.product_id
             INNER JOIN product_detail
                 ON product.id = product_detail.product_id
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND product_detail.active = 1
-                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id") . "
+                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id")."
                 AND basket.quantity > 0
             ");
 
@@ -442,7 +442,7 @@ 
         $weight = 0;
 
         while ($db->nextRecord()) {
-            $weight += $db->f('weight') * $db->f('quantity');
+            $weight += $db->f('weight')*$db->f('quantity');
         }
 
         return $weight;
@@ -471,9 +471,9 @@ 
                 ON product.id = basket.product_id
             INNER JOIN product_detail
                 ON product.id = product_detail.product_id
-            WHERE " . $this->sql_extra . "
+            WHERE " . $this->sql_extra."
                 AND product_detail.active = 1
-                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id") . "
+                AND basket.intranet_id = " . $this->webshop->kernel->intranet->get("id")."
             ORDER BY product_detail.vat DESC, basket.basketevaluation_product");
 
         $i = 0;
@@ -493,8 +493,8 @@ 
 
             // basket specific
             $items[$i]['quantity'] = $db->f('quantity');
-            $items[$i]['totalprice'] = $db->f('quantity') * $items[$i]['price'];
-            $items[$i]['totalprice_incl_vat'] = $db->f('quantity') * $items[$i]['price_incl_vat'];
+            $items[$i]['totalprice'] = $db->f('quantity')*$items[$i]['price'];
+            $items[$i]['totalprice_incl_vat'] = $db->f('quantity')*$items[$i]['price_incl_vat'];
 
             $i++;
         }
@@ -511,10 +511,10 @@ 
     public function removeEvaluationProducts()
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM basket " .
-                "WHERE basketevaluation_product = 1 " .
-                    "AND " . $this->sql_extra . " " .
-                    "AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
+        $db->query("DELETE FROM basket ".
+                "WHERE basketevaluation_product = 1 ".
+                    "AND ".$this->sql_extra." ".
+                    "AND intranet_id = ".$this->webshop->kernel->intranet->get("id"));
         return true;
 
     }
@@ -527,8 +527,8 @@ 
     public function reset()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE basket SET session_id = '' WHERE " . $this->sql_extra . " AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
-        $db->query("UPDATE basket_details SET session_id = '' WHERE " . $this->sql_extra . " AND intranet_id = " . $this->webshop->kernel->intranet->get("id"));
+        $db->query("UPDATE basket SET session_id = '' WHERE ".$this->sql_extra." AND intranet_id = ".$this->webshop->kernel->intranet->get("id"));
+        $db->query("UPDATE basket_details SET session_id = '' WHERE ".$this->sql_extra." AND intranet_id = ".$this->webshop->kernel->intranet->get("id"));
 
         return true;
     }

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

Indentation +9 added lines, -9 removed lines

@@ -153,15 +153,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->kernel->intranet->get('id')." AND id = ".$this->id);

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

src/Intraface/User.php

Doc Comments +7 added lines, -3 removed lines

@@ -104,7 +104,7 @@ 
     /**
      * Load
      *
-     * @return void
+     * @return integer
      */
     protected function load()
     {
@@ -256,7 +256,7 @@ 
      * @param integer $module
      * @param integer $intranet_id
      *
-     * @return integer
+     * @return boolean
      */
     public function hasModuleAccess($module, $intranet_id = 0)
     {
@@ -459,6 +459,7 @@ 
     /**
      * Sets active intranet_id
      *
+     * @param integer $id
      * @return boolean
      */
     public function setActiveIntranetId($id)
@@ -500,7 +501,7 @@ 
      *
      * @param array $input
      *
-     * @return boolean
+     * @return boolean|null
      */
     protected function validate(&$input)
     {
@@ -553,6 +554,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $email
+     */
     function generateNewPassword($email)
     {
         if (!Validate::email($email)) {

Spacing +8 added lines, -8 removed lines

@@ -85,7 +85,7 @@ 
         $this->error       = $this->getError();
 
         if (PEAR::isError($this->db)) {
-            throw new Exception($this->db->getMessage() . $this->db->getUserInfo());
+            throw new Exception($this->db->getMessage().$this->db->getUserInfo());
         }
 
         if ($this->id > 0) {
@@ -108,7 +108,7 @@ 
      */
     protected function load()
     {
-        $result = $this->db->query("SELECT id, email, disabled FROM user WHERE id = " . $this->db->quote($this->id, 'integer'));
+        $result = $this->db->query("SELECT id, email, disabled FROM user WHERE id = ".$this->db->quote($this->id, 'integer'));
 
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
@@ -200,7 +200,7 @@ 
         if (!empty($this->modules[$module])) {
             return $module_id = $this->modules[$module];
         } else {
-            throw new Exception('user says unknown module ' . $module);
+            throw new Exception('user says unknown module '.$module);
         }
     }
 
@@ -260,7 +260,7 @@ 
      */
     public function hasModuleAccess($module, $intranet_id = 0)
     {
-        $filename = PATH_INCLUDE_MODULE . $module . '/Main' . ucfirst($module) . '.php';
+        $filename = PATH_INCLUDE_MODULE.$module.'/Main'.ucfirst($module).'.php';
         if (file_exists($filename)) {
             require_once $filename;
             $module_class = 'Main'.ucfirst($module);
@@ -465,7 +465,7 @@ 
     {
         $id = intval($id);
         if ($this->hasIntranetAccess($id)) {
-            $this->db->exec("UPDATE user SET active_intranet_id = ". $this->db->quote($id, 'integer')." WHERE id = ". $this->db->quote($this->get('id'), 'integer'));
+            $this->db->exec("UPDATE user SET active_intranet_id = ".$this->db->quote($id, 'integer')." WHERE id = ".$this->db->quote($this->get('id'), 'integer'));
             return $id;
         }
         return false;
@@ -569,7 +569,7 @@ 
         $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
         $new_password = Intraface_Kernel::randomKey(8);
 
-        $db->exec("UPDATE user SET password = '".md5($new_password)."' WHERE id =" . $row['id']);
+        $db->exec("UPDATE user SET password = '".md5($new_password)."' WHERE id =".$row['id']);
 
         return $new_password;
     }
@@ -580,7 +580,7 @@ 
             return false;
         }
 
-        $result = $this->db->query("SELECT * FROM user WHERE password = '".safeToDb(md5($old_password))."' AND id = " . $this->get('id'));
+        $result = $this->db->query("SELECT * FROM user WHERE password = '".safeToDb(md5($old_password))."' AND id = ".$this->get('id'));
         if ($result->numRows() < 1) {
             $this->error->set('error in old password');
         }
@@ -596,7 +596,7 @@ 
             return false;
         }
 
-        $this->db->query("UPDATE user SET password = '".safeToDb(md5($new_password))."' WHERE id = " . $this->get('id'));
+        $this->db->query("UPDATE user SET password = '".safeToDb(md5($new_password))."' WHERE id = ".$this->get('id'));
 
         return true;
 

src/Intraface/Weblogin.php

Doc Comments +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     /**
      * Constructor
      *
-     * @param $session_id Session id
+     * @param string $session_id Session id
      * @param $intranet   Intranet
      *
      * @return void

src/Intraface/XMLRPC/Shop/Server.php

Doc Comments +2 added lines, -2 removed lines

@@ -260,7 +260,7 @@ 
      * @param string  $text              Extra text to the itemline
      * @param integer $product_detail_id Product detail id
      *
-     * @return mixed
+     * @return boolean
      */
     public function changeProductInBasket($credentials, $product_id, $quantity, $text = '', $product_detail_id = 0)
     {
@@ -607,7 +607,7 @@ 
      *
      * @param struct $credentials Credentials to use the server
      *
-     * @return array
+     * @return boolean
      */
     private function checkCredentials($credentials)
     {

Indentation +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
         return $product->getRelatedProducts();
     }
 
-   /**
+    /**
      * Gets featured products
      *
      * Method is experimental and only used by discimport.dk. If you need to use it
@@ -199,7 +199,7 @@ 
 
     }
 
-   /**
+    /**
      * Gets product keywords which can be used to sort ones webshop
      *
      * Method is experimental and only used by nylivsstil.dk. If you need to use it

Spacing +15 added lines, -15 removed lines

@@ -57,34 +57,34 @@ 
 
 
         // sublevel has to be used so other searches are not overwritten
-        $product->getDBQuery()->storeResult('use_stored', 'webshop_' . $area . '_' .  md5($this->credentials['session_id']), 'sublevel');
+        $product->getDBQuery()->storeResult('use_stored', 'webshop_'.$area.'_'.md5($this->credentials['session_id']), 'sublevel');
         $debug2 = serialize($mixed);
         if (isset($mixed['offset']) and array_key_exists('offset', $mixed) and is_numeric($mixed['offset'])) {
             $product->getDBQuery()->useStored(true);
             $product->getDBQuery()->setPagingOffset((int)$mixed['offset']);
-            $debug2 .= 'offset ' . $mixed['offset'];
+            $debug2 .= 'offset '.$mixed['offset'];
         } elseif (isset($mixed['use_stored']) and array_key_exists('use_stored', $mixed) and $mixed['use_stored'] == 'true') {
             $product->getDBQuery()->useStored(true);
             $debug2 .= 'use_stored true';
         } else {
             if (isset($mixed['search']) and array_key_exists('search', $mixed) and !empty($mixed['search'])) {
                 $product->getDBQuery()->setFilter('search', $mixed['search']);
-                $debug2 .= 'search ' . $mixed['search'];
+                $debug2 .= 'search '.$mixed['search'];
             }
 
             if (isset($mixed['keywords']) and array_key_exists('keywords', $mixed) and !empty($mixed['keywords'])) {
                 $product->getDBQuery()->setFilter('keywords', $mixed['keywords']);
-                $debug2 .= 'keyword ' . $mixed['keywords'];
+                $debug2 .= 'keyword '.$mixed['keywords'];
             }
 
             if (isset($mixed['ids']) and array_key_exists('ids', $mixed) and is_array($mixed['ids'])) {
                 $product->getDBQuery()->setFilter('ids', $mixed['ids']);
-                $debug2 .= 'ids ' . implode(', ', $mixed['ids']);
+                $debug2 .= 'ids '.implode(', ', $mixed['ids']);
             }
 
             if (isset($mixed['sorting']) and array_key_exists('sorting', $mixed) and !empty($mixed['sorting'])) {
                 $product->getDBQuery()->setFilter('sorting', $mixed['sorting']);
-                $debug2 .= 'sorting ' . $mixed['sorting'];
+                $debug2 .= 'sorting '.$mixed['sorting'];
             }
         }
 
@@ -176,7 +176,7 @@ 
 
         if (PEAR::isError($db)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException($db->getMessage() . $db->getUserInfo(), -1);
+            throw new XML_RPC2_FaultException($db->getMessage().$db->getUserInfo(), -1);
         }
 
         $featured = new Intraface_Webshop_FeaturedProducts($this->kernel->intranet, $db);
@@ -347,7 +347,7 @@ 
 
         if (!$order_id = $this->webshop->placeOrder($values)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('order could not be placed. It returned the following error: ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('order could not be placed. It returned the following error: '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
         }
 
         return $order_id;
@@ -384,7 +384,7 @@ 
 
         if (!$payment_id = $onlinepayment->save($values)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('Onlinebetaling kunne ikke blive gemt' . strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('Onlinebetaling kunne ikke blive gemt'.strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);
         }
 
         return $payment_id;
@@ -415,7 +415,7 @@ 
 
         if (!$payment_id = $onlinepayment->create()) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('onlinepayment could not be created' . strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('onlinepayment could not be created'.strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);
         }
 
         return $payment_id;
@@ -444,7 +444,7 @@ 
 
         if (!$this->webshop->basket->saveAddress($values)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
         }
 
         return true;
@@ -483,7 +483,7 @@ 
         $customer_coupon = $this->utf8Decode($customer_coupon);
         if (!$this->webshop->basket->saveCustomerCoupon($customer_coupon)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
         }
 
         return true;
@@ -523,7 +523,7 @@ 
         $customer_ean = $this->utf8Decode($customer_ean);
         if (!$this->webshop->basket->saveCustomerEan($customer_ean)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('ean could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('ean could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
         }
 
         return true;
@@ -563,7 +563,7 @@ 
         $customer_comment = $this->utf8Decode($customer_comment);
         if (!$this->webshop->basket->saveCustomerComment($customer_comment)) {
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('datails could not be saved ' . strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
+            throw new XML_RPC2_FaultException('datails could not be saved '.strtolower(implode(', ', $this->webshop->error->getMessage())), -4);
         }
 
         return true;
@@ -615,7 +615,7 @@ 
 
         if (count($credentials) != 2) { // -4
             require_once 'XML/RPC2/Exception.php';
-            throw new XML_RPC2_FaultException('wrong argument count in $credentials - got ' . count($credentials) . ' arguments - need 2', -4);
+            throw new XML_RPC2_FaultException('wrong argument count in $credentials - got '.count($credentials).' arguments - need 2', -4);
         }
         if (empty($credentials['private_key'])) { // -5
             require_once 'XML/RPC2/Exception.php';