intraface / intraface.dk

src/Intraface/modules/onlinepayment/Language.php

Indentation +2 added lines, -2 removed lines

@@ -17,11 +17,11 @@
 
     function getConfirmationEmailSubject($language)
     {
-    	return $this->Translation[$language]->subject;
+        return $this->Translation[$language]->subject;
     }
 
     function getConfirmationEmailBody($language)
     {
-    	return $this->Translation[$language]->email;
+        return $this->Translation[$language]->email;
     }
 }

Spacing +2 added lines, -2 removed lines

@@ -5,8 +5,8 @@
     {
         $this->setTableName('onlinepayment_settings');
         // $this->hasColumn('intranet_id', 'integer', 11, array('greaterthan' => 0)); // defined in intranet template
-        $this->hasColumn('email', 'string',  65555);
-        $this->hasColumn('subject', 'string',  255);
+        $this->hasColumn('email', 'string', 65555);
+        $this->hasColumn('subject', 'string', 255);
     }
 
     public function setUp()

src/Intraface/modules/onlinepayment/Controller/ChooseProvider.php

Indentation +8 added lines, -8 removed lines

@@ -16,8 +16,8 @@ 
     function renderHtml()

     {

         $onlinepayment_module = $this->context->getKernel()->module('onlinepayment');

-    	$onlinepayment = OnlinePayment::factory($this->context->getKernel());

-    	$value = $onlinepayment->getProvider();

+        $onlinepayment = OnlinePayment::factory($this->context->getKernel());

+        $value = $onlinepayment->getProvider();

         $smarty = $this->template->create(dirname(__FILE__) . '/templates/chooseprovider');

         return $smarty->render($this, array('value' => $value));

     }

@@ -26,12 +26,12 @@ 
     {

         $onlinepayment_module = $this->context->getKernel()->module('onlinepayment');

 

-    	$onlinepayment = OnlinePayment::factory($this->context->getKernel());

-    	if ($onlinepayment->setProvider($_POST)) {

-    		return new k_SeeOther($this->url('../'));

-    	} else {

-    		$value = $_POST;

-    	}

+        $onlinepayment = OnlinePayment::factory($this->context->getKernel());

+        if ($onlinepayment->setProvider($_POST)) {

+            return new k_SeeOther($this->url('../'));

+        } else {

+            $value = $_POST;

+        }

         return $this->render();

     }

 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         $onlinepayment_module = $this->context->getKernel()->module('onlinepayment');

     	$onlinepayment = OnlinePayment::factory($this->context->getKernel());

     	$value = $onlinepayment->getProvider();

-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/chooseprovider');

+        $smarty = $this->template->create(dirname(__FILE__).'/templates/chooseprovider');

         return $smarty->render($this, array('value' => $value));

     }

 

src/Intraface/modules/onlinepayment/Controller/Index.php

Indentation +5 added lines, -5 removed lines

@@ -30,12 +30,12 @@ 
         $onlinepayment = OnlinePayment::factory($this->context->getKernel());
 
         if (isset($_GET['status'])) {
-        	$onlinepayment->getDBQuery()->setFilter('status', $_GET['status']);
+            $onlinepayment->getDBQuery()->setFilter('status', $_GET['status']);
         } else {
             $onlinepayment->getDBQuery()->setFilter('status', 2);
         }
         if (isset($_GET['text'])) {
-        	$onlinepayment->getDBQuery()->setFilter('text', $_GET['text']);
+            $onlinepayment->getDBQuery()->setFilter('text', $_GET['text']);
         }
         if (isset($_GET["from_date"]) && $_GET["from_date"] != "") {
             $onlinepayment->getDBQuery()->setFilter("from_date", $_GET["from_date"]);
@@ -47,9 +47,9 @@ 
         $payments = $onlinepayment->getList();
 
         $data = array(
-        	'kernel' => $this->getKernel(),
-        	'payments' => $payments,
-        	'onlinepayment' => $onlinepayment);
+            'kernel' => $this->getKernel(),
+            'payments' => $payments,
+            'onlinepayment' => $onlinepayment);
 
         $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
         return $smarty->render($this, $data);

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         	'payments' => $payments,
         	'onlinepayment' => $onlinepayment);
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/index');
         return $smarty->render($this, $data);
     }
 }
\ No newline at end of file

src/Intraface/modules/onlinepayment/Controller/Settings.php

Indentation +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
         $settings = Doctrine::getTable('Intraface_modules_onlinepayment_Language')->findOneByIntranetId($this->context->getKernel()->intranet->getId());

 

         if (!$settings) {

-        	$settings = new Intraface_modules_onlinepayment_Language;

+            $settings = new Intraface_modules_onlinepayment_Language;

             $settings->save();

         }

         $value = $onlinepayment->getSettings();

@@ -62,7 +62,7 @@ 
          */

         $settings = Doctrine::getTable('Intraface_modules_onlinepayment_Language')->findOneByIntranetId($this->context->getKernel()->intranet->getId());

         if (!$settings) {

-        	$settings = new Intraface_modules_onlinepayment_Language;

+            $settings = new Intraface_modules_onlinepayment_Language;

         }

         $settings->Translation['da']->email = $_POST['email']['da'];

         $settings->Translation['da']->subject = $_POST['subject']['da'];

@@ -74,11 +74,11 @@ 
 

         $settings->save();

 

-    	if ($onlinepayment->setSettings($_POST)) {

-    		return new k_SeeOther($this->url());

-    	} else {

-    		$value = $_POST;

-    	}

+        if ($onlinepayment->setSettings($_POST)) {

+            return new k_SeeOther($this->url());

+        } else {

+            $value = $_POST;

+        }

         return $this->render();

     }

 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
             'value' => $value

         );

 

-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/settings');

+        $smarty = $this->template->create(dirname(__FILE__).'/templates/settings');

         return $smarty->render($this, $data);

     }

 

src/Intraface/modules/onlinepayment/Controller/Payment.php

Indentation +13 added lines, -13 removed lines

@@ -22,21 +22,21 @@
 

     function postForm()

     {

-    	$module = $this->context->getKernel()->module("onlinepayment");

+        $module = $this->context->getKernel()->module("onlinepayment");

         // $onlinepayment = new OnlinePayment($this->context->getKernel(), $_POST['id']);

-    	// $implemented_providers = $onlinepayment_module->getSetting('implemented_providers');

-    	// $implemented_providers[$this->context->getKernel()->setting->get('intranet', 'onlinepayment.provider_key')]

-    	$onlinepayment = OnlinePayment::factory($this->context->getKernel(), 'id',  $this->name());

+        // $implemented_providers = $onlinepayment_module->getSetting('implemented_providers');

+        // $implemented_providers[$this->context->getKernel()->setting->get('intranet', 'onlinepayment.provider_key')]

+        $onlinepayment = OnlinePayment::factory($this->context->getKernel(), 'id',  $this->name());

 

 

-    	if ($onlinepayment->update($_POST)) {

-    		$onlinepayment->load();

-    		$value['dk_amount'] = $onlinepayment->get('dk_amount');

-    		//header("Location: index.php?from_id=".$onlinepayment->get("id"));

-    		//exit;

-    	} else {

-    		$value = $_POST;

-    	}

-    	return $this->render();

+        if ($onlinepayment->update($_POST)) {

+            $onlinepayment->load();

+            $value['dk_amount'] = $onlinepayment->get('dk_amount');

+            //header("Location: index.php?from_id=".$onlinepayment->get("id"));

+            //exit;

+        } else {

+            $value = $_POST;

+        }

+        return $this->render();

     }

 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -12,11 +12,11 @@ 
     {

         $module = $this->context->getKernel()->module("onlinepayment");

         $translation = $this->context->getKernel()->getTranslation('onlinepayment');

-        $onlinepayment = OnlinePayment::factory($this->context->getKernel(), 'id',  $this->name());

+        $onlinepayment = OnlinePayment::factory($this->context->getKernel(), 'id', $this->name());

 

         $value['dk_amount'] = $onlinepayment->get('dk_amount');

 

-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/payment');

+        $smarty = $this->template->create(dirname(__FILE__).'/templates/payment');

         return $smarty->render($this, array('value' => $value, 'kernel' => $this->context->getKernel(), 'onlinepayment' => $onlinepayment));

     }

 

@@ -26,7 +26,7 @@ 
         // $onlinepayment = new OnlinePayment($this->context->getKernel(), $_POST['id']);

     	// $implemented_providers = $onlinepayment_module->getSetting('implemented_providers');

     	// $implemented_providers[$this->context->getKernel()->setting->get('intranet', 'onlinepayment.provider_key')]

-    	$onlinepayment = OnlinePayment::factory($this->context->getKernel(), 'id',  $this->name());

+    	$onlinepayment = OnlinePayment::factory($this->context->getKernel(), 'id', $this->name());

 

 

     	if ($onlinepayment->update($_POST)) {

src/Intraface/modules/invoice/CreditNote.php

Spacing +9 added lines, -9 removed lines

@@ -78,13 +78,13 @@ 
             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;

                     }

                 }

@@ -134,7 +134,7 @@ 
         $voucher->save(array(

             'voucher_number' => $voucher_number,

             'date' => $voucher_date,

-            'text' => 'Kreditnota #' . $this->get('number')

+            'text' => 'Kreditnota #'.$this->get('number')

         ));

 

 

@@ -150,7 +150,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) {

@@ -167,10 +167,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)) {

@@ -187,11 +187,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());

@@ -200,7 +200,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');

         }

Braces +1 added lines, -2 removed lines

@@ -79,8 +79,7 @@
                 $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');

-                }

-                else {

+                } 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') {

src/Intraface/modules/filemanager/FileViewer.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
         $last_modified = filemtime($this->file_path);

 

         header('Content-Type: '.$this->mime_type);

-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $last_modified).' GMT');

+        header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_modified).' GMT');

         header('Cache-Control:');

         header('Content-Disposition: inline; filename='.$this->file_name);

         header('Pragma:');

src/Intraface/modules/filemanager/Append/File.php

Indentation +12 added lines, -12 removed lines

@@ -20,18 +20,18 @@
         // @todo should add the template for intranet
         //$this->actAs('Intraface_Doctrine_Template_Intranet');
         $options = array('created' =>  array('name'          => 'date_created',    // Name of created column
-                                             'type'          => 'timestamp',     // Doctrine column data type
-                                             'options'       => array(),         // Array of options for column
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
-                                             'disabled'      => false,           // Disable the created column(default)
-                                             'expression'    => 'NOW()'),        // Update column with database expression(default=false)
-                         'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default)
-                                             'type'          => 'timestamp',     // Doctrine column data type(default)
-                                             'options'       => array(),         // Array of options for column(default)
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
-                                             'disabled'      => false,           // Disable the updated column(default)
-                                             'expression'    => 'NOW()',         // Use a database expression to set column(default=false)
-                                             'onInsert'      => true));          // Whether or not to set column onInsert(default)
+                                                'type'          => 'timestamp',     // Doctrine column data type
+                                                'options'       => array(),         // Array of options for column
+                                                'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
+                                                'disabled'      => false,           // Disable the created column(default)
+                                                'expression'    => 'NOW()'),        // Update column with database expression(default=false)
+                            'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default)
+                                                'type'          => 'timestamp',     // Doctrine column data type(default)
+                                                'options'       => array(),         // Array of options for column(default)
+                                                'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
+                                                'disabled'      => false,           // Disable the updated column(default)
+                                                'expression'    => 'NOW()',         // Use a database expression to set column(default=false)
+                                                'onInsert'      => true));          // Whether or not to set column onInsert(default)
 
         $this->actAs('Timestampable', $options);
 

Spacing +21 added lines, -21 removed lines

@@ -4,34 +4,34 @@
     function setTableDefinition()
     {
         $this->setTableName('filehandler_append_file');
-        $this->hasColumn('intranet_id',    'integer', 11);
-        $this->hasColumn('date_created',    'datetime');
-        $this->hasColumn('date_updated',    'datetime');
-        $this->hasColumn('belong_to_key',   'integer', 11);
-        $this->hasColumn('belong_to_id',    'integer', 11);
+        $this->hasColumn('intranet_id', 'integer', 11);
+        $this->hasColumn('date_created', 'datetime');
+        $this->hasColumn('date_updated', 'datetime');
+        $this->hasColumn('belong_to_key', 'integer', 11);
+        $this->hasColumn('belong_to_id', 'integer', 11);
         $this->hasColumn('file_handler_id', 'integer', 11);
-        $this->hasColumn('description',     'string', 65555);
-        $this->hasColumn('position',        'integer', 11);
-        $this->hasColumn('active',          'integer', 1);
+        $this->hasColumn('description', 'string', 65555);
+        $this->hasColumn('position', 'integer', 11);
+        $this->hasColumn('active', 'integer', 1);
     }
 
     public function setUp()
     {
         // @todo should add the template for intranet
         //$this->actAs('Intraface_Doctrine_Template_Intranet');
-        $options = array('created' =>  array('name'          => 'date_created',    // Name of created column
-                                             'type'          => 'timestamp',     // Doctrine column data type
-                                             'options'       => array(),         // Array of options for column
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
-                                             'disabled'      => false,           // Disable the created column(default)
-                                             'expression'    => 'NOW()'),        // Update column with database expression(default=false)
-                         'updated' =>  array('name'          => 'date_updated',    // Name of updated column(default)
-                                             'type'          => 'timestamp',     // Doctrine column data type(default)
-                                             'options'       => array(),         // Array of options for column(default)
-                                             'format'        => 'Y-m-d H:i:s',   // Format of date used with PHP date() function(default)
-                                             'disabled'      => false,           // Disable the updated column(default)
-                                             'expression'    => 'NOW()',         // Use a database expression to set column(default=false)
-                                             'onInsert'      => true));          // Whether or not to set column onInsert(default)
+        $options = array('created' =>  array('name'          => 'date_created', // Name of created column
+                                             'type'          => 'timestamp', // Doctrine column data type
+                                             'options'       => array(), // Array of options for column
+                                             'format'        => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default)
+                                             'disabled'      => false, // Disable the created column(default)
+                                             'expression'    => 'NOW()'), // Update column with database expression(default=false)
+                         'updated' =>  array('name'          => 'date_updated', // Name of updated column(default)
+                                             'type'          => 'timestamp', // Doctrine column data type(default)
+                                             'options'       => array(), // Array of options for column(default)
+                                             'format'        => 'Y-m-d H:i:s', // Format of date used with PHP date() function(default)
+                                             'disabled'      => false, // Disable the updated column(default)
+                                             'expression'    => 'NOW()', // Use a database expression to set column(default=false)
+                                             'onInsert'      => true)); // Whether or not to set column onInsert(default)
 
         $this->actAs('Timestampable', $options);
 

src/Intraface/modules/todo/Controller/Setting.php

Indentation +5 added lines, -5 removed lines

@@ -13,8 +13,8 @@ 
         $module = $this->getKernel()->module('todo');

         $translation = $this->getKernel()->getTranslation('todo');

 

-    	$value['publiclist'] = 	$kernel->setting->get('intranet','todo.publiclist');

-    	$value['emailstandardtext'] = 	$kernel->setting->get('user','todo.email.standardtext');

+        $value['publiclist'] = 	$kernel->setting->get('intranet','todo.publiclist');

+        $value['emailstandardtext'] = 	$kernel->setting->get('user','todo.email.standardtext');

 

         $data = array(

             'value' => $value

@@ -26,8 +26,8 @@ 
 

     function postForm()

     {

-    	$kernel->setting->set('intranet','todo.publiclist', $_POST['publiclist']);

-    	$kernel->setting->set('user','todo.email.standardtext', $_POST['emailstandardtext']);

-    	return new k_SeeOther($this->url('../'));

+        $kernel->setting->set('intranet','todo.publiclist', $_POST['publiclist']);

+        $kernel->setting->set('user','todo.email.standardtext', $_POST['emailstandardtext']);

+        return new k_SeeOther($this->url('../'));

     }

 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -13,21 +13,21 @@
         $module = $this->getKernel()->module('todo');

         $translation = $this->getKernel()->getTranslation('todo');

 

-    	$value['publiclist'] = 	$kernel->setting->get('intranet','todo.publiclist');

-    	$value['emailstandardtext'] = 	$kernel->setting->get('user','todo.email.standardtext');

+    	$value['publiclist'] = $kernel->setting->get('intranet', 'todo.publiclist');

+    	$value['emailstandardtext'] = $kernel->setting->get('user', 'todo.email.standardtext');

 

         $data = array(

             'value' => $value

         );

 

-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/setting');

+        $tpl = $this->template->create(dirname(__FILE__).'/templates/setting');

         return $tpl->render($this, $data);

     }

 

     function postForm()

     {

-    	$kernel->setting->set('intranet','todo.publiclist', $_POST['publiclist']);

-    	$kernel->setting->set('user','todo.email.standardtext', $_POST['emailstandardtext']);

+    	$kernel->setting->set('intranet', 'todo.publiclist', $_POST['publiclist']);

+    	$kernel->setting->set('user', 'todo.email.standardtext', $_POST['emailstandardtext']);

     	return new k_SeeOther($this->url('../'));

     }

 }
\ No newline at end of file