intraface / intraface.dk

src/Intraface/modules/modulepackage/ActionStore.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      * 
      * @param object action     An action object
      * 
-     * @return boolean true or false
+     * @return null|string true or false
      */
     public function store($action) 
     {

Indentation +4 added lines, -4 removed lines

@@ -189,10 +189,10 @@
     }
     
 /**
-     * Returns the store identifier which is generated on store and restore.
-     * 
-     * @return string action store identifier
-     */ 
+ * Returns the store identifier which is generated on store and restore.
+ * 
+ * @return string action store identifier
+ */ 
     public function getIdentifier() {
         return $this->identifier;
     }

Spacing +13 added lines, -13 removed lines

@@ -63,12 +63,12 @@ 
         
         $identifier = md5($action->getOrderIdentifier().$this->intranet_id.time());
         
-        $result = $this->db->exec('INSERT INTO module_package_action SET ' .
-                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').', ' .
-                'identifier = '.$this->db->quote($identifier, 'text').', ' .
-                'order_debtor_identifier = '.$this->db->quote($action->getOrderIdentifier(), 'text').',  ' .
-                'date_created = NOW(), ' .
-                'action = '.$this->db->quote($action_serialized, 'text').', ' .
+        $result = $this->db->exec('INSERT INTO module_package_action SET '.
+                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').', '.
+                'identifier = '.$this->db->quote($identifier, 'text').', '.
+                'order_debtor_identifier = '.$this->db->quote($action->getOrderIdentifier(), 'text').',  '.
+                'date_created = NOW(), '.
+                'action = '.$this->db->quote($action_serialized, 'text').', '.
                 'active = 1');
         
         if (PEAR::isError($result)) {
@@ -95,9 +95,9 @@ 
     public function restore($identifier) 
     {
         
-        $result = $this->db->query('SELECT id, action, identifier FROM module_package_action WHERE ' .
-                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND ' .
-                'identifier = '.$this->db->quote($identifier, 'text').' AND ' .
+        $result = $this->db->query('SELECT id, action, identifier FROM module_package_action WHERE '.
+                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND '.
+                'identifier = '.$this->db->quote($identifier, 'text').' AND '.
                 'active = 1 ');
         
         if (PEAR::isError($result)) {
@@ -131,8 +131,8 @@ 
     static public function restoreFromIdentifier($db, $identifier) 
     {
         
-        $result = $db->query('SELECT id, action, identifier FROM module_package_action WHERE ' .
-                'identifier = '.$db->quote($identifier, 'text').' AND ' .
+        $result = $db->query('SELECT id, action, identifier FROM module_package_action WHERE '.
+                'identifier = '.$db->quote($identifier, 'text').' AND '.
                 'active = 1 ');
         
         if (PEAR::isError($result)) {
@@ -167,8 +167,8 @@ 
             return false;
         }
         
-        $result = $this->db->exec('UPDATE module_package_action SET active = 0 WHERE ' .
-                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND ' .
+        $result = $this->db->exec('UPDATE module_package_action SET active = 0 WHERE '.
+                'intranet_id = '.$this->db->quote($this->intranet_id, 'integer').' AND '.
                 'id = '.$this->db->quote($this->id, 'integer'));
         
         if (PEAR::isError($result)) {

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

Indentation +1 added lines, -1 removed lines

@@ -557,7 +557,7 @@
             'month' => $parsed_duration['month']));
 
         return $action;
-     }
+        }
 
     /**
      * Returns an array of the packages that an intranet has.

Spacing +46 added lines, -46 removed lines

@@ -47,7 +47,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) {
@@ -67,20 +67,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)) {
@@ -160,8 +160,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'));
@@ -198,8 +198,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)) {
@@ -223,7 +223,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;
         }
 
@@ -242,7 +242,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;
         }
 
@@ -269,10 +269,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)) {
@@ -310,10 +310,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)) {
@@ -361,7 +361,7 @@ 
             // first we add a month to see if there is a full month left.
             // If we want to give them this month for free this should be removed.
             $running_start_date_integer = strtotime('+1 month', $start_date_integer);
-            while($running_start_date_integer <= $end_date_integer) {
+            while ($running_start_date_integer <= $end_date_integer) {
                 $running_start_date_integer = strtotime('+1 month', $running_start_date_integer);
                 $month++;
             }
@@ -499,11 +499,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)) {
@@ -511,7 +511,7 @@ 
             exit;
         }
 
-        while($row = $result->fetchRow()) {
+        while ($row = $result->fetchRow()) {
 
             $add_action = array();
 
@@ -592,22 +592,22 @@ 
             $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();
         $i = 0;
 
         $status_types = $this->getStatusTypes();
-        while($db->nextRecord()) {
+        while ($db->nextRecord()) {
             $modulepackages[$i]['id'] = $db->f('id');
             $modulepackages[$i]['module_package_id'] = $db->f('module_package_id');
             $modulepackages[$i]['start_date'] = $db->f('start_date');

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)

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
                 INTRAFACE_INTRANETMAINTENANCE_SHOP_ID,
                 INTRAFACE_XMLRPC_DEBUG,
                 $xmlrpc_shop_url);
-        } catch(Exception $e) {
+        } catch (Exception $e) {
             $this->shop = NULL;
             throw new Exception('Unable to connect to the intranet maintenance webshop '.$e->getMessage());
         }

Braces +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
             } else {
                 return array();
             }
-        }  elseif (is_int($product_id)) {
+        } elseif (is_int($product_id)) {
             if (intval($product_id) == 0) {
                 return array();
             }

src/Intraface/modules/newsletter/Newsletter.php

Doc Comments +2 added lines, -2 removed lines

@@ -200,7 +200,7 @@ 
     /**
      * Puts subscribers in a queue to the newsletter
      *
-     * @return boolean
+     * @return null|boolean
      */
     function queue()
     {
@@ -306,7 +306,7 @@ 
      *
      * @param integer $id Contact id
      *
-     * @return object
+     * @return Contact
      */
     function getContact($id)
     {

Indentation +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
     private function load()
     {
         $db = new DB_Sql;
-         $db->query("SELECT id, list_id, subject, text, deadline, sent_to_receivers, status FROM newsletter_archieve WHERE id = " . $this->id . " AND active = 1 LIMIT 1");
+            $db->query("SELECT id, list_id, subject, text, deadline, sent_to_receivers, status FROM newsletter_archieve WHERE id = " . $this->id . " AND active = 1 LIMIT 1");
 
         $db2 = new DB_Sql;
         if ($db->nextRecord()) {
@@ -286,7 +286,7 @@ 
 
         // If the number of contacts can be divided evenly into 40 there will be no more params here.
         if (count($params) > 0) {
-           $result = $db->exec($sql . implode($params, ','));
+            $result = $db->exec($sql . implode($params, ','));
         }
 
         if (PEAR::isError($result)) {

Spacing +15 added lines, -15 removed lines

@@ -77,7 +77,7 @@ 
     private function load()
     {
         $db = new DB_Sql;
-         $db->query("SELECT id, list_id, subject, text, deadline, sent_to_receivers, status FROM newsletter_archieve WHERE id = " . $this->id . " AND active = 1 LIMIT 1");
+         $db->query("SELECT id, list_id, subject, text, deadline, sent_to_receivers, status FROM newsletter_archieve WHERE id = ".$this->id." AND active = 1 LIMIT 1");
 
         $db2 = new DB_Sql;
         if ($db->nextRecord()) {
@@ -119,7 +119,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE newsletter_archieve SET active = 0 WHERE id = " . $this->get("id") . "  AND intranet_id = " . $this->list->getIntranet()->getId() . " AND locked = 0");
+        $db->query("UPDATE newsletter_archieve SET active = 0 WHERE id = ".$this->get("id")."  AND intranet_id = ".$this->list->getIntranet()->getId()." AND locked = 0");
 
         return true;
     }
@@ -149,10 +149,10 @@ 
             $sql_end  = ', date_created = NOW()';
         } else {
             $sql_type = "UPDATE";
-            $sql_end  = " WHERE id = " . $this->id;
+            $sql_end  = " WHERE id = ".$this->id;
         }
         $db  = new DB_Sql;
-        $sql = $sql_type . " newsletter_archieve
+        $sql = $sql_type." newsletter_archieve
             SET subject = '".$var['subject']."',
             text = '".$var['text']."',
             intranet_id = ".$this->list->getIntranet()->getId().",
@@ -182,7 +182,7 @@ 
     private function updateSent($receivers)
     {
         $db = new DB_Sql;
-        $db->query("UPDATE newsletter_archieve SET status = 1, sent_to_receivers = '".(int)$receivers."' WHERE id = " . $this->id . " AND intranet_id = " . $this->list->getIntranet()->getId());
+        $db->query("UPDATE newsletter_archieve SET status = 1, sent_to_receivers = '".(int)$receivers."' WHERE id = ".$this->id." AND intranet_id = ".$this->list->getIntranet()->getId());
         return true;
     }
 
@@ -223,7 +223,7 @@ 
         $db        = MDB2::singleton(DB_DSN);
 
         if (PEAR::isError($db)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
         }
 
         $i       = 0;
@@ -260,19 +260,19 @@ 
                 '".$name."',
                 8,
                 2,
-                ".$this->get('id') . ",
-                '".$this->get('deadline'). "',
-                " .$this->list->getIntranet()->getId(). " ,
-                " .$subscriber['contact_id']. " ,
+                ".$this->get('id').",
+                '".$this->get('deadline')."',
+                " .$this->list->getIntranet()->getId()." ,
+                " .$subscriber['contact_id']." ,
                 " .$this->list->kernel->user->get('id').",
                 ".$subject.",
                 ".$body.")";
 
             if ($i == 40) {
-                $result = $db->exec($sql . implode($params, ','));
+                $result = $db->exec($sql.implode($params, ','));
 
                 if (PEAR::isError($result)) {
-                    $error[] = $result->getMessage() . $result->getUserInfo();
+                    $error[] = $result->getMessage().$result->getUserInfo();
                     return false;
                 }
 
@@ -286,11 +286,11 @@ 
 
         // If the number of contacts can be divided evenly into 40 there will be no more params here.
         if (count($params) > 0) {
-           $result = $db->exec($sql . implode($params, ','));
+           $result = $db->exec($sql.implode($params, ','));
         }
 
         if (PEAR::isError($result)) {
-            $error[] = $result->getMessage() . $result->getUserInfo();
+            $error[] = $result->getMessage().$result->getUserInfo();
         }
 
         if (!empty($error)) {
@@ -322,7 +322,7 @@ 
     {
         $list = array();
         $db   = new DB_Sql;
-        $db->query("SELECT * FROM newsletter_archieve WHERE active = 1 AND list_id = " . $this->list->get('id') . " ORDER BY deadline DESC");
+        $db->query("SELECT * FROM newsletter_archieve WHERE active = 1 AND list_id = ".$this->list->get('id')." ORDER BY deadline DESC");
         $i = 0;
         while ($db->nextRecord()) {
 

src/Intraface/modules/newsletter/NewsletterSubscriber.php

Doc Comments +4 added lines, -1 removed lines

@@ -177,7 +177,7 @@ 
     /**
      * Adds an existing contact
      *
-     * @param integer $contact_id Contact id
+     * @param integer $contact Contact id
      *
      * @return integer of the id of the subscriber
      */
@@ -493,6 +493,9 @@ 
         }
     }
 
+    /**
+     * @param Contact $contact
+     */
     private function getLoginUrl($contact)
     {
         if (!$link = $this->list->get('optin_link')) {

Spacing +23 added lines, -23 removed lines

@@ -52,7 +52,7 @@ 
             return $this->dbquery;
         }
         // optin = 1 should not be set here
-        $this->dbquery = new Intraface_DBQuery($this->list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=". $this->list->get("id") . " AND newsletter_subscriber.intranet_id = " . $this->list->kernel->intranet->get('id'));
+        $this->dbquery = new Intraface_DBQuery($this->list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=".$this->list->get("id")." AND newsletter_subscriber.intranet_id = ".$this->list->kernel->intranet->get('id'));
         $this->dbquery->setJoin("LEFT", "contact", "newsletter_subscriber.contact_id = contact.id AND contact.intranet_id = ".$this->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->useErrorObject($this->error);
@@ -135,7 +135,7 @@ 
     private function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM newsletter_subscriber WHERE id = " . $this->id." and active = 1");
+        $db->query("SELECT * FROM newsletter_subscriber WHERE id = ".$this->id." and active = 1");
         if (!$db->nextRecord()) {
 
             $this->id = 0;
@@ -159,7 +159,7 @@ 
     public function delete()
     {
         $db = new DB_Sql;
-        $db->query('UPDATE newsletter_subscriber SET active = 0 WHERE id = ' . $this->id);
+        $db->query('UPDATE newsletter_subscriber SET active = 0 WHERE id = '.$this->id);
         return true;
     }
 
@@ -185,7 +185,7 @@ 
     {
         $db = new DB_sql;
 
-        $db->query("SELECT id FROM newsletter_subscriber WHERE contact_id = '".$contact->getId()."' AND list_id = " . $this->list->get("id") . " AND intranet_id = ".$this->list->kernel->intranet->get('id')." AND active = 1");
+        $db->query("SELECT id FROM newsletter_subscriber WHERE contact_id = '".$contact->getId()."' AND list_id = ".$this->list->get("id")." AND intranet_id = ".$this->list->kernel->intranet->get('id')." AND active = 1");
         if ($db->nextRecord()) {
             return $db->f('id');
         }
@@ -193,10 +193,10 @@ 
         // Spørgsmålet er om vedkommende bør få en e-mail, hvor man kan acceptere?
         $db->query("INSERT INTO newsletter_subscriber SET
                     contact_id = '".$contact->getId()."',
-                    list_id = " . $this->list->get("id") . ",
+                    list_id = " . $this->list->get("id").",
                     date_submitted=NOW(),
                     optin = 1,
-                    code = '".md5($this->list->get("id") . $this->list->kernel->intranet->get('id') . date('Y-m-d H:i:s') . $contact->getId())."',
+                    code = '".md5($this->list->get("id").$this->list->kernel->intranet->get('id').date('Y-m-d H:i:s').$contact->getId())."',
                     intranet_id = ".$this->list->kernel->intranet->get('id'));
 
         return $db->insertedId();
@@ -215,7 +215,7 @@ 
         $input = array_map('strip_tags', $input);
 
         $validator = new Intraface_Validator($this->error);
-        $validator->isEmail($input['email'], $input['email'] . ' er ikke en gyldig e-mail');
+        $validator->isEmail($input['email'], $input['email'].' er ikke en gyldig e-mail');
 
         if (empty($input['name'])) {
             $input['name'] = $input['email'];
@@ -283,7 +283,7 @@ 
                     date_submitted = NOW(),
                     ip_submitted = '".$input['ip']."'
                 WHERE id = ".$this->id."
-                    AND list_id = " . $this->list->get("id") . "
+                    AND list_id = " . $this->list->get("id")."
                     AND intranet_id = " . $this->list->kernel->intranet->get('id'));
             //code =  '" . md5($input['email'] . date('Y-m-d H:i:s') . $input['ip'])."'
 
@@ -307,10 +307,10 @@ 
                     contact_id = '".$contact->get('id')."',
                     email = '".$input['email']."',
                     name='".$input['name']."',
-                    list_id = " . $this->list->get("id") . ",
+                    list_id = " . $this->list->get("id").",
                     ip_submitted='".$input['ip']."',
                     date_submitted=NOW(),
-                    code= '" . md5($input['email'] . date('Y-m-d H:i:s') . $input['ip'])."',
+                    code= '" . md5($input['email'].date('Y-m-d H:i:s').$input['ip'])."',
                     intranet_id = ".$this->list->kernel->intranet->get('id'));
 
         }
@@ -346,7 +346,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("SELECT * FROM newsletter_subscriber WHERE id = " . $this->id." and active = 1");
+        $db->query("SELECT * FROM newsletter_subscriber WHERE id = ".$this->id." and active = 1");
         if (!$db->nextRecord()) {
             return false;
         }
@@ -384,7 +384,7 @@ 
         $this->load();
 
         $db = new DB_Sql;
-        $db->query("UPDATE newsletter_subscriber SET active = 0, date_unsubscribe = '".date('Y-m-d H:i:s')."' WHERE id=".$this->id." AND list_id = " . $this->list->get("id") . " AND intranet_id = " . $this->list->kernel->intranet->get('id'));
+        $db->query("UPDATE newsletter_subscriber SET active = 0, date_unsubscribe = '".date('Y-m-d H:i:s')."' WHERE id=".$this->id." AND list_id = ".$this->list->get("id")." AND intranet_id = ".$this->list->kernel->intranet->get('id'));
         return true;
     }
 
@@ -402,16 +402,16 @@ 
         // optin really wants to optin, so we will not make that a part of the select query
         // and we will set it in the update query
         $db = new DB_Sql;
-        $db->query("SELECT id, ip_submitted FROM newsletter_subscriber WHERE code = '".$code."' AND list_id = " . $this->list->get('id'));
+        $db->query("SELECT id, ip_submitted FROM newsletter_subscriber WHERE code = '".$code."' AND list_id = ".$this->list->get('id'));
         if (!$db->nextRecord()) {
             return false;
         }
 
-        $db->query("UPDATE newsletter_subscriber SET optin = 1, ip_optin = '".$ip."', date_optin = NOW(), active = 1 WHERE code = '" . $code . "' AND list_id = " . $this->list->get('id'));
+        $db->query("UPDATE newsletter_subscriber SET optin = 1, ip_optin = '".$ip."', date_optin = NOW(), active = 1 WHERE code = '".$code."' AND list_id = ".$this->list->get('id'));
 
         // makes sure that the submitted ip is also set - not really a part of this method.
         if ($db->f('ip_submitted')) {
-            $db->query("UPDATE newsletter_subscriber SET ip_submitted = '".$ip."' WHERE id = " . $db->f("id"));
+            $db->query("UPDATE newsletter_subscriber SET ip_submitted = '".$ip."' WHERE id = ".$db->f("id"));
         }
         return true;
     }
@@ -456,8 +456,8 @@ 
         $data = array(
                 'subject' => $subscribe_subject,
                 'body' =>
-                    $this->list->get('subscribe_message') . "\n\n" .
-                    $this->getLoginUrl($contact) .
+                    $this->list->get('subscribe_message')."\n\n".
+                    $this->getLoginUrl($contact).
                     "\n\n".$this->list->get('sender_name'),
                 'contact_id' => $this->get('contact_id'),
                 'from_email' => $this->list->get('reply_email'),
@@ -467,16 +467,16 @@ 
             );
 
         if (!$email->save($data)) {
-            $this->error->set('could not send the e-mail' . implode(',', $email->error->messages));
+            $this->error->set('could not send the e-mail'.implode(',', $email->error->messages));
             return false;
         }
 
         if ($email->queue()) {
             $db = new DB_Sql;
-            $db->query("UPDATE newsletter_subscriber SET date_optin_email_sent = NOW() WHERE id = " . $this->id);
+            $db->query("UPDATE newsletter_subscriber SET date_optin_email_sent = NOW() WHERE id = ".$this->id);
             return true;
         }
-        $this->error->set('could not send the e-mail' . implode(',', $email->error->message));
+        $this->error->set('could not send the e-mail'.implode(',', $email->error->message));
         return false;
     }
 
@@ -488,7 +488,7 @@ 
     {
         if ($this->sendOptInEmail()) {
             $db = new DB_Sql;
-            $db->query("UPDATE newsletter_subscriber SET resend_optin_email_count = resend_optin_email_count + 1 WHERE id = " . $this->id);
+            $db->query("UPDATE newsletter_subscriber SET resend_optin_email_count = resend_optin_email_count + 1 WHERE id = ".$this->id);
             return true;
         }
     }
@@ -496,9 +496,9 @@ 
     private function getLoginUrl($contact)
     {
         if (!$link = $this->list->get('optin_link')) {
-            return $contact->getLoginUrl() . '&optin=' . $this->get('code');
+            return $contact->getLoginUrl().'&optin='.$this->get('code');
         }
-        return $link . '?optin=' . $this->get('code');
+        return $link.'?optin='.$this->get('code');
     }
 
     /**

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

Doc Comments +10 added lines, -3 removed lines

@@ -300,6 +300,10 @@ 
         return $this->id;

     }

 

+    /**
+     * @param string $belong_to
+     * @param integer $belong_to_id
+     */
     function changeBelongTo($belong_to, $belong_to_id)

     {

         if ($this->id == 0) {

@@ -323,6 +327,9 @@ 
 

     }

 

+    /**
+     * @param string $status
+     */
     function setStatus($status)

     {

         if ($this->id == 0) {

@@ -584,7 +591,7 @@ 
     /**

      * returns the possible status types

      *

-     * @return array with status types

+     * @return string[] with status types

      */

     static function getStatusTypes()

     {

@@ -600,7 +607,7 @@ 
     /**

      * returns possible belong to types

      *

-     * @return array with belong to types

+     * @return string[] with belong to types

      */

     private function getBelongToTypes()

     {

@@ -613,7 +620,7 @@ 
     /**

      * returns the implemented providers

      *

-     * @return array with providers

+     * @return string[] with providers

      */

     static function getImplementedProviders()

     {

Indentation +3 added lines, -3 removed lines

@@ -134,7 +134,7 @@ 
      * @param array $input (belong_to, belong_to_id, transaction_number, transaction_status, amount)

      *

      * @return integer

-      */

+     */

     public function save($input)

     {

         $input = safeToDb($input);

@@ -160,11 +160,11 @@ 
         }

 

         if (!isset($input['text'])) {

-        	$input['text'] = '';

+            $input['text'] = '';

         }

 

         if ($input['transaction_status'] == $this->transaction_status_authorized) {

-             $status_key = 2;

+                $status_key = 2;

         } else {

             $status_key = 1;

         }

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
     {

         $gateway = new Intraface_modules_onlinepayment_OnlinePaymentGateway($kernel);

 

-        switch($type) {

+        switch ($type) {

             case 'settings':

                 return $gateway->findBySettings();

                 break;

@@ -340,7 +340,7 @@ 
             throw new Exception("Kan ikke skifte til lavere eller samme status i OnlinePayment->setStatus()");

         }

 

-        switch($status) {

+        switch ($status) {

             case "authorized":

                 $date_field = "date_authorized";

                 break;

@@ -666,7 +666,7 @@ 
 

     function getStatus()

     {

-        $status =  $this->getStatusTypes();

+        $status = $this->getStatusTypes();

         return $status[$this->value['status_key']];

     }

 }
\ No newline at end of file

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 +3 added lines, -3 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');
         }
@@ -56,7 +56,7 @@ 
 
     protected function getProvider($provider, $value = 0)
     {
-        switch(strtolower($provider)) {
+        switch (strtolower($provider)) {
             case 'default':
                 require_once 'Intraface/modules/onlinepayment/provider/Default.php';
                 return new OnlinePaymentDefault($this->kernel, $value);

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

Doc Comments +3 added lines

@@ -46,6 +46,9 @@
     );
     */
 
+    /**
+     * @param integer $id
+     */
     function __construct($kernel, $id)
     {
         parent::__construct($kernel, $id);

Spacing +2 added lines, -2 removed lines

@@ -145,8 +145,8 @@
 
     function getSettings()
     {
-        $this->value['password'] = 	$this->kernel->setting->get('intranet', 'onlinepayment.dandomain.password');
-        $this->value['merchant_id'] = 	$this->kernel->setting->get('intranet', 'onlinepayment.dandomain.merchant_id');
+        $this->value['password'] = $this->kernel->setting->get('intranet', 'onlinepayment.dandomain.password');
+        $this->value['merchant_id'] = $this->kernel->setting->get('intranet', 'onlinepayment.dandomain.merchant_id');
         return $this->value;
     }