intraface / intraface.dk

src/Intraface/modules/webshop/Basket.php

Doc Comments +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      *
      * Konstrukt�ren s�rger ogs� for at rydde op i Kurven.
      *
-     * @param object $webshop    The webshop object
+     * @param Webshop $webshop    The webshop object
      * @param string $session_id A session id
      *
      * @return void
@@ -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'])."\", ".
@@ -251,13 +251,13 @@ 
     public function saveToDb($sql) {
 
         $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 {
@@ -265,7 +265,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;
@@ -284,7 +284,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();
@@ -313,7 +313,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();
@@ -334,7 +334,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();
@@ -355,7 +355,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();
@@ -378,9 +378,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()) {
@@ -400,14 +400,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");
             }
         }
 
@@ -431,9 +431,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
             ");
 
@@ -441,7 +441,7 @@ 
         $weight = 0;
 
         while ($db->nextRecord()) {
-            $weight += $db->f('weight') * $db->f('quantity');
+            $weight += $db->f('weight')*$db->f('quantity');
         }
 
         return $weight;
@@ -470,9 +470,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/FeaturedProducts.php

Doc Comments +2 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
     private $intranet;
 
     /**
-     * @param object $intranet Headline
+     * @param Intraface_Intranet $intranet Headline
      * @param object $db       Databaseobject
      *
      * @return integer
@@ -27,10 +27,9 @@ 
     }
 
     /**
-     * @param string $headline Headline
      * @param object $keyword  Keyword object
      *
-     * @return integer
+     * @return boolean
      */
     function add($description, $keyword)
     {

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
      */
     function add($description, $keyword)
     {
-        $result = $this->db->query('SELECT id FROM shop_featuredproducts WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer') . ' AND keyword_id  = ' . $this->db->quote($keyword->getId(), 'integer'));
+        $result = $this->db->query('SELECT id FROM shop_featuredproducts WHERE intranet_id = '.$this->db->quote($this->intranet->getId(), 'integer').' AND keyword_id  = '.$this->db->quote($keyword->getId(), 'integer'));
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
         }
@@ -61,7 +61,7 @@ 
      */
     function delete($id)
     {
-        $result = $this->db->query('DELETE FROM shop_featuredproducts WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer') . ' AND id  = ' . $this->db->quote($id, 'integer'));
+        $result = $this->db->query('DELETE FROM shop_featuredproducts WHERE intranet_id = '.$this->db->quote($this->intranet->getId(), 'integer').' AND id  = '.$this->db->quote($id, 'integer'));
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
         }
@@ -70,7 +70,7 @@ 
 
     function getAll()
     {
-        $result = $this->db->query('SELECT * FROM shop_featuredproducts WHERE intranet_id = ' . $this->db->quote($this->intranet->getId(), 'integer'));
+        $result = $this->db->query('SELECT * FROM shop_featuredproducts WHERE intranet_id = '.$this->db->quote($this->intranet->getId(), 'integer'));
         if (PEAR::isError($result)) {
             throw new Exception($result->getUserInfo());
         }

src/Intraface/modules/webshop/Webshop.php

Doc Comments +3 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()
     {
@@ -321,9 +321,8 @@ 
      * @param integer $order_id
      * @param integer $transaction_number
      * @param integer $transaction_status
-     * @param float   $transaction_amount
      *
-     * @return boolean
+     * @return integer
      */
     public function addOnlinePayment($order_id, $transaction_number, $transaction_status, $amount)
     {

Spacing +5 added lines, -5 removed lines

@@ -184,12 +184,12 @@ 
 
         if (isset($input['customer_coupon']) && $input['customer_coupon'] != '') {
             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'];
         }
 
 
@@ -297,8 +297,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
@@ -366,7 +366,7 @@ 
      */
     public function getReceiptText()
     {
-        return array('receipt_text' => $this->kernel->setting->get('intranet','webshop.webshop_receipt'));
+        return array('receipt_text' => $this->kernel->setting->get('intranet', 'webshop.webshop_receipt'));
     }
 
     /**

Braces +6 added lines, -2 removed lines

@@ -183,12 +183,16 @@
         $value['message'] = $input['message'];
 
         if (isset($input['customer_coupon']) && $input['customer_coupon'] != '') {
-            if ($value['message'] != '') $value['message'] .= "\n\n";
+            if ($value['message'] != '') {
+                $value['message'] .= "\n\n";
+            }
             $value['message'] .= "Kundekupon:". $input['customer_coupon'];
         }
 
         if (isset($input['customer_comment']) && $input['customer_comment'] != '') {
-            if ($value['message'] != '') $value['message'] .= "\n\n";
+            if ($value['message'] != '') {
+                $value['message'] .= "\n\n";
+            }
             $value['message'] .= "Kommentar:\n". $input['customer_comment'];
         }
 

src/Intraface/Pdf.php

Doc Comments +2 added lines, -1 removed lines

@@ -137,7 +137,7 @@ 
      *
      * @param string $headerImg The filepath for the header image
      *
-     * @return void
+     * @return false|null
      */
     public function addHeader($headerImg = '')
     {
@@ -191,6 +191,7 @@ 
      * write the document to a file
      *
      * @param string $data The data to write
+     * @param string $filnavn
      *
      * @return void
      */

Indentation +7 added lines, -7 removed lines

@@ -42,11 +42,11 @@ 
         // Notice that the placement of the characters are different in the two tables. Placement is correct in the first.
         
         $diff = array(230 => 'ae',
-                      198 => 'AE',
-                      248 => 'oslash',
-                      216 => 'Oslash',
-                      229 => 'aring',
-                      197 => 'Aring');
+                        198 => 'AE',
+                        248 => 'oslash',
+                        216 => 'Oslash',
+                        229 => 'aring',
+                        197 => 'Aring');
 
         parent::selectFont('Helvetica.afm', array('differences' => $diff));
 
@@ -162,7 +162,7 @@ 
         $this->setY(0);
     }
 
-   /**
+    /**
      * create a round rectangle
      *
      * @param integer $x      The starting x point
@@ -187,7 +187,7 @@ 
         parent::partEllipse($x+$width-$round, $y+$round, 270, 360, $round);
     }
 
-   /**
+    /**
      * write the document to a file
      *
      * @param string $data The data to write

Spacing +13 added lines, -13 removed lines

@@ -104,7 +104,7 @@ 
         if (is_int($value)) {
             $this->value['x'] = $this->get('margin_left') + $value;
         } elseif (is_string($value) && substr($value, 0, 1) == "+") {
-            $this->value['x'] +=  intval(substr($value, 1));
+            $this->value['x'] += intval(substr($value, 1));
         } elseif (is_string($value) && substr($value, 0, 1) == "-") {
             $this->value['x'] -= intval(substr($value, 1));
         } else {
@@ -148,12 +148,12 @@ 
         $header = parent::openObject();
         $size = getImageSize($headerImg); // array(0 => width, 1 => height)
 
-        $height = $this->get('header_height');;
-        $width = $size[0] * ($height/$size[1]);
+        $height = $this->get('header_height'); ;
+        $width = $size[0]*($height/$size[1]);
 
         if ($width > $this->get('content_width')) {
             $width = $this->get('content_width');
-            $height = $size[1] * ($width/$size[0]);
+            $height = $size[1]*($width/$size[0]);
         }
         parent::addJpegFromFile($headerImg, $this->get('right_margin_position') - $width, $this->page_height - $this->get('header_margin_top') - $height, $width, $height); // , ($this->value["page_width"] - $this->value["margin_left"])/10
         parent::closeObject();
@@ -176,15 +176,15 @@ 
     public function roundRectangle($x, $y, $width, $height, $round)
     {
         parent::setLineStyle(1);
-        parent::line($x, $y+$round, $x, $y+$height-$round);
-        parent::line($x+$round, $y+$height, $x+$width-$round, $y+$height);
-        parent::line($x+$width, $y+$height-$round, $x+$width, $y+$round-1);
-        parent::line($x+$width-$round, $y, $x+$round, $y);
-
-        parent::partEllipse($x+$round, $y+$round,180, 270, $round);
-        parent::partEllipse($x+$round, $y+$height-$round, 90, 180, $round);
-        parent::partEllipse($x+$width-$round, $y+$height-$round, 0, 90, $round);
-        parent::partEllipse($x+$width-$round, $y+$round, 270, 360, $round);
+        parent::line($x, $y + $round, $x, $y + $height - $round);
+        parent::line($x + $round, $y + $height, $x + $width - $round, $y + $height);
+        parent::line($x + $width, $y + $height - $round, $x + $width, $y + $round - 1);
+        parent::line($x + $width - $round, $y, $x + $round, $y);
+
+        parent::partEllipse($x + $round, $y + $round, 180, 270, $round);
+        parent::partEllipse($x + $round, $y + $height - $round, 90, 180, $round);
+        parent::partEllipse($x + $width - $round, $y + $height - $round, 0, 90, $round);
+        parent::partEllipse($x + $width - $round, $y + $round, 270, 360, $round);
     }
 
    /**

src/Intraface/Shared.php

Doc Comments +4 added lines

@@ -59,6 +59,9 @@ 
         return $this->controlpanel_files;

     }

 

+    /**
+     * @param string $file
+     */
     function addPreloadFile($file)

     {

         $this->preload_file[] = $file;

@@ -81,6 +84,7 @@ 
 

     /**

      * @todo why is this not using getPath()

+     * @param string $file
      */

     function includeSettingFile($file)

     {

src/Intraface/shared/email/Email.php

Doc Comments +1 added lines, -1 removed lines

@@ -351,7 +351,7 @@
      * @param integer $file_id  Id of file in the file system
      * @param string  $filename Which filename to use
      *
-     * @return boolean
+     * @return integer
      */
     function attachFile($file_id, $filename)
     {

Spacing +13 added lines, -13 removed lines

@@ -81,7 +81,7 @@ 
 
         $db = new DB_Sql;
         $db->query('SET NAMES utf8'); /* To be removed when everything is in utf-8 */
-        $sql = "SELECT id, email.date_sent, DATE_FORMAT(date_sent, '%d-%m-%Y') as date_sent_dk, subject, from_name, from_email, user_id, body, status, contact_id, contact_person_id, type_id, belong_to_id, status, bcc_to_user FROM email WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = " . $this->id;
+        $sql = "SELECT id, email.date_sent, DATE_FORMAT(date_sent, '%d-%m-%Y') as date_sent_dk, subject, from_name, from_email, user_id, body, status, contact_id, contact_person_id, type_id, belong_to_id, status, bcc_to_user FROM email WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = ".$this->id;
         $db->query($sql);
         if (!$db->nextRecord()) {
             return false;
@@ -174,12 +174,12 @@ 
         if ($this->id == 0) {
             $sql_type = "INSERT INTO ";
             $sql_end = ", date_created = NOW(),
-                belong_to_id = ".(int)$var['belong_to'] . ",
-                type_id = ".(int)$var['type_id'] . ",
+                belong_to_id = ".(int)$var['belong_to'].",
+                type_id = ".(int)$var['type_id'].",
                 contact_id=".$var['contact_id'];
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         }
 
         if (!empty($var['date_deadline'])) {
@@ -191,7 +191,7 @@ 
         // gemme userid hvis vi er inde i systemet
         if (is_object($this->kernel->user) AND $this->kernel->user->get('id') > 0) {
             //$db->query("UPDATE email SET user_id = ".$this->kernel->user->get('id')." WHERE id = " . $this->id);
-            $sql_extra = ', user_id = ' . $db->quote($this->kernel->user->get('id'), 'integer');
+            $sql_extra = ', user_id = '.$db->quote($this->kernel->user->get('id'), 'integer');
         }
 
         if (!isset($var['contact_person_id'])) {
@@ -203,11 +203,11 @@ 
         }
 
         // status 1 = draft
-        $sql = $sql_type . " email SET
+        $sql = $sql_type." email SET
             contact_person_id = ".(int)$var['contact_person_id'].",
             bcc_to_user = ".(int)$var['bcc_to_user'].",
             date_updated = NOW(),
-            intranet_id = " . $this->kernel->intranet->get('id') . ",
+            intranet_id = " . $this->kernel->intranet->get('id').",
             subject = '".$var['subject']."',
             body = '".$var['body']."',
             date_deadline = ".$date_deadline.",
@@ -245,7 +245,7 @@ 
     function saveErrorMsg($error)
     {
         $db = new DB_Sql;
-        $db->query("UPDATE email SET error_msg = '".$error."' WHERE id = " . $this->id);
+        $db->query("UPDATE email SET error_msg = '".$error."' WHERE id = ".$this->id);
         return true;
     }
 
@@ -260,7 +260,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE email SET status = 3, date_sent = NOW() WHERE id = " . $this->id);
+        $db->query("UPDATE email SET status = 3, date_sent = NOW() WHERE id = ".$this->id);
         return true;
     }
 
@@ -291,7 +291,7 @@ 
 
         $db = new DB_Sql;
         // Putter e-mailen i outboxen (status = 2)
-        $db->query("UPDATE email SET status = 2 WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = " . $this->id);
+        $db->query("UPDATE email SET status = 2 WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = ".$this->id);
         return true;
     }
 
@@ -299,7 +299,7 @@ 
     {
         $contact = $this->getContact();
         if ($this->get('contact_id') == 0 OR !is_object($contact)) {
-            $this->error->set('Der kunne ikke sendes e-mail til email #' . $this->get('id') . ' fordi der ikke var nogen kunde sat');
+            $this->error->set('Der kunne ikke sendes e-mail til email #'.$this->get('id').' fordi der ikke var nogen kunde sat');
             return false;
         }
 
@@ -383,7 +383,7 @@ 
     {
         $db = new DB_Sql;
         $db->query("SELECT file_id, filename FROM email_attachment
-            WHERE intranet_id = " .$this->kernel->intranet->get('id') . " AND email_id = " . $this->id);
+            WHERE intranet_id = " .$this->kernel->intranet->get('id')." AND email_id = ".$this->id);
         $file = array();
         $i = 0;
         while ($db->nextRecord()) {
@@ -415,7 +415,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("DELETE FROM email WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("DELETE FROM email WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         return true;
     }
 

src/Intraface/shared/keyword/Keyword.php

Doc Comments +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
     /**

      * Adds keyword to object

      *

-     * @param integer $keyword_id

+     * @param integer $keyword

      *

      * @return boolean

      */

Spacing +19 added lines, -19 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();

@@ -161,14 +161,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) {

@@ -193,7 +193,7 @@ 
         $condition['id'] = $this->id;

         $condition['type'] = $this->type;

         foreach ($condition as $column => $value) {

-            $c[] = $column . " = '" . $value . "'";

+            $c[] = $column." = '".$value."'";

         }

 

         $db = new DB_Sql;

@@ -216,11 +216,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);

@@ -284,7 +284,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

@@ -335,7 +335,7 @@ 
         $condition['keyword.active'] = 1;

 

         foreach ($condition as $column => $value) {

-            $c[] = $column . " = '" . $value . "'";

+            $c[] = $column." = '".$value."'";

         }

 

         $db = new DB_Sql;

@@ -343,7 +343,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;

@@ -376,7 +376,7 @@ 
         $condition['keyword_x_object.belong_to'] = $this->getBelongToId();

 

         foreach ($condition as $column => $value) {

-            $c[] = $column . " = '" . $value . "'";

+            $c[] = $column." = '".$value."'";

         }

 

         $db = new DB_Sql;

@@ -384,7 +384,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);

 

@@ -416,7 +416,7 @@ 
         $condition['keyword_x_object.belong_to'] = $this->getBelongToId();

 

         foreach ($condition as $column => $value) {

-            $c[] = $column . " = '" . $value . "'";

+            $c[] = $column." = '".$value."'";

         }

 

 

@@ -494,7 +494,7 @@ 
      *

      * @return array with keywords

      */

-    public static function quotesplit($s, $splitter=',')

+    public static function quotesplit($s, $splitter = ',')

     {

         //First step is to split it up into the bits that are surrounded by quotes and the bits that aren't. Adding the delimiter to the ends simplifies the logic further down

         $getstrings = explode('\"', $splitter.$s.$splitter);

@@ -504,7 +504,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;

@@ -513,7 +513,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)) $result[] = trim($ival);

Braces +3 added lines, -1 removed lines

@@ -516,7 +516,9 @@
                 $temparray = explode($splitter, substr($val, $delimlen, strlen($val)-$delimlen-$delimlen ) );

 

                 while (list($iarg, $ival) = each($temparray)) {

-                    if (!empty($ival)) $result[] = trim($ival);

+                    if (!empty($ival)) {
+                        $result[] = trim($ival);
+                    }
                 }

                 $instring = 1;

             }

src/Intraface/User.php

Doc Comments +4 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)

     {

Indentation +1 added lines, -1 removed lines

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

         }

     }

 

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 +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
     /**

      * Constructor

      *

-     * @param $session_id Session id

-     * @param $intranet   Intranet

+     * @param string $session_id Session id

+     * @param Intraface_Intranet $intranet   Intranet

      *

      * @return void

      */

Indentation +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 

     function hasModuleAccess($modulename)

     {

-		return $this->intranet->hasModuleAccess($modulename);

+        return $this->intranet->hasModuleAccess($modulename);

     }

 

     function hasIntranetAccess($intranet_id)