intraface / intraface.dk

src/Intraface/modules/modulepackage/Manager.php

Doc Comments +7 added lines, -1 removed lines

@@ -253,6 +253,7 @@ 
      * Returns on the basis of the module package which type of add this is. Can be either add, extend, or upgrade
      *
      * @param object modulepackage An modulepackage object
+     * @param Intraface_modules_modulepackage_ModulePackage $modulepackage
      *
      * @return string either 'add', 'extend' or 'upgrade'
      */
@@ -295,6 +296,7 @@ 
      * Returns the end date of the last modulepacke in a given group
      *
      * @param object modulepackage
+     * @return string
      */
     public function getLastEndDateInGroup($modulepackage)
     {
@@ -400,6 +402,8 @@ 
      *
      * @param object modulepackage module package
      * @param string duration Duration as either date 'dd-mm-yyyy' or 'yyyy-mm-dd' or 'X month' where X is any whole number
+     * @param Intraface_modules_modulepackage_ModulePackage $modulepackage
+     * @param string $duration
      *
      * @return object Action object with the actions needed to be processed
      */
@@ -470,6 +474,8 @@ 
      *
      * @param object modulepackage
      * @param string duration Duration as either date 'dd-mm-yyyy' or 'yyyy-mm-dd' or 'X month' where X is any whole number
+     * @param Intraface_modules_modulepackage_ModulePackage $modulepackage
+     * @param string $duration
      *
      * @return object Action object with the actions needed to be performed
      */
@@ -628,7 +634,7 @@ 
     /**
      * Returns the possible types of status'
      *
-     * @return array status types
+     * @return string[] status types
      */
     static public function getStatusTypes()
     {

Spacing +43 added lines, -43 removed lines

@@ -48,7 +48,7 @@ 
         // Should we rather just take intranet_id as parameter?
         $this->intranet = &$intranet;
         $this->db = MDB2::singleton(DB_DSN);
-        $this->error =  new Intraface_Error;
+        $this->error = new Intraface_Error;
         $this->id = (int)$id;
 
         if ($this->id > 0) {
@@ -69,20 +69,20 @@ 
         }
 
         // TODO: This could actually easily use dbquery
-        $result = $this->db->query('SELECT intranet_module_package.id, ' .
-                'intranet_module_package.module_package_id, ' .
-                'intranet_module_package.start_date, ' .
-                'intranet_module_package.end_date, ' .
-                'intranet_module_package.order_debtor_id, ' .
-                'intranet_module_package.status_key, ' .
-                'module_package_plan.plan, ' .
-                'module_package_group.group_name, ' .
-                'DATE_FORMAT(intranet_module_package.start_date, "%d-%m-%Y") AS dk_start_date, ' .
-                'DATE_FORMAT(intranet_module_package.end_date, "%d-%m-%Y") AS dk_end_date ' .
-            'FROM intranet_module_package ' .
-            'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id ' .
-            'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id ' .
-            'INNER JOIN module_package_group ON module_package.module_package_group_id = module_package_group.id ' .
+        $result = $this->db->query('SELECT intranet_module_package.id, '.
+                'intranet_module_package.module_package_id, '.
+                'intranet_module_package.start_date, '.
+                'intranet_module_package.end_date, '.
+                'intranet_module_package.order_debtor_id, '.
+                'intranet_module_package.status_key, '.
+                'module_package_plan.plan, '.
+                'module_package_group.group_name, '.
+                'DATE_FORMAT(intranet_module_package.start_date, "%d-%m-%Y") AS dk_start_date, '.
+                'DATE_FORMAT(intranet_module_package.end_date, "%d-%m-%Y") AS dk_end_date '.
+            'FROM intranet_module_package '.
+            'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id '.
+            'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id '.
+            'INNER JOIN module_package_group ON module_package.module_package_group_id = module_package_group.id '.
             'WHERE intranet_id = '.$this->db->quote($this->intranet->get('id'), 'integer').' AND intranet_module_package.id = '.$this->db->quote($this->id, 'integer'));
 
         if (PEAR::isError($result)) {
@@ -162,8 +162,8 @@ 
             return false;
         }
 
-        $sql = "module_package_id = ".$this->db->quote($modulepackage->get('id'), 'integer').", " .
-                "start_date = ".$this->db->quote($start_date, 'date').", " .
+        $sql = "module_package_id = ".$this->db->quote($modulepackage->get('id'), 'integer').", ".
+                "start_date = ".$this->db->quote($start_date, 'date').", ".
                 "end_date = ".$this->db->quote($end_date, 'date');
 
         $result = $this->db->exec("INSERT INTO intranet_module_package SET ".$sql.", status_key = 1, active = 1, intranet_id = ".$this->intranet->get('id'));
@@ -200,8 +200,8 @@ 
             return false;
         }
 
-        $result = $this->db->exec('UPDATE intranet_module_package ' .
-            'SET order_debtor_identifier = '.$this->db->quote($order_identifier, 'text').' ' .
+        $result = $this->db->exec('UPDATE intranet_module_package '.
+            'SET order_debtor_identifier = '.$this->db->quote($order_identifier, 'text').' '.
             'WHERE intranet_id = '.$this->db->quote($this->intranet->get('id'), 'integer').' AND id = '.$this->db->quote($this->id, 'integer'));
 
         if (PEAR::isError($result)) {
@@ -225,7 +225,7 @@ 
 
         $result = $this->db->exec("UPDATE intranet_module_package SET status_key = 3 WHERE intranet_id = ".$this->intranet->get('id')." AND id = ".intval($this->id));
         if (PEAR::isError($result)) {
-            throw new Exception("Error in query in Intraface_modules_modulepackage_Manager->terminate :". $result->getUserInfo());
+            throw new Exception("Error in query in Intraface_modules_modulepackage_Manager->terminate :".$result->getUserInfo());
             exit;
         }
 
@@ -244,7 +244,7 @@ 
         }
         $result = $this->db->exec("UPDATE intranet_module_package SET active = 0 WHERE intranet_id = ".$this->intranet->get('id')." AND id = ".intval($this->id));
         if (PEAR::isError($result)) {
-            throw new Exception("Error in query in Intraface_modules_modulepackage_Manager->delete :". $result->getUserInfo());
+            throw new Exception("Error in query in Intraface_modules_modulepackage_Manager->delete :".$result->getUserInfo());
             exit;
         }
 
@@ -271,10 +271,10 @@ 
         }
 
         // TODO: If DBQuery had not needed kernel we could have used it here!
-        $result = $this->db->query('SELECT module_package_plan.plan_index FROM intranet_module_package ' .
-                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id ' .
-                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id ' .
-                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' ' .
+        $result = $this->db->query('SELECT module_package_plan.plan_index FROM intranet_module_package '.
+                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id '.
+                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id '.
+                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' '.
                 'ORDER BY end_date DESC');
 
         if (PEAR::isError($result)) {
@@ -312,10 +312,10 @@ 
         }
 
         // TODO: If DBQuery had not needed kernel we could have used it here!
-        $result = $this->db->query('SELECT intranet_module_package.end_date FROM intranet_module_package ' .
-                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id ' .
-                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id ' .
-                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' ' .
+        $result = $this->db->query('SELECT intranet_module_package.end_date FROM intranet_module_package '.
+                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id '.
+                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id '.
+                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' '.
                 'ORDER BY end_date DESC');
 
         if (PEAR::isError($result)) {
@@ -498,11 +498,11 @@ 
         $shop = new Intraface_modules_modulepackage_ShopExtension;
 
         // TODO: If DBQuery had not needed kernel we could have used it here!
-        $result = $this->db->query('SELECT intranet_module_package.id, intranet_module_package.status_key, intranet_module_package.start_date, intranet_module_package.end_date, intranet_module_package.order_debtor_id, intranet_module_package.module_package_id, module_package.product_id ' .
-                'FROM intranet_module_package ' .
-                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id ' .
-                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id ' .
-                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' ' .
+        $result = $this->db->query('SELECT intranet_module_package.id, intranet_module_package.status_key, intranet_module_package.start_date, intranet_module_package.end_date, intranet_module_package.order_debtor_id, intranet_module_package.module_package_id, module_package.product_id '.
+                'FROM intranet_module_package '.
+                'INNER JOIN module_package ON intranet_module_package.module_package_id = module_package.id '.
+                'INNER JOIN module_package_plan ON module_package.module_package_plan_id = module_package_plan.id '.
+                'WHERE intranet_module_package.intranet_id = '.$this->intranet->get('id').' AND intranet_module_package.active = 1 AND (intranet_module_package.status_key = 1 OR intranet_module_package.status_key = 2) AND module_package.module_package_group_id = '.$modulepackage->get('group_id').' '.
                 'ORDER BY end_date DESC');
 
         if (PEAR::isError($result)) {
@@ -587,15 +587,15 @@ 
             $this->dbquery->setSorting('module_package_group.sorting_index, module_package_plan.plan_index, intranet_module_package.start_date');
         }
 
-        $db = $this->dbquery->getRecordset('intranet_module_package.id, ' .
-                    'intranet_module_package.module_package_id, ' .
-                    'intranet_module_package.start_date, ' .
-                    'intranet_module_package.end_date, ' .
-                    'intranet_module_package.order_debtor_id, ' .
-                    'intranet_module_package.status_key, ' .
-                    'module_package_plan.plan, ' .
-                    'module_package_group.group_name, ' .
-                    'DATE_FORMAT(intranet_module_package.start_date, "%d-%m-%Y") AS dk_start_date, ' .
+        $db = $this->dbquery->getRecordset('intranet_module_package.id, '.
+                    'intranet_module_package.module_package_id, '.
+                    'intranet_module_package.start_date, '.
+                    'intranet_module_package.end_date, '.
+                    'intranet_module_package.order_debtor_id, '.
+                    'intranet_module_package.status_key, '.
+                    'module_package_plan.plan, '.
+                    'module_package_group.group_name, '.
+                    'DATE_FORMAT(intranet_module_package.start_date, "%d-%m-%Y") AS dk_start_date, '.
                     'DATE_FORMAT(intranet_module_package.end_date, "%d-%m-%Y") AS dk_end_date', '', false);
 
         $modulepackages = array();

src/Intraface/modules/modulepackage/ShopExtension.php

Doc Comments +1 added lines, -1 removed lines

@@ -234,7 +234,7 @@
     /**
      * Returns order details from order identifier
      *
-     * @param string $order_identifier
+     * @param string $order_identification
      * @return array
      */
     public function getOrderDetails($order_identification)

src/Intraface/modules/newsletter/SubscribersGateway.php

Doc Comments +6 added lines

@@ -57,6 +57,9 @@ 
         return $db->numRows();
     }
 
+    /**
+     * @param string $code
+     */
     function findByCode($code)
     {
         // kernel og kode
@@ -73,6 +76,9 @@ 
         return new NewsletterSubscriber(new NewsletterList($this->kernel, $db->f('list_id')), $db->f('id'));
     }
 
+    /**
+     * @param string $email
+     */
     function findByListAndEmail($list, $email)
     {
         $email = safeToDb($email);

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
 
     function getAllUnsubscribersForList($list)
     {
-        $this->dbquery = new Intraface_DBQuery($list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=". $list->get('id') . " AND newsletter_subscriber.intranet_id = " . $list->kernel->intranet->get('id'));
+        $this->dbquery = new Intraface_DBQuery($list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=".$list->get('id')." AND newsletter_subscriber.intranet_id = ".$list->kernel->intranet->get('id'));
         $this->dbquery->setJoin("LEFT", "contact", "newsletter_subscriber.contact_id = contact.id AND contact.intranet_id = ".$list->kernel->intranet->get("id"), '');
         $this->dbquery->setJoin("LEFT", "address", "address.belong_to_id = contact.id AND address.active = 1 AND address.type = 3", '');
         $this->dbquery->setFilter('optin', 1);
@@ -30,7 +30,7 @@ 
 
     function getByContactId($list, $id)
     {
-        $this->dbquery = new Intraface_DBQuery($list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=". $list->get('id') . " AND newsletter_subscriber.intranet_id = " . $list->kernel->intranet->get('id'));
+        $this->dbquery = new Intraface_DBQuery($list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=".$list->get('id')." AND newsletter_subscriber.intranet_id = ".$list->kernel->intranet->get('id'));
         $this->dbquery->setFilter('contact_id', $id);
         $this->getDBQuery()->setCondition('newsletter_subscriber.contact_id = '.$this->getDBQuery()->getFilter('contact_id'));
 
@@ -41,14 +41,14 @@ 
     {
         // @todo - make sure to delete old ones
         $db = MDB2::singleton();
-        $db->query('UPDATE newsletter_subscriber SET contact_id = ' . $new_id . ' WHERE contact_id = ' . $old_id);
+        $db->query('UPDATE newsletter_subscriber SET contact_id = '.$new_id.' WHERE contact_id = '.$old_id);
     }
 
     public function findCountByContactId($contact_id)
     {
         $sql = "SELECT id
                 FROM newsletter_subscriber
-                    WHERE intranet_id = " . $this->kernel->intranet->get("id") . "
+                    WHERE intranet_id = " . $this->kernel->intranet->get("id")."
                         AND contact_id = ".(int)$contact_id."
               AND active = 1";
 
@@ -65,7 +65,7 @@ 
         $code = strip_tags($code);
 
         $db = new DB_Sql;
-        $db->query("SELECT id, list_id FROM newsletter_subscriber WHERE code = '".$code."' AND intranet_id = " . $this->kernel->intranet->get('id')." and active = 1");
+        $db->query("SELECT id, list_id FROM newsletter_subscriber WHERE code = '".$code."' AND intranet_id = ".$this->kernel->intranet->get('id')." and active = 1");
         if (!$db->nextRecord()) {
             return false;
         }
@@ -84,8 +84,8 @@ 
                     LEFT JOIN address
                         ON address.belong_to_id = contact.id
                     WHERE address.email = '".$email."'
-                        AND newsletter_subscriber.list_id = " . $list->get('id') . "
-                        AND newsletter_subscriber.intranet_id = " . $this->kernel->intranet->get('id') . "
+                        AND newsletter_subscriber.list_id = " . $list->get('id')."
+                        AND newsletter_subscriber.intranet_id = " . $this->kernel->intranet->get('id')."
                         AND newsletter_subscriber.active = 1
                         AND contact.active = 1");
         if (!$db->nextRecord()) {

src/Intraface/modules/onlinepayment/OnlinePaymentGateway.php

Doc Comments +6 added lines

@@ -33,6 +33,9 @@ 
         return $this->getProvider($provider, $value);
     }
 
+    /**
+     * @param integer $provider
+     */
     public function findByProvider($provider)
     {
         if (!in_array($provider, $this->implemented_providers)) {
@@ -42,6 +45,9 @@ 
         return $this->getProvider($provider);
     }
 
+    /**
+     * @param integer $value
+     */
     public function findByTransactionNumber($value)
     {
         $db = new DB_Sql;

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     {
         $type = 'id';
         $db = new DB_Sql;
-        $db->query("SELECT provider_key FROM onlinepayment WHERE id = ".(int)$value. " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT provider_key FROM onlinepayment WHERE id = ".(int)$value." AND intranet_id = ".$this->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             throw new Exception('OnlinePayment::factory: Ikke et gyldigt id');
         }
@@ -45,7 +45,7 @@ 
     public function findByTransactionNumber($value)
     {
         $db = new DB_Sql;
-        $db->query("SELECT provider_key FROM onlinepayment WHERE transaction_number = '".$value."' AND intranet_id = " . $kernel->intranet->get('id'));
+        $db->query("SELECT provider_key FROM onlinepayment WHERE transaction_number = '".$value."' AND intranet_id = ".$kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             throw new Exception('OnlinePayment::factory: Ikke et gyldigt transactionnumber');
         }

src/Intraface/modules/onlinepayment/provider/Default.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 

 class OnlinePaymentDefault extends OnlinePayment

 {

+    /**
+     * @param integer $id
+     */
     function __construct($kernel, $id) {

 

         parent::__construct($kernel, $id);

src/Intraface/modules/onlinepayment/provider/QuickPay.php

Doc Comments +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
      *
      * @param string $action Which action to perform?
      *
-     * @return void
+     * @return boolean
      */
     function transactionAction($action)
     {

Indentation +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 
         return $this->eval;
     }
-    **/
+     **/
 
     /**
      * @todo does what?

Spacing +5 added lines, -5 removed lines

@@ -58,7 +58,7 @@ 
         $this->quickpay = new quickpay;
         $this->quickpay->set_md5checkword($this->settings['md5_secret']);
         $this->quickpay->set_merchant($this->settings['merchant_id']);
-        $this->quickpay->set_curl_certificate(dirname(__FILE__) . '/../../../certificates/cacert.pem');
+        $this->quickpay->set_curl_certificate(dirname(__FILE__).'/../../../certificates/cacert.pem');
 
         // hvordan bliver disse sat - og hvad er det n�jagtigt?
         $this->quickpay->set_posc($this->posc);
@@ -104,7 +104,7 @@ 
 
             // henter bel�bene fra denne onlinebetaling
             $this->quickpay->set_transaction($this->get('transaction_number'));
-            $this->quickpay->set_amount(round($this->get('amount') * 100));
+            $this->quickpay->set_amount(round($this->get('amount')*100));
 
             $this->eval = $this->quickpay->capture();
 
@@ -130,7 +130,7 @@ 
                 $this->setStatus("reversed");
                 return true;
             } else {
-                $this->error->set('Betalingen kunne ikke tilbagebetales: ' . $this->eval['qpstatmsg']);
+                $this->error->set('Betalingen kunne ikke tilbagebetales: '.$this->eval['qpstatmsg']);
                 return false;
             }
         } else {
@@ -184,8 +184,8 @@ 
      */
     function getSettings()
     {
-        $this->value['md5_secret'] =    $this->kernel->setting->get('intranet', 'onlinepayment.quickpay.md5_secret');
-        $this->value['merchant_id'] =   $this->kernel->setting->get('intranet', 'onlinepayment.quickpay.merchant_id');
+        $this->value['md5_secret'] = $this->kernel->setting->get('intranet', 'onlinepayment.quickpay.md5_secret');
+        $this->value['merchant_id'] = $this->kernel->setting->get('intranet', 'onlinepayment.quickpay.merchant_id');
         return $this->value;
     }
 

src/Intraface/modules/procurement/ProcurementGateway.php

Doc Comments +2 added lines, -2 removed lines

@@ -182,7 +182,7 @@ 
      * returns possible status types
      * @todo: duplicate in Procurement class
      *
-     * @return array status types
+     * @return string[] status types
      */
     public function getStatusTypes()
     {
@@ -197,7 +197,7 @@ 
      * returns the possible regions where procurement is bought
      * @todo: duplicate in Procurement class
      *
-     * @return array possible regions
+     * @return string[] possible regions
      */
     public function getRegionTypes()
     {

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
     function setNewContactId($old_id, $new_id)
     {
         $db = MDB2::singleton();
-        $db->query('UPDATE procurement SET contact_id = ' . $new_id . ' WHERE contact_id = ' . $old_id);
+        $db->query('UPDATE procurement SET contact_id = '.$new_id.' WHERE contact_id = '.$old_id);
     }
 
     function find()
@@ -158,14 +158,14 @@ 
     function any()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM procurement WHERE intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT id FROM procurement WHERE intranet_id = ".$this->kernel->intranet->get('id'));
         return $db->numRows();
     }
 
     function anyByContact($contact_id)
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM procurement WHERE intranet_id = " . $this->kernel->intranet->get('id')." AND contact_id = ".$contact_id." AND active = 1");
+        $db->query("SELECT id FROM procurement WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND contact_id = ".$contact_id." AND active = 1");
         return $db->numRows();
     }
 
@@ -214,7 +214,7 @@ 
     {
         $sql = "SELECT id
                 FROM procurement
-                WHERE intranet_id = " . $this->kernel->intranet->get("id") . "
+                WHERE intranet_id = " . $this->kernel->intranet->get("id")."
                     AND contact_id = ".(int)$contact_id."
                     AND active = 1";
 

src/Intraface/modules/product/Attribute/Group/Gateway.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
      * @todo $doctrine should not be optional
      * 
      * @param object $doctrine Doctrine_Connection 
-     * @return void
+     * @return integer
      */
     public function __construct($doctrine = NULL) 
     {

src/Intraface/modules/product/Gateway.php

Doc Comments +1 added lines, -3 removed lines

@@ -36,7 +36,6 @@ 
     /**
      * Constructor
      *
-     * @param object  $user                Userobject
      *
      * @return void
      */
@@ -77,9 +76,8 @@ 
     /**
      * Finds a product with an id
      *
-     * @param integer $id product id
      *
-     * @return object
+     * @return Product
      */
     function getById($product_id, $old_product_detail_id = 0)
     {

Indentation -1 removed lines

@@ -51,7 +51,6 @@
 
     /**
      * Creates the dbquery object
-
      * @return void
      */
     public function getDBQuery()

Spacing +3 added lines, -3 removed lines

@@ -139,8 +139,8 @@ 
                 'INNER',
                 'ilib_category',
                 'ilib_category_append.category_id = ilib_category.id',
-                'ilib_category.intranet_id = '.$this->kernel->intranet->getId(). ' ' .
-                    'AND ilib_category.belong_to = '.$category_type->getBelongTo().' ' .
+                'ilib_category.intranet_id = '.$this->kernel->intranet->getId().' '.
+                    'AND ilib_category.belong_to = '.$category_type->getBelongTo().' '.
                 'AND ilib_category.belong_to_id = '.$category_type->getBelongToId()
             );
 
@@ -207,7 +207,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 $which=='webshop') { // only stock
+            if ($this->kernel->setting->get('intranet', 'webshop.show_online') == 0 and $which == 'webshop') { // only stock
                 if (array_key_exists('for_sale', $products[$i]['stock_status']) and $products[$i]['stock_status']['for_sale'] <= 0) {
                     continue;
                 }