intraface / intraface.dk

src/Intraface/modules/filemanager/ImageHandler.php

Doc Comments +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
     /**
      * Constructor
      *
-     * @param object $file_handler
+     * @param FileHandler $file_handler
      *
      * @return void
      */
@@ -141,8 +141,8 @@ 
      *
      * @param float  $width  Width
      * @param float  $height Height
-     * @param float $offset_x offset x
-     * @param float $offset_y offset y
+     * @param integer $offset_x offset x
+     * @param integer $offset_y offset y
      *
      * @return string new file name
      */

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@
 <?php
- /**
-  * Image handler. Klarer h�ndtering af billeder.
-  *
-  * @package Intraface
-  * @author: Sune
-  * @version: 1.0
-  *
-  */
+    /**
+     * Image handler. Klarer h�ndtering af billeder.
+     *
+     * @package Intraface
+     * @author: Sune
+     * @version: 1.0
+     *
+     */
 
 class ImageHandler extends Intraface_Standard
 {

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
         $this->image_library = IMAGE_LIBRARY;
 
         if ($this->file_handler->get('is_image') != 1) {
-            throw new Exception("Filtypen " . $file_handler->get('mime_type') . " er ikke et billede, og kan derfor ikke manipuleres i ImageHandler");
+            throw new Exception("Filtypen ".$file_handler->get('mime_type')." er ikke et billede, og kan derfor ikke manipuleres i ImageHandler");
         }
 
         $this->tempdir_path = $this->file_handler->getTemporaryDirectory();
@@ -80,7 +80,7 @@ 
 
         $image = Image_Transform::factory($this->image_library);
         if (PEAR::isError($image)) {
-            throw new Exception($image->getMessage() . $image->getUserInfo());
+            throw new Exception($image->getMessage().$image->getUserInfo());
         }
 
         if ($this->tmp_file_name != null && file_exists($this->tmp_file_name)) {
@@ -150,7 +150,7 @@ 
     {
         $image = Image_Transform::factory($this->image_library);
         if (PEAR::isError($image)) {
-            throw new Exception($image->getMessage() . $image->getUserInfo());
+            throw new Exception($image->getMessage().$image->getUserInfo());
         }
 
         if ($this->tmp_file_name != null && file_exists($this->tmp_file_name)) {
@@ -168,7 +168,7 @@ 
         $result = $image->crop($width, $height, $offset_x, $offset_y);
 
         if (PEAR::isError($result)) {
-            throw new Exception("Der opstod en fejl under formatering (crop) af billedet i ImageHandler->crop: " . $result->getMessage());
+            throw new Exception("Der opstod en fejl under formatering (crop) af billedet i ImageHandler->crop: ".$result->getMessage());
         }
 
         $file_type = $this->file_handler->get('file_type');

src/Intraface/modules/filemanager/InstanceHandler.php

Doc Comments +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
      * @param object  $file_handler File handler object
      * @param integer $id           Optional id
      *
-     * @return void
+     * @return string
      */
     function __construct($file_handler, $id = 0)
     {
@@ -65,11 +65,11 @@ 
     /**
      * Factory
      *
-     * @param object $file_handler File handler
-     * @param string $type         the instance type
+     * @param FileHandler $file_handler File handler
      * @param array  $param        one or more of crop_width, crop_height, crop_offset_x, crop_offset_y
+     * @param string $type_name
      *
-     * @return object
+     * @return InstanceHandler
      */
     function factory($file_handler, $type_name, $param = array())
     {

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
                 type_key = ".$type['type_key'].",
                 file_size = ".(int)$file_size.",
                 width = ".(int)$width.",
-                height = ".(int)$height.", " .
+                height = ".(int)$height.", ".
                 "crop_parameter = \"".safeToDb($crop_param_string)."\"");
 
             $id = $db->insertedId();
@@ -187,7 +187,7 @@ 
         //$this->value['predefined_size'] = $db->f('predefined_size');
         $this->value['server_file_name'] = $db->f('server_file_name');
         $this->value['file_size'] = $db->f('file_size');
-        $this->value['file_path'] = $this->instance_path . $db->f('server_file_name');
+        $this->value['file_path'] = $this->instance_path.$db->f('server_file_name');
 
         $this->value['last_modified'] = filemtime($this->get('file_path'));
         // $this->value['file_uri'] = FILE_VIEWER.'?id='.$this->get('id').'&type='.$this->get('type').'&name=/'.urlencode($this->file_handler->get('file_name'));

src/Intraface/modules/filemanager/UploadHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
      *       then the filehandler->save method should rather accept some kind of file object which this
      *       object could generate?
      *
-     * @param object $file_handler A filehandler
+     * @param FileHandler $file_handler A filehandler
      *
      * @return void
      */

Spacing +1 added lines, -1 removed lines

@@ -288,7 +288,7 @@
                     continue;
                 }
 
-                $ext = substr($file, strrpos($file, ".")+1);
+                $ext = substr($file, strrpos($file, ".") + 1);
 
                 if (strlen($ext) < 3 || strlen($ext) > 4) {
                     $this->file_handler->error->set("Filen \"".$file."\" har ikke en gyldig endelse, f.eks. .pdf");

src/Intraface/modules/intranetmaintenance/ModuleMaintenance.php

Doc Comments +3 added lines

@@ -85,6 +85,9 @@
         }
     }
 
+    /**
+     * @param string $module_name
+     */
     public function registerModule($module_name)
     {
         $gateway = new Intraface_ModuleGateway(MDB2::singleton(DB_DSN));

src/Intraface/modules/intranetmaintenance/UserMaintenance.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)
     {

src/Intraface/modules/invoice/CreditNote.php

Doc Comments +14 added lines

@@ -15,6 +15,9 @@ 
         parent::__construct($kernel, 'credit_note', $id);
     }
 
+    /**
+     * @param string $status
+     */
     function setStatus($status)
     {
         $return = parent::setStatus($status);
@@ -37,6 +40,9 @@ 
         }
     }
 
+    /**
+     * @return boolean
+     */
     function readyForState($year, $check_products = 'check_products')
     {
         if (!is_object($year)) {
@@ -94,6 +100,14 @@ 
 
     }
 
+    /**
+     * @param Year $year
+     * @param integer $voucher_number
+     * @param string $voucher_date
+     * @param Stub_Translation $translation
+     *
+     * @return boolean
+     */
     function state($year, $voucher_number, $voucher_date, $translation)
     {
         if (!is_object($year)) {

Spacing +9 added lines, -9 removed lines

@@ -78,12 +78,12 @@ 
             for ($i = 0, $max = count($items); $i < $max; $i++) {
                 $product = new Product($this->kernel, $items[$i]['product_id']);
                 if ($product->get('state_account_id') == 0) {
-                    $this->error->set('Produktet ' . $product->get('name') . ' ved ikke hvor den skal bogf�res');
+                    $this->error->set('Produktet '.$product->get('name').' ved ikke hvor den skal bogf�res');
                 } else {
                     require_once 'Intraface/modules/accounting/Account.php';
                     $account = Account::factory($year, $product->get('state_account_id'));
                     if ($account->get('id') == 0 || $account->get('type') != 'operating') {
-                        $this->error->set('Ugyldig konto for bogf�ring af produktet ' . $product->get('name'));
+                        $this->error->set('Ugyldig konto for bogf�ring af produktet '.$product->get('name'));
                         $return = false;
                     }
                 }
@@ -133,7 +133,7 @@ 
         $voucher->save(array(
             'voucher_number' => $voucher_number,
             'date' => $voucher_date,
-            'text' => 'Kreditnota #' . $this->get('number')
+            'text' => 'Kreditnota #'.$this->get('number')
         ));
 
 
@@ -148,7 +148,7 @@ 
             $credit_account_number = $credit_account->get('number');
             $voucher = Voucher::factory($year, $voucher_number);
 
-            $amount = $item['quantity'] * $item['price']->getAsIso(2);
+            $amount = $item['quantity']*$item['price']->getAsIso(2);
 
             // hvis bel�bet er mindre end nul, skal konti byttes om og bel�bet skal g�res positivt
             if ($amount < 0) {
@@ -165,10 +165,10 @@ 
                 'debet_account_number' => $debet_account_number,
                 'credit_account_number' => $credit_account_number,
                 'vat_off' => 1,
-                'text' => $text.' #' . $this->get('number') . ' - ' . $item['name']
+                'text' => $text.' #'.$this->get('number').' - '.$item['name']
             );
             if ($debet_account->get('vat') == 'out') {
-                $total_with_vat += $item["quantity"] * $item["price"]->getAsIso(2);
+                $total_with_vat += $item["quantity"]*$item["price"]->getAsIso(2);
             }
 
             if (!$voucher->saveInDaybook($input_values, true)) {
@@ -185,11 +185,11 @@ 
                     'voucher_number' => $voucher_number,
                     'reference' => $this->get('number'),
                     'date' => $voucher_date,
-                    'amount' => number_format($total_with_vat * $this->kernel->setting->get('intranet', 'vatpercent') / 100, 2, ",", "."), // opm�rksom p� at vat bliver rigtig defineret
+                    'amount' => number_format($total_with_vat*$this->kernel->setting->get('intranet', 'vatpercent')/100, 2, ",", "."), // opm�rksom p� at vat bliver rigtig defineret
                     'debet_account_number' => $debet_account->get('number'),
                     'credit_account_number' => $credit_account->get('number'),
                     'vat_off' => 1,
-                    'text' => $text.' #' . $this->get('number') . ' - ' . $debet_account->get('name')
+                    'text' => $text.' #'.$this->get('number').' - '.$debet_account->get('name')
             );
             if (!$voucher->saveInDaybook($input_values, true)) {
                 $this->error->merge($voucher->error->getMessage());
@@ -198,7 +198,7 @@ 
 
         require_once 'Intraface/modules/accounting/VoucherFile.php';
         $voucher_file = new VoucherFile($voucher);
-        if (!$voucher_file->save(array('description' => $text.' #' . $this->get('number'), 'belong_to'=>'credit_note','belong_to_id'=>$this->get('id')))) {
+        if (!$voucher_file->save(array('description' => $text.' #'.$this->get('number'), 'belong_to'=>'credit_note', 'belong_to_id'=>$this->get('id')))) {
             $this->error->merge($voucher_file->error->getMessage());
             $this->error->set('Filen blev ikke overflyttet');
         }

src/Intraface/modules/invoice/Invoice.php

Doc Comments +8 added lines, -1 removed lines

@@ -17,6 +17,9 @@ 
         parent::__construct($kernel, 'invoice', $id);
     }
 
+    /**
+     * @param string $status
+     */
     function setStatus($status)
     {
         if ($status == 'cancelled') {
@@ -58,7 +61,7 @@ 
     /**
      * returns DebtorAccount object
      *
-     * @return object DebtorAccount
+     * @return DebtorAccount DebtorAccount
      */
     public function getDebtorAccount()
     {
@@ -150,6 +153,10 @@ 
      * @param object year stating year
      * @param integer voucher_number
      * @param string voucher_date
+     * @param Year $year
+     * @param integer $voucher_number
+     * @param string $voucher_date
+     * @param Stub_Translation $translation
      * @return boolean true or false
      */
     function state($year, $voucher_number, $voucher_date, $translation)

Spacing +10 added lines, -10 removed lines

@@ -32,7 +32,7 @@ 
     {
         $db = new DB_Sql;
         $sql = "SELECT id FROM debtor
-            WHERE type=3 AND status=1 AND active = 1 AND due_date < NOW() AND intranet_id = ".$this->kernel->intranet->get("id")." AND contact_id = " . $contact_id;
+            WHERE type=3 AND status=1 AND active = 1 AND due_date < NOW() AND intranet_id = ".$this->kernel->intranet->get("id")." AND contact_id = ".$contact_id;
         $db->query($sql);
 
         return $db->numRows();
@@ -129,12 +129,12 @@ 
             for ($i = 0, $max = count($items); $i < $max; $i++) {
                 $product = new Product($this->kernel, $items[$i]['product_id']);
                 if ($product->get('state_account_id') == 0) {
-                    $this->error->set('Produktet ' . $product->get('name') . ' ved ikke hvor den skal bogf�res');
+                    $this->error->set('Produktet '.$product->get('name').' ved ikke hvor den skal bogf�res');
                 } else {
                     require_once 'Intraface/modules/accounting/Account.php';
                     $account = Account::factory($year, $product->get('state_account_id'));
                     if ($account->get('id') == 0 || $account->get('type') != 'operating') {
-                        $this->error->set('Ugyldig konto for bogføring af produktet ' . $product->get('name'));
+                        $this->error->set('Ugyldig konto for bogføring af produktet '.$product->get('name'));
                         $return = false;
                     }
                 }
@@ -207,7 +207,7 @@ 
             $debet_account_number = $debet_account->get('number');
             $voucher = Voucher::factory($year, $voucher_number);
 
-            $amount = $item['quantity'] * $item['price']->getAsIso(2);
+            $amount = $item['quantity']*$item['price']->getAsIso(2);
 
             // hvis bel�bet er mindre end nul, skal konti byttes om og bel�bet skal g�res positivt
             if ($amount < 0) {
@@ -224,11 +224,11 @@ 
                 'debet_account_number' => $debet_account_number,
                 'credit_account_number' => $credit_account_number,
                 'vat_off' => 1,
-                'text' => $text . ' - ' . $item['name']
+                'text' => $text.' - '.$item['name']
             );
 
             if ($credit_account->get('vat') == 'out') {
-                $total_with_vat += $item["quantity"] * $item["price"]->getAsIso(2);
+                $total_with_vat += $item["quantity"]*$item["price"]->getAsIso(2);
             }
 
             if (!$voucher->saveInDaybook($input_values, true)) {
@@ -241,16 +241,16 @@ 
         if ($total_with_vat > 0) {
             $voucher = Voucher::factory($year, $voucher_number);
             $credit_account = new Account($year, $year->getSetting('vat_out_account_id'));
-            $debet_account =    new Account($year, $year->getSetting('debtor_account_id'));
+            $debet_account = new Account($year, $year->getSetting('debtor_account_id'));
             $input_values = array(
                     'voucher_number' => $voucher_number,
                     'reference' => $this->get('number'),
                     'date' => $voucher_date,
-                    'amount' => number_format($total_with_vat * $this->kernel->setting->get('intranet', 'vatpercent') / 100, 2, ",", "."), // opm�rksom p� at vat bliver rigtig defineret
+                    'amount' => number_format($total_with_vat*$this->kernel->setting->get('intranet', 'vatpercent')/100, 2, ",", "."), // opm�rksom p� at vat bliver rigtig defineret
                     'debet_account_number' => $debet_account->get('number'),
                     'credit_account_number' => $credit_account->get('number'),
                     'vat_off' => 1,
-                    'text' => $text . ' - ' . $credit_account->get('name')
+                    'text' => $text.' - '.$credit_account->get('name')
             );
             if (!$voucher->saveInDaybook($input_values, true)) {
                 $this->error->merge($voucher->error->getMessage());
@@ -259,7 +259,7 @@ 
 
         require_once 'Intraface/modules/accounting/VoucherFile.php';
         $voucher_file = new VoucherFile($voucher);
-        if (!$voucher_file->save(array('description' => $text, 'belong_to'=>'invoice','belong_to_id'=>$this->get('id')))) {
+        if (!$voucher_file->save(array('description' => $text, 'belong_to'=>'invoice', 'belong_to_id'=>$this->get('id')))) {
             $this->error->merge($voucher_file->error->getMessage());
             $this->error->set('Filen blev ikke overflyttet');
         }

src/Intraface/modules/invoice/Payment.php

Doc Comments +4 added lines, -3 removed lines

@@ -360,10 +360,11 @@ 
     /**
      * States the payment i the given year
      *
-     * @param object $year Accounting Year object
+     * @param Year $year Accounting Year object
      * @param integer $voucher_number
      * @param string $voucher_date
      * @param integer $state_account_number
+     * @param Stub_Translation $translation
      *
      * @return boolean true on succes or false.
      */
@@ -454,7 +455,7 @@ 
     /**
      * returns possible payment types
      *
-     * @return array payment types
+     * @return string[] payment types
      *
      */
     public static function getTypes()
@@ -469,7 +470,7 @@ 
     /**
      * returns the possible types payments can be for.
      *
-     * @return array payment for types
+     * @return string[] payment for types
      */
     private static function getPaymentForTypes()
     {

Spacing +7 added lines, -7 removed lines

@@ -48,11 +48,11 @@ 
 
     public function load()
     {
-        $result = $this->db->query('SELECT id, amount, type, description, payment_date, payment_for_id, DATE_FORMAT(payment_date, "%d-%m-%Y") AS dk_payment_date, date_stated, voucher_id FROM invoice_payment ' .
-            'WHERE intranet_id = '.$this->kernel->intranet->get('id').' ' .
-                'AND payment_for = '.$this->payment_for_type_id.' ' .
-                'AND payment_for_id = '.$this->payment_for_id.' ' .
-                'AND type IN ('.implode(',', array_keys($this->getTypes())).')' .
+        $result = $this->db->query('SELECT id, amount, type, description, payment_date, payment_for_id, DATE_FORMAT(payment_date, "%d-%m-%Y") AS dk_payment_date, date_stated, voucher_id FROM invoice_payment '.
+            'WHERE intranet_id = '.$this->kernel->intranet->get('id').' '.
+                'AND payment_for = '.$this->payment_for_type_id.' '.
+                'AND payment_for_id = '.$this->payment_for_id.' '.
+                'AND type IN ('.implode(',', array_keys($this->getTypes())).')'.
                 'AND id = '.$this->id);
 
         if (PEAR::isError($result)) {
@@ -428,7 +428,7 @@ 
 
         $types = $this->getPaymentForTypes();
         // translation is needed!
-        $text = $translation->get('Payment') . ' ' . $this->get('description') . ' ('.$translation->get($types[$this->payment_for_type_id]).' #'.$this->payment_for->get('number') . ')';
+        $text = $translation->get('Payment').' '.$this->get('description').' ('.$translation->get($types[$this->payment_for_type_id]).' #'.$this->payment_for->get('number').')';
 
         $input_values = array(
             'voucher_number' => $voucher_number,
@@ -445,7 +445,7 @@ 
         }
 
         $db = new DB_sql;
-        $db->query("UPDATE invoice_payment SET date_stated = NOW(), voucher_id = ".$voucher->get('id') . " WHERE intranet_id = " . $this->kernel->intranet->getId() . ' AND id = ' . $this->id);
+        $db->query("UPDATE invoice_payment SET date_stated = NOW(), voucher_id = ".$voucher->get('id')." WHERE intranet_id = ".$this->kernel->intranet->getId().' AND id = '.$this->id);
 
         $this->load();
         return true;

src/Intraface/modules/invoice/PaymentGateway.php

Doc Comments +5 added lines, -2 removed lines

@@ -19,6 +19,9 @@ 
         $this->dbquery = $this->getDBQuery();
     }
 
+    /**
+     * @param string|null $id
+     */
     function findById($id)
     {
         $db = new DB_Sql;
@@ -113,7 +116,7 @@ 
     /**
      * returns possible payment types
      *
-     * @return array payment types
+     * @return string[] payment types
      *
      */
     public static function getTypes()
@@ -128,7 +131,7 @@ 
     /**
      * returns the possible types payments can be for.
      *
-     * @return array payment for types
+     * @return string[] payment for types
      */
     private static function getPaymentForTypes()
     {

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     function findById($id)
     {
         $db = new DB_Sql;
-        $db->query('SELECT * FROM invoice_payment WHERE id = ' . $id);
+        $db->query('SELECT * FROM invoice_payment WHERE id = '.$id);
 
         if (!$db->nextRecord()) {
             return false;