intraface / intraface.dk

src/Intraface/modules/product/Product.php

Doc Comments +3 added lines, -4 removed lines

@@ -594,7 +594,7 @@ 
      *
      * @deprecated
      *
-     * @return object
+     * @return Keyword
      */
     public function getKeywords()
     {
@@ -604,7 +604,7 @@ 
     /**
      * Get keywords object
      *
-     * @return object
+     * @return Keyword
      */
     public function getKeyword()
     {
@@ -660,7 +660,6 @@ 
     /**
      * Delete all related product
      *
-     * @param integer $id     Product id to relate to this product
      *
      * @return boolean
      */
@@ -1040,7 +1039,7 @@ 
     /**
      * Gets the details
      *
-     * @return object
+     * @return ProductDetail
      */
     function getDetails()
     {

Indentation +2 added lines, -3 removed lines

@@ -115,7 +115,6 @@ 
 
     /**
      * Creates the dbquery object
-
      * @return void
      */
     public function getDBQuery()
@@ -569,7 +568,7 @@ 
         $product_number = (int)$product_number;
 
         $db = new DB_Sql;
-         $sql = "SELECT product.id FROM product
+            $sql = "SELECT product.id FROM product
           INNER JOIN product_detail detail
             ON product.id = detail.product_id
             WHERE detail.number = '" . $product_number . "'
@@ -818,7 +817,7 @@ 
                     "AND product_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " .
                 "WHERE product_x_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " .
                     "AND product_x_attribute_group.product_id=" . $this->getId()  . " " .
-                 "ORDER BY product_attribute_group.id");
+                    "ORDER BY product_attribute_group.id");
 
         if (PEAR::isError($result)) {
             throw new Exception('Error in query :'.$result->getUserInfo());

Spacing +31 added lines, -31 removed lines

@@ -146,8 +146,8 @@ 
     public function load()
     {
         $this->db->query("SELECT id, active, locked, changed_date, ".implode(',', $this->fields)." FROM product
-                WHERE intranet_id = " . $this->kernel->intranet->getId() . "
-                    AND id = " . $this->id . " LIMIT 1");
+                WHERE intranet_id = " . $this->kernel->intranet->getId()."
+                    AND id = " . $this->id." LIMIT 1");
 
         if (!$this->db->nextRecord()) {
             $this->value['id'] = 0;
@@ -396,13 +396,13 @@ 
 
         if ($this->id > 0) {
             $sql_type = "UPDATE ";
-            $sql_end  = " WHERE id = " . $this->id . " AND intranet_id = " . $this->intranet->getId();
+            $sql_end  = " WHERE id = ".$this->id." AND intranet_id = ".$this->intranet->getId();
         } else {
             $sql_type = "INSERT INTO";
-            $sql_end  = ", intranet_id = " . $this->intranet->getId();
+            $sql_end  = ", intranet_id = ".$this->intranet->getId();
         }
 
-        $this->db->query($sql_type . " product SET ".$sql." changed_date = NOW()"    . $sql_end);
+        $this->db->query($sql_type." product SET ".$sql." changed_date = NOW()".$sql_end);
 
         if (empty($this->id)) {
             $this->id = $this->db->insertedId();
@@ -435,7 +435,7 @@ 
 
         $new_id = $product->save(
             array(
-                'name' => $this->get('name') . ' (kopi)',
+                'name' => $this->get('name').' (kopi)',
                 'description' => $this->get('description'),
                 'price' => amountToForm($this->get('price')), // make sure that this is formatted to local format
                 'weight' => (float)$this->get('weight'),
@@ -505,8 +505,8 @@ 
         $db = new Db_Sql;
         $sql = "UPDATE product
             SET active = 0
-            WHERE id = " . $this->id. "
-                AND intranet_id = " . $this->intranet->getId() . "
+            WHERE id = " . $this->id."
+                AND intranet_id = " . $this->intranet->getId()."
                 AND locked = 0";
         $db->query($sql);
 
@@ -529,7 +529,7 @@ 
         $db = new Db_Sql;
         $sql = "UPDATE product
             SET active = 1
-            WHERE id = " . $this->id. "
+            WHERE id = " . $this->id."
                 AND intranet_id = " . $this->intranet->getId();
         $db->query($sql);
         $this->value['active'] = 1;
@@ -548,7 +548,7 @@ 
             FROM product
             INNER JOIN product_detail
                 ON product_detail.product_id = product.id
-            WHERE product.intranet_id = " . $this->intranet->getId() . "
+            WHERE product.intranet_id = " . $this->intranet->getId()."
             ORDER BY product_detail.number DESC LIMIT 1";
         $db->query($sql);
         if (!$db->nextRecord()) {
@@ -572,8 +572,8 @@ 
          $sql = "SELECT product.id FROM product
           INNER JOIN product_detail detail
             ON product.id = detail.product_id
-            WHERE detail.number = '" . $product_number . "'
-                AND detail.product_id <> " . $this->id . "
+            WHERE detail.number = '" . $product_number."'
+                AND detail.product_id <> " . $this->id."
                 AND detail.active = 1
                 AND product.active=1
                 AND product.intranet_id = ".$this->intranet->getId()." LIMIT 1";
@@ -631,17 +631,17 @@ 
         $db = new DB_Sql;
 
         if ($status == 'relate') {
-            $db->query("SELECT * FROM product_related WHERE product_id=" . $this->id  . " AND related_product_id = " . (int)$id . " AND intranet_id =" .$this->intranet->getId());
+            $db->query("SELECT * FROM product_related WHERE product_id=".$this->id." AND related_product_id = ".(int)$id." AND intranet_id =".$this->intranet->getId());
             if ($db->nextRecord()) {
                 return true;
             }
             if ($id == $this->id) {
                 return false;
             }
-            $db->query("INSERT INTO product_related SET product_id = " . $this->id . ", related_product_id = " . (int)$id . ", intranet_id = " . $this->intranet->getId());
+            $db->query("INSERT INTO product_related SET product_id = ".$this->id.", related_product_id = ".(int)$id.", intranet_id = ".$this->intranet->getId());
             return true;
         } else {
-            $db->query("DELETE FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId() . " AND related_product_id = " . (int)$id);
+            $db->query("DELETE FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId()." AND related_product_id = ".(int)$id);
             return true;
         }
     }
@@ -656,7 +656,7 @@ 
     public function deleteRelatedProduct($id)
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId() . " AND related_product_id = " . (int)$id);
+        $db->query("DELETE FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId()." AND related_product_id = ".(int)$id);
         return true;
     }
 
@@ -670,7 +670,7 @@ 
     public function deleteRelatedProducts()
     {
         $db = new DB_Sql;
-        $db->query("DELETE FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId());
+        $db->query("DELETE FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId());
         return true;
     }
 
@@ -685,12 +685,12 @@ 
         $key      = 0;
         $ids      = array();
         $db       = new DB_Sql;
-        $sql      = "SELECT related_product_id FROM product_related WHERE product_id = " . $this->id . " AND intranet_id = " . $this->intranet->getId();
+        $sql      = "SELECT related_product_id FROM product_related WHERE product_id = ".$this->id." AND intranet_id = ".$this->intranet->getId();
         $db->query($sql);
 
         // r�kkef�lgen er vigtig - f�rst hente fra product og bagefter tilf�je nye v�rdier til arrayet
         while ($db->nextRecord()) {
-            $product                      = new Product($this->kernel, $db->f('related_product_id'));
+            $product = new Product($this->kernel, $db->f('related_product_id'));
             if ($product->get('id') == 0 || $product->get('active') == 0 || ($show == 'webshop' && $product->get('do_show') == 0)) {
                 continue;
             }
@@ -725,7 +725,7 @@ 
             }
             // den her skal vist lige kigges igennem, for den tager jo alt med p� nettet?
             // 0 = only stock
-            if ($this->kernel->setting->get('intranet', 'webshop.show_online') == 0 and !empty($which) and $which=='webshop') { // only stock
+            if ($this->kernel->setting->get('intranet', 'webshop.show_online') == 0 and !empty($which) and $which == 'webshop') { // only stock
                 if (array_key_exists('for_sale', $products[$key]['stock_status']) and $products[$key]['stock_status']['for_sale'] <= 0) {
                     continue;
                 }
@@ -754,7 +754,7 @@ 
         }
 
         $db = MDB2::singleton(DB_DSN);
-        $result = $db->query("SELECT id FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=" . $this->getId()  . " AND product_attribute_group_id = " . (int)$id);
+        $result = $db->query("SELECT id FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=".$this->getId()." AND product_attribute_group_id = ".(int)$id);
         if (PEAR::isError($result)) {
             throw new Exception('Error in query :'.$result->getUserInfo());
         }
@@ -762,7 +762,7 @@ 
         if ($result->numRows() > 0) {
             return true;
         }
-        $result = $db->exec("INSERT INTO product_x_attribute_group SET product_id = " . $this->getId() . ", product_attribute_group_id = " . (int)$id . ", intranet_id = " . $this->intranet->getId());
+        $result = $db->exec("INSERT INTO product_x_attribute_group SET product_id = ".$this->getId().", product_attribute_group_id = ".(int)$id.", intranet_id = ".$this->intranet->getId());
         if (PEAR::isError($result)) {
             throw new Exception('Error in insert :'.$result->getUserInfo());
         }
@@ -784,7 +784,7 @@ 
         }
 
         $db = MDB2::singleton(DB_DSN);
-        $result = $db->exec("DELETE FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=" . $this->getId()  . " AND product_attribute_group_id = " . (int)$id);
+        $result = $db->exec("DELETE FROM product_x_attribute_group WHERE intranet_id = ".$db->quote($this->intranet->getId())." AND product_id=".$this->getId()." AND product_attribute_group_id = ".(int)$id);
         if (PEAR::isError($result)) {
             throw new Exception('Error in query :'.$result->getUserInfo());
         }
@@ -812,12 +812,12 @@ 
         // NOTE: Very important that it is ordered by product_attribute_group.id so the groups
         // does always get attached to the correct attribute number on the variation. Se above todo in method doc
         $db = MDB2::singleton(DB_DSN);
-        $result = $db->query("SELECT product_attribute_group.* FROM product_x_attribute_group " .
-                "INNER JOIN product_attribute_group " .
-                    "ON product_x_attribute_group.product_attribute_group_id = product_attribute_group.id " .
-                    "AND product_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " .
-                "WHERE product_x_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." " .
-                    "AND product_x_attribute_group.product_id=" . $this->getId()  . " " .
+        $result = $db->query("SELECT product_attribute_group.* FROM product_x_attribute_group ".
+                "INNER JOIN product_attribute_group ".
+                    "ON product_x_attribute_group.product_attribute_group_id = product_attribute_group.id ".
+                    "AND product_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." ".
+                "WHERE product_x_attribute_group.intranet_id = ".$db->quote($this->intranet->getId())." ".
+                    "AND product_x_attribute_group.product_id=".$this->getId()." ".
                  "ORDER BY product_attribute_group.id");
 
         if (PEAR::isError($result)) {
@@ -871,7 +871,7 @@ 
     public function isFilledIn()
     {
         $db = new DB_Sql;
-        $db->query("SELECT count(*) AS antal FROM product WHERE intranet_id = " . $this->intranet->getId());
+        $db->query("SELECT count(*) AS antal FROM product WHERE intranet_id = ".$this->intranet->getId());
         if ($db->nextRecord()) {
             return $db->f('antal');
         }
@@ -886,7 +886,7 @@ 
     public function any()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM product WHERE intranet_id = " . $this->intranet->getId()." AND active = 1");
+        $db->query("SELECT id FROM product WHERE intranet_id = ".$this->intranet->getId()." AND active = 1");
         return $db->numRows();
     }
 

src/Intraface/modules/product/ProductDetail.php

Doc Comments +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
     /**
      * Constructor
      *
-     * @param object  $product       Product object
+     * @param Product  $product       Product object
      * @param integer $old_detail_id Only used with old product details
      *
      * @return void
@@ -155,7 +155,7 @@ 
      *
      * @param array $array_var An array with data to save, @see $this->fields
      *
-     * @return integer
+     * @return boolean
      */
     public function save($array_var)
     {

Indentation +18 added lines, -18 removed lines

@@ -332,24 +332,24 @@
     public static function getUnits($key = null)
     {
         $units = array(1 => array('singular' => '',
-                                  'plural' => '',
-                                  'combined' => ''),
-                       2 => array('singular' => 'unit',
-                                  'plural' => 'units',
-                                  'combined' => 'unit(s)'),
-                       3 => array('singular' => 'day',
-                                  'plural' => 'days',
-                                  'combined' => 'day(s)'),
-                       4 => array('singular' => 'month (singular)',
-                                  'plural' => 'month (plural)',
-                                  'combined' => 'month (combined)'),
-                       5 => array('singular' => 'year',
-                                  'plural' => 'years',
-                                  'combined' => 'year(s)'),
-                       6 => array('singular' => 'hour',
-                                  'plural' => 'hours',
-                                  'combined' => 'hour(s)')
-                 );
+                                    'plural' => '',
+                                    'combined' => ''),
+                        2 => array('singular' => 'unit',
+                                    'plural' => 'units',
+                                    'combined' => 'unit(s)'),
+                        3 => array('singular' => 'day',
+                                    'plural' => 'days',
+                                    'combined' => 'day(s)'),
+                        4 => array('singular' => 'month (singular)',
+                                    'plural' => 'month (plural)',
+                                    'combined' => 'month (combined)'),
+                        5 => array('singular' => 'year',
+                                    'plural' => 'years',
+                                    'combined' => 'year(s)'),
+                        6 => array('singular' => 'hour',
+                                    'plural' => 'hours',
+                                    'combined' => 'hour(s)')
+                    );
 
         if ($key === null) {
             return $units;

Spacing +15 added lines, -15 removed lines

@@ -77,14 +77,14 @@ 
 
         $sql = "SELECT product_detail.id, product_detail.unit AS unit_key,".implode(',', $this->fields).", product_detail_translation.name, product_detail_translation.description FROM product_detail
             LEFT JOIN product_detail_translation ON product_detail.id = product_detail_translation.id AND product_detail_translation.lang = 'da'
-            WHERE ".$sql . "
-            AND product_id = " . $this->product->get('id') . ' AND intranet_id = ' . $this->product->intranet->getId();
+            WHERE ".$sql."
+            AND product_id = " . $this->product->get('id').' AND intranet_id = '.$this->product->intranet->getId();
         $this->db->query($sql);
         if ($this->db->numRows() > 1) {
             throw new Exception('Der er mere end en aktiv produktdetalje');
         } elseif ($this->db->nextRecord()) {
             // hardcoded udtr�k af nogle vigtige oplysnigner, som vi ikke kan have i feltlisten
-            for ($i = 0, $max = count($this->fields); $i<$max; $i++) {
+            for ($i = 0, $max = count($this->fields); $i < $max; $i++) {
                 $this->value[$this->fields[$i]] = $this->db->f($this->fields[$i]);
             }
             $this->value['name'] = $this->db->f('name');
@@ -100,13 +100,13 @@ 
                 exit;
             }
 
-            $this->value['unit_id']   = $this->db->f('unit_key');
-            $this->value['unit']     = $unit;
+            $this->value['unit_id'] = $this->db->f('unit_key');
+            $this->value['unit'] = $unit;
 
             // udregne moms priser ud fra prisen, men kun hvis der er moms p� den
             if ($this->db->f('vat') == 1) {
                 $this->value['vat_percent'] = 25;
-                $this->value['price_incl_vat'] = round((float)$this->db->f('price') + ((float)$this->db->f('price') * 0.25), 2);
+                $this->value['price_incl_vat'] = round((float)$this->db->f('price') + ((float)$this->db->f('price')*0.25), 2);
             } else {
                 $this->value['vat_percent'] = 0;
                 $this->value['price_incl_vat'] = round((float)$this->db->f('price'), 2);
@@ -262,8 +262,8 @@ 
         } else {
 
             // vi opdaterer produktet
-            $this->db->query("UPDATE product_detail SET active = 0 WHERE product_id = " . $this->product->get('id'));
-            $this->db->query("INSERT INTO product_detail SET ".$sql." active = 1, changed_date = NOW(), product_id = " . $this->product->get('id') . ", intranet_id = " . $this->product->intranet->getId());
+            $this->db->query("UPDATE product_detail SET active = 0 WHERE product_id = ".$this->product->get('id'));
+            $this->db->query("INSERT INTO product_detail SET ".$sql." active = 1, changed_date = NOW(), product_id = ".$this->product->get('id').", intranet_id = ".$this->product->intranet->getId());
             $this->detail_id = $this->db->insertedId();
             $this->db->query("INSERT INTO product_detail_translation SET name = \"".$array_var['name']."\", description = \"".$array_var['description']."\", lang = 'da', id = ".$this->detail_id);
 
@@ -284,17 +284,17 @@ 
 
     public function getPriceInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2), 'iso');
     }
 
     public function getPriceIncludingVat()
     {
-        return new Ilib_Variable_Float(round($this->get('price') * (1 + $this->getVatPercent()->getAsIso()/100), 2));
+        return new Ilib_Variable_Float(round($this->get('price')*(1 + $this->getVatPercent()->getAsIso()/100), 2));
     }
 
     public function getPriceIncludingVatInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100) * (1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100)*(1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
     }
 
     public function getBeforePrice()
@@ -304,17 +304,17 @@ 
 
     public function getBeforePriceInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100), 2), 'iso');
     }
 
     public function getBeforePriceIncludingVat()
     {
-        return new Ilib_Variable_Float(round($this->get('before_price') * (1 + $this->getVatPercent()->getAsIso()/100), 2));
+        return new Ilib_Variable_Float(round($this->get('before_price')*(1 + $this->getVatPercent()->getAsIso()/100), 2));
     }
 
     public function getBeforePriceIncludingVatInCurrency($currency, $exchange_rate_id = 0)
     {
-        return new Ilib_Variable_Float(round($this->get('before_price') / ($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso() / 100) * (1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
+        return new Ilib_Variable_Float(round($this->get('before_price')/($currency->getProductPriceExchangeRate((int)$exchange_rate_id)->getRate()->getAsIso()/100)*(1 + $this->getVatPercent()->getAsIso()/100), 2), 'iso');
     }
 
     public function getVatPercent()
@@ -365,7 +365,7 @@ 
     function setStateAccountId($id)
     {
         $db = new DB_Sql;
-        $db->query('UPDATE product_detail SET state_account_id = ' . $id . ' WHERE id = ' . $this->detail_id);
+        $db->query('UPDATE product_detail SET state_account_id = '.$id.' WHERE id = '.$this->detail_id);
         $this->load();
         $this->product->load();
         return true;

src/Intraface/modules/product/ProductDoctrine.php

Doc Comments -1 removed lines

@@ -259,7 +259,6 @@
     /**
      * Set attribute for product
      *
-     * @param integer $id     Attribute id to relate to this product
      *
      * @return boolean
      */

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 
     public function getCollectedErrorStack()
     {
-        $stack =& $this->getErrorStack();
+        $stack = & $this->getErrorStack();
         if (is_object($this->active_details)) {
             foreach ($this->active_details->getErrorStack() AS $field => $errors) {
                 foreach ($errors AS $error) {

src/Intraface/modules/product/Variation/Gateway.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)

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
             $this->variation = new Intraface_modules_product_Variation_OneAttributeGroup;
             
         } elseif (count($this->groups) == 2) {
-            $this->variation =  new Intraface_modules_product_Variation_TwoAttributeGroups;
+            $this->variation = new Intraface_modules_product_Variation_TwoAttributeGroups;
         } else {
             throw new Exception('At the moment the system only supports up to two attribute groups!');
         }

src/Intraface/modules/shop/Controller/Categories.php

Doc Comments +3 added lines

@@ -82,6 +82,9 @@
         return $this->context->getKernel();
     }
 
+    /**
+     * @return integer
+     */
     function getShopId()
     {
         if ($this->query('shop_id')) {

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         $shop_gateway = $this->getShopGateway();
         $shop = $shop_gateway->findById($this->context->name());
 
-        $this->document->setTitle('Categories for shop' . $shop->getName());
+        $this->document->setTitle('Categories for shop'.$shop->getName());
         $this->document->options = array(
             $redirect->getRedirect($this->url('../')) => 'Close', $this->url('create') => 'Add new category'
         );

src/Intraface/modules/stock/Stock.php

Doc Comments +3 added lines

@@ -9,6 +9,9 @@
     public $value;

     private $kernel;

 

+    /**
+     * @param Intraface_modules_product_Variation $variation
+     */
     function __construct($product, $variation = NULL)

     {

         $this->product = $product;

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 +12 added lines, -12 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 {
@@ -150,11 +150,11 @@ 
 
         $height = $this->get('header_height');
         ;
-        $width = $size[0] * ($height/$size[1]);
+        $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();
@@ -177,15 +177,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;
     }