intraface / intraface.dk

src/Intraface/modules/accounting/Account.php

Doc Comments +1 added lines, -1 removed lines

@@ -450,7 +450,7 @@
      * @param $date_from (date) yyyy-mm-dd Der s�ges jo kun i indev�rende �r
      * @param $date_to (date) yyyy-mm-dd   Der s�ges kun i indev�rende �r
      *
-     * @return (array) med debet, credit og total saldo
+     * @return boolean med debet, credit og total saldo
      *
      *
      *

Indentation +1 added lines, -1 removed lines

@@ -235,7 +235,7 @@
             $this->error->set('Ikke en tilladt type');
         }
 
-         $validator->isNumeric($var['use_key'], 'Det kan en konto ikke bruges til');
+            $validator->isNumeric($var['use_key'], 'Det kan en konto ikke bruges til');
 
         if (!array_key_exists($var['use_key'], $this->use)) {
             $this->error->set('Ikke en tilladt brug af kontoen');

Spacing +27 added lines, -27 removed lines

@@ -94,7 +94,7 @@ 
         $this->db = new DB_Sql;
         $this->mdb2 = MDB2::singleton(DB_DSN);
         if (PEAR::isError($this->mdb2)) {
-            throw new Exception($this->mdb2->getMessage() . $this->mdb2->getUserInfo());
+            throw new Exception($this->mdb2->getMessage().$this->mdb2->getUserInfo());
         }
 
         $this->error = new Intraface_Error;
@@ -150,8 +150,8 @@ 
                 account.active
             FROM
                 accounting_account account
-            WHERE account.id = " . $this->id . "
-                AND account.intranet_id = ".$this->year->kernel->intranet->get('id'). "
+            WHERE account.id = " . $this->id."
+                AND account.intranet_id = ".$this->year->kernel->intranet->get('id')."
                 AND year_id = ".$this->year->get('id')."
             LIMIT 1";
 
@@ -256,26 +256,26 @@ 
 
         if ($this->id > 0) {
             $sql_type = "UPDATE accounting_account ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         } else {
             $sql_type = "INSERT INTO accounting_account ";
             $sql_end = ", date_created=NOW()";
         }
 
-        $sql = $sql_type . "SET
+        $sql = $sql_type."SET
             number = '".(int)$var['number']."',
-            intranet_id = " . $this->year->kernel->intranet->get('id') . ",
-            user_id = " . $this->year->kernel->user->get("id") . ",
+            intranet_id = " . $this->year->kernel->intranet->get('id').",
+            user_id = " . $this->year->kernel->user->get("id").",
             type_key='" . $var['type_key']."',
             year_id = " . $this->year->get('id').",
             use_key = '" . $var['use_key']."',
             name = '" . $var['name']."',
             comment = '" . $var['comment']."',
-            vat_percent = '" . $var['vat_percent'] . "',
-            sum_to_account_number = " . (int)$var['sum_to'] . ",
-            sum_from_account_number = " . (int)$var['sum_from'] . ",
+            vat_percent = '" . $var['vat_percent']."',
+            sum_to_account_number = " . (int)$var['sum_to'].",
+            sum_from_account_number = " . (int)$var['sum_from'].",
             date_changed = NOW(),
-            vat_key=" . (int)$var['vat_key'] . " " . $sql_end;
+            vat_key=" . (int)$var['vat_key']." ".$sql_end;
 
         $this->db->query($sql);
 
@@ -284,7 +284,7 @@ 
         }
 
         if (!empty($var['created_from_id']) and is_numeric($var['created_from_id'])) {
-            $this->db->query("UPDATE accounting_account SET created_from_id = ".$var['created_from_id']." WHERE id = " . $this->id);
+            $this->db->query("UPDATE accounting_account SET created_from_id = ".$var['created_from_id']." WHERE id = ".$this->id);
         }
 
         $this->load();
@@ -349,7 +349,7 @@ 
             return false;
         }
 
-        $this->db->query("UPDATE accounting_account SET active = 0, date_changed=NOW() WHERE intranet_id = " . $this->year->kernel->intranet->get('id') . " AND year_id = ".$this->year->get('id')." AND id = " . $this->id);
+        $this->db->query("UPDATE accounting_account SET active = 0, date_changed=NOW() WHERE intranet_id = ".$this->year->kernel->intranet->get('id')." AND year_id = ".$this->year->get('id')." AND id = ".$this->id);
         $this->value['active'] = 0;
         return true;
     }
@@ -390,10 +390,10 @@ 
         $sql = "SELECT
                 id
             FROM accounting_account
-            WHERE number = " . $account_number . "
-                AND intranet_id = " . $this->year->kernel->intranet->get('id') . "
-                AND year_id = " .$this->year->get('id'). "
-                AND id <> " . $this->id . " AND active = 1";
+            WHERE number = " . $account_number."
+                AND intranet_id = " . $this->year->kernel->intranet->get('id')."
+                AND year_id = " .$this->year->get('id')."
+                AND id <> " . $this->id." AND active = 1";
         $result = $this->mdb2->query($sql);
         if (PEAR::isError($result)) {
             throw new Exception('Error in query: '.$result->getUserInfo());
@@ -418,8 +418,8 @@ 
     {
         $sql = "SELECT primosaldo_debet, primosaldo_credit
             FROM accounting_account
-            WHERE year_id = " . $this->year->get('id') . "
-                AND id = ".$this->id . "
+            WHERE year_id = " . $this->year->get('id')."
+                AND id = ".$this->id."
                 AND active = 1
                 AND intranet_id = ".$this->year->kernel->intranet->get('id');
 
@@ -499,9 +499,9 @@ 
         if ($this->get('type_key') == array_search('sum', $this->types)) {
             $db2 = new DB_Sql;
             $sql = "SELECT id FROM accounting_account
-                    WHERE number >= " . $this->get('sum_from') . "
+                    WHERE number >= " . $this->get('sum_from')."
                         AND type_key != ".array_search('sum', $this->types)."
-                        AND number <= " . $this->get('sum_to') . "
+                        AND number <= " . $this->get('sum_to')."
                         AND year_id = ".$this->year->get('id')."
                         AND intranet_id = " . $this->year->kernel->intranet->get('id');
             $db2->query($sql);
@@ -567,9 +567,9 @@ 
         $this->db->query("SELECT
                 id
             FROM accounting_post post
-            WHERE (post.account_id = ". $this->id . ")
+            WHERE (post.account_id = ". $this->id.")
                 AND intranet_id = ".$this->year->kernel->intranet->get('id')."
-                AND year_id = " . $this->year->get('id') . "
+                AND year_id = " . $this->year->get('id')."
                 LIMIT 1");
         return $this->db->numRows();
     }
@@ -590,9 +590,9 @@ 
                     debet,
                     credit
                 FROM accounting_post post
-                WHERE (post.account_id = ". $this->get('id') . ")
+                WHERE (post.account_id = ". $this->get('id').")
                     AND intranet_id = ".$this->year->kernel->intranet->get('id')."
-                    AND year_id = " . $this->year->get('id') . "
+                    AND year_id = " . $this->year->get('id')."
                     AND stated = 1
                     ORDER BY date ASC, id ASC");
         $i = 1;
@@ -626,9 +626,9 @@ 
     public function calculateVat($amount, $vat_percent)
     {
         $amount = (float)$amount;
-        $vat_percent = (float)$vat_percent / 100;
+        $vat_percent = (float)$vat_percent/100;
 
-        return $amount * ($vat_percent / (1 + $vat_percent));
+        return $amount*($vat_percent/(1 + $vat_percent));
     }
 
     public function getId()

src/Intraface/modules/accounting/Post.php

Doc Comments +10 added lines, -2 removed lines

@@ -36,6 +36,9 @@ 
         }
     }
 
+    /**
+     * @param integer $post_id
+     */
     public function factory($year, $post_id)
     {
         return Intraface_modules_accounting_PostGateway::getFromYearAndPostId($year, $post_id);
@@ -76,6 +79,13 @@ 
         return 1;
     }
 
+    /**
+     * @param string $date
+     * @param integer $account_id
+     * @param string $text
+     * @param double $debet
+     * @param double $credit
+     */
     private function validate($date, $account_id, $text, $debet, $credit)
     {
         $validator = new Intraface_Validator($this->error);
@@ -99,9 +109,7 @@ 
     /**
      * States the posts
      *
-     * @param integer $year_id
      * @param string  $date
-     * @param string  $voucher_number
      * @param string  $text
      * @param integer $account_id
      * @param float   $debet

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
     private function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT *, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE id = " . $this->id . " AND intranet_id=" .$this->voucher->year->kernel->intranet->get('id'));
+        $db->query("SELECT *, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE id = ".$this->id." AND intranet_id=".$this->voucher->year->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return 0;
         }
@@ -125,14 +125,14 @@ 
 
         if ($this->id > 0) {
             $sql_type = "UPDATE";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         } else {
             $sql_type = "INSERT INTO";
             $sql_end = "";
         }
 
         $db = new DB_Sql;
-        $sql = $sql_type . " accounting_post
+        $sql = $sql_type." accounting_post
                  SET
                     voucher_id = '".$this->voucher->get('id')."',
                     intranet_id = ".$this->
@@ -147,7 +147,7 @@ 
                     account_id = '".(int)$account_id."',
                     text = '".(string)$text."',
                     debet = '".$debet."',
-                    credit = '".$credit."'"  . $sql_end;
+                    credit = '".$credit."'".$sql_end;
         $db->query($sql);
 
         $this->id = $db->insertedId();
@@ -174,7 +174,7 @@ 
         }
 
         $db = new DB_Sql;
-        $db->query("UPDATE accounting_post SET stated = 1 WHERE id = " . $this->id . " AND intranet_id =" .$this->voucher->year->kernel->intranet->get('id'));
+        $db->query("UPDATE accounting_post SET stated = 1 WHERE id = ".$this->id." AND intranet_id =".$this->voucher->year->kernel->intranet->get('id'));
 
         return true;
     }
@@ -186,7 +186,7 @@ 
         }
 
         $db = new DB_Sql;
-        $db->query("DELETE FROM accounting_post WHERE id = " . $this->id);
+        $db->query("DELETE FROM accounting_post WHERE id = ".$this->id);
         return true;
 
     }

src/Intraface/modules/accounting/Voucher.php

Doc Comments +1 added lines, -4 removed lines

@@ -22,7 +22,6 @@ 
      * Constructor
      *
      * @param object  $year_object
-     * @param integer $post_id (optional)
      *
      * @return void
      */
@@ -45,7 +44,7 @@ 
      * @param object $year
      * @param string $voucher_number
      *
-     * @return void
+     * @return Voucher
      */
     function factory($year, $voucher_number)
     {
@@ -339,9 +338,7 @@ 
     /**
      * Prepares amounts for stating, e.g. whether the accounts needs vat calculations
      *
-     * @param integer $year_id
      * @param string  $date
-     * @param string  $voucher_number
      * @param string  $text
      * @param integer $account_id
      * @param float   $debet

Spacing +12 added lines, -12 removed lines

@@ -68,7 +68,7 @@ 
                     voucher.date,
                     voucher.reference
             FROM accounting_voucher voucher
-            WHERE voucher.id = " . $this->id. " AND intranet_id = ". $this->year->kernel->intranet->getId();
+            WHERE voucher.id = " . $this->id." AND intranet_id = ".$this->year->kernel->intranet->getId();
 
         $db = new DB_Sql;
         $db->query($sql);
@@ -143,11 +143,11 @@ 
             $sql_end = ", date_created = NOW()";
         } else {
             $sql_type = "UPDATE";
-            $sql_end = " WHERE id = " . (int)$this->id;
+            $sql_end = " WHERE id = ".(int)$this->id;
         }
 
         $db = new DB_Sql;
-        $sql = $sql_type . " accounting_voucher
+        $sql = $sql_type." accounting_voucher
             SET intranet_id = ".$this->year->kernel->intranet->get('id').",
                 year_id = ".$this->year->get('id').",
                 user_id = ".$this->year->kernel->user->get('id').",
@@ -155,7 +155,7 @@ 
                 number = '".$var['voucher_number']."',
                 date = '".$post_date->get()."',
                 reference = '".$var['reference']."',
-                text = '".$var['text']."'" . $sql_end;
+                text = '".$var['text']."'".$sql_end;
 
         $db->query($sql);
 
@@ -309,7 +309,7 @@ 
             $buy_all_abroad = $buy_abroad;
         }
 
-        $amount = $this->get('amount') * ($this->vatpercent / 100);
+        $amount = $this->get('amount')*($this->vatpercent/100);
 
         // I det omfang du har fradragsret for momsen, kan du medregne det beregnede
         // momsbeløb til konto for indgående moms. Det beregnede momsbeløb af EU-varekøb
@@ -374,13 +374,13 @@ 
                         $debet = $debet - $vat_amount;
                         // bogfør momsen
                         $post = new Post($this);
-                        $post->save($date, $vat_account_id, $text . " - købsmoms", $vat_amount, 0, $skip_draft);
+                        $post->save($date, $vat_account_id, $text." - købsmoms", $vat_amount, 0, $skip_draft);
                     } else {
                         $vat_amount = $this->calculateVat($credit, $vat_percent);
                         $credit = $credit - $vat_amount;
                         // bogføre udgående moms
                         $post = new Post($this);
-                        $post->save($date, $vat_account_id, $text . " - tilbageført moms", 0, $vat_amount, $skip_draft);
+                        $post->save($date, $vat_account_id, $text." - tilbageført moms", 0, $vat_amount, $skip_draft);
                     }
 
                         // bogføre selve posten
@@ -396,7 +396,7 @@ 
                         $credit = $credit - $vat_amount;
                         // bogføre udgående moms
                         $post = new Post($this);
-                        $post->save($date, $vat_account_id, $text . " - salgsmoms", 0, $vat_amount, $skip_draft);
+                        $post->save($date, $vat_account_id, $text." - salgsmoms", 0, $vat_amount, $skip_draft);
                     } else {
                         // tilbagefører momsen hvis det er et debet beløb
                         $vat_amount = $this->calculateVat($debet, $vat_percent);
@@ -455,7 +455,7 @@ 
             $post = new Post($this, $p['id']);
 
             if (!$post->setStated()) {
-                $this->error->set('id#' .$p['id'] . ': Det lykkedes ikke at bogføre denne post.');
+                $this->error->set('id#'.$p['id'].': Det lykkedes ikke at bogføre denne post.');
             }
 
             // tjekker om der har været nogle fejl i bogføringen
@@ -479,7 +479,7 @@ 
         }
 
         if ($this->get('saldo') <> 0) {
-            $this->error->set('Du kan kun bogføre et bilag, hvis det stemmer. Saldoen på dette bilag er ' . $this->get('saldo') . '.');
+            $this->error->set('Du kan kun bogføre et bilag, hvis det stemmer. Saldoen på dette bilag er '.$this->get('saldo').'.');
         }
 
         if ($this->error->isError()) {
@@ -495,7 +495,7 @@ 
             }
 
             if (!$post->setStated()) {
-                $this->error->set('id#' .$p['id'] . ': Det lykkedes ikke at bogføre denne post.');
+                $this->error->set('id#'.$p['id'].': Det lykkedes ikke at bogføre denne post.');
             }
         }
         // tjekker om der har været nogle fejl i bogføringen
@@ -509,7 +509,7 @@ 
     function getPosts()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id, text, debet, credit, account_id, stated, date, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE voucher_id = " . $this->id . " AND intranet_id=".$this->year->kernel->intranet->get('id'));
+        $db->query("SELECT id, text, debet, credit, account_id, stated, date, DATE_FORMAT(date, '%d-%m-%Y') AS date_dk FROM accounting_post WHERE voucher_id = ".$this->id." AND intranet_id=".$this->year->kernel->intranet->get('id'));
         $list = array();
         $i = 0;
         $this->value['saldo'] = 0;

src/Intraface/modules/accounting/Year.php

Doc Comments +13 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
     /**
      * Funktion til at sætte et regnskabsår, som brugeren redigerer i.
      *
-     * @return true
+     * @return boolean
      */
     function setYear()
     {
@@ -85,7 +85,7 @@ 
      *
      * @param boolean $redirect Set to true if a redirect should occur if no year isset
      *
-     * @return boolean
+     * @return null|boolean
      */
     function checkYear($redirect = true)
     {
@@ -439,11 +439,17 @@ 
         return $this->kernel->getSetting()->set('intranet', 'accounting.'.$setting, $value, $this->get('id'));
     }
 
+    /**
+     * @param string $setting
+     */
     function getSetting($setting)
     {
         return $this->kernel->getSetting()->get('intranet', 'accounting.' . $setting, $this->get('id'));
     }
 
+    /**
+     * @param string $type
+     */
     function createAccounts($type, $last_year_id = 0)
     {
         if ($this->getId() == 0) {
@@ -742,7 +748,8 @@ 
 
     /**
      * @param $from->year (object)
-     * @param $setting (string)
+     * @param string $setting (string)
+     * @param Year $from_year
      */
     function transferAccountSetting($from_year, $setting)
     {
@@ -874,6 +881,9 @@ 
         return true;
     }
 
+    /**
+     * @return string
+     */
     public function getId()
     {
         return $this->get('id');

Spacing +24 added lines, -24 removed lines

@@ -144,7 +144,7 @@ 
                 DATE_FORMAT(to_date, '%d-%m-%Y') AS to_date_dk,
                 last_year_id, from_date, to_date, locked, label, vat
             FROM accounting_year
-            WHERE id = '" . $this->id . "'
+            WHERE id = '" . $this->id."'
                 AND intranet_id = ".$this->kernel->intranet->get('id')."
             LIMIT 1";
 
@@ -212,13 +212,13 @@ 
         }
 
         if ($this->id > 0) {
-            $sql="UPDATE accounting_year ";
-            $sql_after=" WHERE id='".$this->id."' AND intranet_id = ".$this->kernel->intranet->get('id')."";
+            $sql = "UPDATE accounting_year ";
+            $sql_after = " WHERE id='".$this->id."' AND intranet_id = ".$this->kernel->intranet->get('id')."";
         } else {
-            $sql="INSERT INTO accounting_year ";
+            $sql = "INSERT INTO accounting_year ";
             $sql_after = ', date_created = NOW()';
         }
-        $sql.=" SET
+        $sql .= " SET
             intranet_id='".$this->kernel->intranet->get('id')."',
             user_id='".$this->kernel->user->get('id')."',
             last_year_id='".$var['last_year_id']."',
@@ -259,7 +259,7 @@ 
     {
         $sql = "SELECT id FROM accounting_year
             WHERE id = ".$this->id."
-                AND intranet_id = ". $this->kernel->intranet->get('id') . " AND active = 1";
+                AND intranet_id = ". $this->kernel->intranet->get('id')." AND active = 1";
 
         $db = new DB_Sql;
         $db->query($sql);
@@ -291,7 +291,7 @@ 
     public function isYearOpen()
     {
         $db = new Db_Sql;
-        $db->query("SELECT locked FROM accounting_year WHERE id = " . $this->id . " AND intranet_id = ".$this->kernel->intranet->get('id'));
+        $db->query("SELECT locked FROM accounting_year WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         if ($db->nextRecord()) {
             if ($db->f('locked') == 1) {
                 return false;
@@ -316,7 +316,7 @@ 
         $date = safeToDb($date);
 
         $db = new Db_Sql;
-        $db->query("SELECT from_date, to_date FROM accounting_year WHERE id= " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id') . " LIMIT 1");
+        $db->query("SELECT from_date, to_date FROM accounting_year WHERE id= ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id')." LIMIT 1");
         if ($db->nextRecord()) {
             if ($db->f('from_date') <= $date and $date <= $db->f('to_date')) {
                 return true;
@@ -403,7 +403,7 @@ 
 
         if (!empty($balance_accounts) and count($balance_accounts) > 0) {
             foreach ($balance_accounts as $account) {
-                $sql_where .= "id = " . $account . " OR ";
+                $sql_where .= "id = ".$account." OR ";
             }
         }
         // hvis der ikke er nogen balance_accounts skal den ikke v�lge nogen poster
@@ -412,7 +412,7 @@ 
         $db = new DB_Sql;
         $db->query("SELECT id FROM accounting_account
             WHERE (".$sql_where.")
-            	AND intranet_id = " . $this->kernel->intranet->get('id') . "
+            	AND intranet_id = " . $this->kernel->intranet->get('id')."
             	AND year_id = " . $this->get('id'));
 
         $accounts = array(); // afstemningskonti
@@ -441,7 +441,7 @@ 
 
     function getSetting($setting)
     {
-        return $this->kernel->getSetting()->get('intranet', 'accounting.' . $setting, $this->get('id'));
+        return $this->kernel->getSetting()->get('intranet', 'accounting.'.$setting, $this->get('id'));
     }
 
     function createAccounts($type, $last_year_id = 0)
@@ -488,7 +488,7 @@ 
 
                     // settings
                     if (!empty($input['setting'])) {
-                        $this->setSetting($input['setting'] . '_account_id', $id);
+                        $this->setSetting($input['setting'].'_account_id', $id);
                     }
                     if (!empty($input['balance_account']) and $input['balance_account'] == 1) {
                         $balance_accounts[] = $id;
@@ -569,7 +569,7 @@ 
 
                 if (is_array($balance_accounts)) {
                     foreach ($balance_accounts as $key => $id) {
-                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
+                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
                         while ($db->nextRecord()) {
                             $new_balance_accounts[] = $db->f('id');
                         }
@@ -584,7 +584,7 @@ 
 
                 if (is_array($buy_eu_accounts)) {
                     foreach ($buy_eu_accounts as $key => $id) {
-                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
+                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
                         while ($db->nextRecord()) {
                             $new_buy_eu_accounts[] = $db->f('id');
                         }
@@ -599,7 +599,7 @@ 
 
                 if (is_array($buy_abroad_accounts)) {
                     foreach ($buy_abroad_accounts as $key => $id) {
-                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . (int)$id);
+                        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".(int)$id);
                         while ($db->nextRecord()) {
                             $new_buy_abroad_accounts[] = $db->f('id');
                         }
@@ -748,7 +748,7 @@ 
     {
         $account_id = $from_year->getSetting($setting);
         $db = new DB_Sql;
-        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = " . $account_id);
+        $db->query("SELECT id FROM accounting_account WHERE year_id = ".$this->get('id')." AND intranet_id = ".$this->kernel->intranet->get('id')." AND created_from_id = ".$account_id);
         if ($db->nextRecord()) {
             $this->setSetting($setting, $db->f('id'));
         }
@@ -826,9 +826,9 @@ 
         }
         $db = new DB_Sql;
         $sql = "SELECT id FROM debtor
-            WHERE type= " . $type_key . "
-                AND intranet_id = " .$this->kernel->intranet->get('id') . "
-                AND (this_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
+            WHERE type= " . $type_key."
+                AND intranet_id = " .$this->kernel->intranet->get('id')."
+                AND (this_date BETWEEN '" . $date_start."' AND '".$date_end."')
                 AND voucher_id = 0
                 AND active = 1";
         $db->query($sql);
@@ -842,8 +842,8 @@ 
     {
         $db = new DB_Sql;
         $sql = "SELECT id FROM invoice_payment
-            WHERE intranet_id = " .$this->kernel->intranet->get('id') . "
-                AND (payment_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
+            WHERE intranet_id = " .$this->kernel->intranet->get('id')."
+                AND (payment_date BETWEEN '" . $date_start."' AND '".$date_end."')
                 AND voucher_id = 0";
         $db->query($sql);
         if ($db->numRows() == 0) {
@@ -856,8 +856,8 @@ 
     {
         $db = new DB_Sql;
         $sql = "SELECT id FROM procurement
-            WHERE intranet_id = " .$this->kernel->intranet->get('id') . "
-                AND (invoice_date BETWEEN '" . $date_start . "' AND '" .$date_end . "')
+            WHERE intranet_id = " .$this->kernel->intranet->get('id')."
+                AND (invoice_date BETWEEN '" . $date_start."' AND '".$date_end."')
                 AND voucher_id = 0
                 AND active = 1";
         $db->query($sql);
@@ -870,7 +870,7 @@ 
     function lock()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE accounting_year SET locked = 1 WHERE id = " . $this->id);
+        $db->query("UPDATE accounting_year SET locked = 1 WHERE id = ".$this->id);
         return true;
     }
 

src/Intraface/modules/administration/UserAdministration.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/cms/CKEditor.php

Doc Comments +1 added lines

@@ -468,6 +468,7 @@
 
     /**
      * Return path to ckeditor.js.
+     * @return string
      */
     private function ckeditorPath()
     {

Spacing +14 added lines, -14 removed lines

@@ -73,7 +73,7 @@ 
      * When %CKEditor is created with the editor() method, a HTML <textarea> element is created,
      * it will be displayed to anyone with JavaScript disabled or with incompatible browser.
      */
-    public $textareaAttributes = array( "rows" => 8, "cols" => 60 );
+    public $textareaAttributes = array("rows" => 8, "cols" => 60);
     /**
      * A string indicating the creation date of %CKEditor.
      * Do not change it unless you want to force browsers to not use previously cached version of %CKEditor.
@@ -133,9 +133,9 @@ 
     {
         $attr = "";
         foreach ($this->textareaAttributes as $key => $val) {
-            $attr.= " " . $key . '="' . str_replace('"', '"', $val) . '"';
+            $attr .= " ".$key.'="'.str_replace('"', '"', $val).'"';
         }
-        $out = "<textarea name=\"" . $name . "\"" . $attr . ">" . htmlspecialchars($value) . "</textarea>\n";
+        $out = "<textarea name=\"".$name."\"".$attr.">".htmlspecialchars($value)."</textarea>\n";
         if (!$this->initialized) {
             $out .= $this->init();
         }
@@ -234,11 +234,11 @@ 
             $classDetection = "";
             $js .= "CKEDITOR.replaceAll( function(textarea, config) {\n";
             if (!empty($className)) {
-                $js .= "    var classRegex = new RegExp('(?:^| )' + '". $className ."' + '(?:$| )');\n";
+                $js .= "    var classRegex = new RegExp('(?:^| )' + '".$className."' + '(?:$| )');\n";
                 $js .= "    if (!classRegex.test(textarea.className))\n";
                 $js .= "        return false;\n";
             }
-            $js .= "    CKEDITOR.tools.extend(config, ". $this->jsEncode($_config) .", true);";
+            $js .= "    CKEDITOR.tools.extend(config, ".$this->jsEncode($_config).", true);";
             $js .= "} );";
         }
 
@@ -412,7 +412,7 @@ 
                     }
                     // Return only new events
                     if (!in_array($code, $returnedEvents[$eventName])) {
-                        $out .= ($code ? "\n" : "") . "CKEDITOR.on('". $eventName ."', $code);";
+                        $out .= ($code ? "\n" : "")."CKEDITOR.on('".$eventName."', $code);";
                         $returnedEvents[$eventName][] = $code;
                     }
                 }
@@ -443,19 +443,19 @@ 
         $ckeditorPath = $this->ckeditorPath();
 
         if (!empty($this->timestamp) && $this->timestamp != "%"."TIMESTAMP%") {
-            $args = '?t=' . $this->timestamp;
+            $args = '?t='.$this->timestamp;
         }
 
         // Skip relative paths...
         if (strpos($ckeditorPath, '..') !== 0) {
-            $out .= $this->script("window.CKEDITOR_BASEPATH='". $ckeditorPath ."';");
+            $out .= $this->script("window.CKEDITOR_BASEPATH='".$ckeditorPath."';");
         }
 
-        $out .= "<script type=\"text/javascript\" src=\"" . $ckeditorPath . 'ckeditor.js' . $args . "\"></script>\n";
+        $out .= "<script type=\"text/javascript\" src=\"".$ckeditorPath.'ckeditor.js'.$args."\"></script>\n";
 
         $extraCode = "";
         if ($this->timestamp != self::timestamp) {
-            $extraCode .= ($extraCode ? "\n" : "") . "CKEDITOR.timestamp = '". $this->timestamp ."';";
+            $extraCode .= ($extraCode ? "\n" : "")."CKEDITOR.timestamp = '".$this->timestamp."';";
         }
         if ($extraCode) {
             $out .= $this->script($extraCode);
@@ -486,7 +486,7 @@ 
             /**
              * realpath — Returns canonicalized absolute pathname
              */
-            $realPath = realpath('./') ;
+            $realPath = realpath('./');
         }
 
         /**
@@ -546,7 +546,7 @@ 
 
                 $val = str_replace($jsonReplaces[0], $jsonReplaces[1], $val);
 
-                return '"' . $val . '"';
+                return '"'.$val.'"';
             }
         }
         $isList = true;
@@ -561,12 +561,12 @@ 
             foreach ($val as $v) {
                 $result[] = $this->jsEncode($v);
             }
-            return '[ ' . join(', ', $result) . ' ]';
+            return '[ '.join(', ', $result).' ]';
         } else {
             foreach ($val as $k => $v) {
                 $result[] = $this->jsEncode($k).': '.$this->jsEncode($v);
             }
-            return '{ ' . join(', ', $result) . ' }';
+            return '{ '.join(', ', $result).' }';
         }
     }
 }

src/Intraface/modules/cms/Controller/Templates.php

Doc Comments +3 added lines

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

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
     function getSiteId()
     {
-         return $this->context->name();
+            return $this->context->name();
     }
 
     function renderHtml()

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
             'templates' => $templates
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/templates');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/templates');
         return $tpl->render($this, $data);
     }
 
@@ -54,7 +54,7 @@ 
             'translation' => $this->getKernel()->getTranslation()
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/template-edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/template-edit');
         return $tpl->render($this, $data);
     }
 

src/Intraface/modules/cms/Element.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
     /**
      * Creates a parameter
      *
-     * @return object
+     * @return CMS_Parameter
      */
     function createParameter()
     {

Spacing +12 added lines, -12 removed lines

@@ -41,9 +41,9 @@ 
      */
     function __construct($section, $id = 0)
     {
-        $this->value['identify_as'] = 'cms_element';  // bruges af parameter
+        $this->value['identify_as'] = 'cms_element'; // bruges af parameter
 
-        $this->id        = (int) $id;
+        $this->id        = (int)$id;
         $this->kernel    = $section->kernel;
         $this->section   = $section;
         $this->error     = new Intraface_Error;
@@ -63,7 +63,7 @@ 
 
     function getPosition(DB_Sql $db)
     {
-        return new Ilib_Position($db, "cms_element", $this->id, "section_id=".$this->section->get('id')." AND active = 1 AND intranet_id = " . $this->kernel->intranet->get('id'), "position", "id");
+        return new Ilib_Position($db, "cms_element", $this->id, "section_id=".$this->section->get('id')." AND active = 1 AND intranet_id = ".$this->kernel->intranet->get('id'), "position", "id");
     }
 
     /**
@@ -125,7 +125,7 @@ 
         }
 
         $db = new DB_Sql;
-        $db->query("SELECT id, section_id, date_expire, date_publish, type_key, position FROM cms_element WHERE intranet_id = ".$this->section->kernel->intranet->get('id')." AND id = " . $this->id);
+        $db->query("SELECT id, section_id, date_expire, date_publish, type_key, position FROM cms_element WHERE intranet_id = ".$this->section->kernel->intranet->get('id')." AND id = ".$this->id);
         if (!$db->nextRecord()) {
             return 0;
         }
@@ -147,7 +147,7 @@ 
         $this->value['extra_class'] = '';
 
         if ($this->get('elm_width')) {
-            $this->value['extra_style'] .= 'width: ' . $this->get('elm_width') . ';';
+            $this->value['extra_style'] .= 'width: '.$this->get('elm_width').';';
         }
 
         if ($this->get('elm_properties') == 'float') {
@@ -161,7 +161,7 @@ 
             $this->value['extra_style'] .= ' clear: both;';
         }
         if ($this->get('elm_adjust')) {
-            $this->value['extra_class'] .= ' cms-align-' . $this->get('elm_adjust');
+            $this->value['extra_class'] .= ' cms-align-'.$this->get('elm_adjust');
         }
 
         if ($this->get('elm_box') == 'box') {
@@ -237,11 +237,11 @@ 
             $sql_end = ", date_created = NOW()";
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         }
-        $sql = $sql_type . " cms_element SET
+        $sql = $sql_type." cms_element SET
                 intranet_id = ".$this->section->kernel->intranet->get('id').",
-                section_id=". (int)$this->section->get('id') . ",
+                section_id=". (int)$this->section->get('id').",
                 type_key = ".safeToDb($this->value['type_key']).",
                 date_changed = NOW(),
                 date_publish = ".$date_publish.",
@@ -254,7 +254,7 @@ 
             $this->id = $db->insertedId();
 
             $next_pos = $this->getPosition($db)->getMaxPosition() + 1;
-            $db->query("UPDATE cms_element SET position = " . $next_pos . " WHERE id = " . $this->id);
+            $db->query("UPDATE cms_element SET position = ".$next_pos." WHERE id = ".$this->id);
         }
 
         $this->load();
@@ -290,7 +290,7 @@ 
     public function delete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_element SET active = 0 WHERE id = " . $this->id);
+        $db->query("UPDATE cms_element SET active = 0 WHERE id = ".$this->id);
         return true;
     }
 
@@ -302,7 +302,7 @@ 
     public function undelete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE cms_element SET active = 1 WHERE id = " . $this->id);
+        $db->query("UPDATE cms_element SET active = 1 WHERE id = ".$this->id);
         return true;
     }
 

src/Intraface/modules/cms/element/Pagelist.php

Doc Comments +3 added lines

@@ -5,6 +5,9 @@
 class Intraface_modules_cms_element_Pagelist extends CMS_Element
 {
 
+    /**
+     * @param FakeCMSSection $section
+     */
     function __construct($section, $id = 0)
     {
         $this->value['type'] = 'pagelist';