intraface / intraface.dk

src/Intraface/modules/administration/Controller/Intranet.php

Indentation +36 added lines, -36 removed lines

@@ -21,26 +21,26 @@ 
         $shared_filehandler = $this->getKernel()->useModule('filemanager');

 

         if (isset($_GET['return_redirect_id'])) {

-        	$redirect = Intraface_Redirect::factory($this->getKernel(), 'return');

-        	$file_id = $redirect->getParameter('file_handler_id');

-

-        	$intranet = new IntranetAdministration($this->getKernel());

-        	$filehandler = new FileHandler($this->getKernel(), intval($file_id));

-        	if ($filehandler->get('id') != 0) {

-

-        		$type = $filehandler->get('file_type');

-        		if ($type['mime_type'] == 'image/jpeg' || $type['mime_type'] == 'image/pjpeg') {

-        			$values = $intranet->get();

-        			$values['pdf_header_file_id'] = $filehandler->get('id');

-        			$intranet->update($values);

-        		} else {

-        			$filehandler->error->set('Header should be a .jpg image - got '. $filehandler->get('file_type'));

-        		}

-        	}

+            $redirect = Intraface_Redirect::factory($this->getKernel(), 'return');

+            $file_id = $redirect->getParameter('file_handler_id');

+

+            $intranet = new IntranetAdministration($this->getKernel());

+            $filehandler = new FileHandler($this->getKernel(), intval($file_id));

+            if ($filehandler->get('id') != 0) {

+

+                $type = $filehandler->get('file_type');

+                if ($type['mime_type'] == 'image/jpeg' || $type['mime_type'] == 'image/pjpeg') {

+                    $values = $intranet->get();

+                    $values['pdf_header_file_id'] = $filehandler->get('id');

+                    $intranet->update($values);

+                } else {

+                    $filehandler->error->set('Header should be a .jpg image - got '. $filehandler->get('file_type'));

+                }

+            }

         }

-    	$intranet = $this->getIntranetMaintenance();

-    	$values = $intranet->get();

-    	$address = $intranet->address->get();

+        $intranet = $this->getIntranetMaintenance();

+        $values = $intranet->get();

+        $address = $intranet->address->get();

 

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

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

@@ -59,12 +59,12 @@ 
     {

         $modul = $this->getKernel()->module('administration');

         $shared_filehandler = $this->getKernel()->useModule('filemanager');

-      	$intranet = $this->getIntranetMaintenance();

-       	$values = $_POST;

+            $intranet = $this->getIntranetMaintenance();

+            $values = $_POST;

 

-       	$filehandler = new FileHandler($this->getKernel());

-       	$filehandler->createUpload();

-       	if ($filehandler->upload->isUploadFile('new_pdf_header_file') && $id = $filehandler->upload->upload('new_pdf_header_file')) {

+            $filehandler = new FileHandler($this->getKernel());

+            $filehandler->createUpload();

+            if ($filehandler->upload->isUploadFile('new_pdf_header_file') && $id = $filehandler->upload->upload('new_pdf_header_file')) {

             $filehandler->load();

 

             $type = $filehandler->get('file_type');

@@ -74,29 +74,29 @@ 
                 $intranet->error->set('Header should be a .jpg image - got ' . $type['mime_type']);

                 $filehandler->delete();

             }

-       	}

+            }

 

         if ($intranet->update($values)) {

             $address_values = $_POST;

             $address_values['name'] = $_POST['address_name'];

-        	if ($intranet->address->validate($address_values) && $intranet->address->save($address_values)) {

-        		if (isset($_POST['choose_file']) && $this->getKernel()->user->hasModuleAccess('filemanager')) {

-        			$module_filemanager = $this->getKernel()->useModule('filemanager');

-        			$redirect = Intraface_Redirect::factory($this->getKernel(), 'go');

-        			$url = $redirect->setDestination($module_filemanager->getPath().'select_file?images=1');

-        			$redirect->askParameter('file_handler_id');

-        			return new k_SeeOther($url);

-        		}

+            if ($intranet->address->validate($address_values) && $intranet->address->save($address_values)) {

+                if (isset($_POST['choose_file']) && $this->getKernel()->user->hasModuleAccess('filemanager')) {

+                    $module_filemanager = $this->getKernel()->useModule('filemanager');

+                    $redirect = Intraface_Redirect::factory($this->getKernel(), 'go');

+                    $url = $redirect->setDestination($module_filemanager->getPath().'select_file?images=1');

+                    $redirect->askParameter('file_handler_id');

+                    return new k_SeeOther($url);

+                }

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

-        	}

+            }

         }

 

-       	return $this->render();

+            return $this->render();

     }

 

     function getKernel()

     {

-    	return $this->context->getKernel();

+        return $this->context->getKernel();

     }

 

     function getFilehandler()

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
 

     function renderHtml()

     {

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

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

         return $smarty->render($this);

     }

 

@@ -34,7 +34,7 @@ 
         			$values['pdf_header_file_id'] = $filehandler->get('id');

         			$intranet->update($values);

         		} else {

-        			$filehandler->error->set('Header should be a .jpg image - got '. $filehandler->get('file_type'));

+        			$filehandler->error->set('Header should be a .jpg image - got '.$filehandler->get('file_type'));

         		}

         	}

         }

@@ -42,7 +42,7 @@ 
     	$values = $intranet->get();

     	$address = $intranet->address->get();

 

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

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

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

     }

 

@@ -71,7 +71,7 @@ 
             if ($type['mime_type'] == 'image/jpeg' || $type['mime_type'] == 'image/pjpeg') {

                 $values['pdf_header_file_id'] = $id;

             } else {

-                $intranet->error->set('Header should be a .jpg image - got ' . $type['mime_type']);

+                $intranet->error->set('Header should be a .jpg image - got '.$type['mime_type']);

                 $filehandler->delete();

             }

        	}

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

Indentation +1 added lines, -1 removed lines

@@ -28,6 +28,6 @@
 

     function getKernel()

     {

-    	return $this->context->getKernel();

+        return $this->context->getKernel();

     }

 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 

     function renderHtml()

     {

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

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

         return $smarty->render($this);

     }

 

src/Intraface/Setting.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
     {

         global $_setting;

 

-        require_once dirname(__FILE__) . '/config/setting_kernel.php';

+        require_once dirname(__FILE__).'/config/setting_kernel.php';

 

         $this->db = new DB_Sql;

         $this->system = &$_setting; // don't remove the & - otherwise it will not work

@@ -170,7 +170,7 @@ 
     private function loadSettings()

     {

         $this->settings = array();

-        $this->db->query("SELECT setting, value, sub_id, user_id FROM setting WHERE intranet_id = " . $this->db->quote($this->intranet_id, 'integer')." AND (user_id = ".$this->db->quote($this->user_id, 'integer')." OR user_id = 0)");

+        $this->db->query("SELECT setting, value, sub_id, user_id FROM setting WHERE intranet_id = ".$this->db->quote($this->intranet_id, 'integer')." AND (user_id = ".$this->db->quote($this->user_id, 'integer')." OR user_id = 0)");

         while ($this->db->nextRecord()) {

             $this->settings[$this->intranet_id][$this->db->f('user_id')][$this->db->f('setting')][$this->db->f('sub_id')] = $this->db->f('value');

         }

@@ -266,7 +266,7 @@ 
     function isSettingSet($type, $setting, $sub_id = 0)

     {

         if ($this->checkSystem($setting) && $this->checkType($type)) {

-            switch($type) {

+            switch ($type) {

                 case 'user':

                     if ($this->checkLogin()) {

                         $this->db->query("SELECT value FROM setting WHERE setting = \"".$setting."\" AND intranet_id = ".$this->intranet_id." AND user_id = ".$this->user_id." AND sub_id = ".intval($sub_id));

src/Intraface/Factory.php

Indentation +2 added lines, -2 removed lines

@@ -144,8 +144,8 @@
     function new_Cache_Lite()
     {
         $options = array(
-    		'cacheDir' => PATH_CACHE,
-    		'lifeTime' => 3600
+            'cacheDir' => PATH_CACHE,
+            'lifeTime' => 3600
         );
 
         return new Cache_Lite($options);

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
     {
         $db = MDB2::singleton(DB_DSN, array('persistent' => true));
         if (PEAR::isError($db)) {
-            throw new Exception($db->getMessage() . $db->getUserInfo());
+            throw new Exception($db->getMessage().$db->getUserInfo());
         }
 
         $db->setFetchMode(MDB2_FETCHMODE_ASSOC);
@@ -80,7 +80,7 @@ 
         //always check for errors. In this examples, error checking is omitted
         //to make the example concise.
         if (PEAR::isError($translation)) {
-            throw new Exception('Could not start Translation ' . $translation->getMessage());
+            throw new Exception('Could not start Translation '.$translation->getMessage());
         }
 
         // set the group of strings you want to fetch from
@@ -99,9 +99,9 @@ 
         // %url% will be replaced with the targeted url
         //$this->translation->outputString = '%stringID% (%pageID_url%)'; //default: '%stringID%'
         $translation->outputString = '%stringID%';
-        $translation->url = '';           //same as default
-        $translation->emptyPrefix  = '';  //default: empty string
-        $translation->emptyPostfix = '';  //default: empty string
+        $translation->url = ''; //same as default
+        $translation->emptyPrefix  = ''; //default: empty string
+        $translation->emptyPostfix = ''; //default: empty string
         return $translation;
     }
 

src/Intraface/Page.php

Indentation +6 added lines, -6 removed lines

@@ -226,20 +226,20 @@
     {

         return array(

             1 => array(

-              'label' => 'system',

-              'dir' => '/system/',

+                'label' => 'system',

+                'dir' => '/system/',

                     'name' => 'Web 2.0',

                     'description' => 'Spr�lsk, vildt og pastel.'

             ),

             2 => array(

-              'label' => 'newsystem',

-              'dir' => '/newsystem/',

+                'label' => 'newsystem',

+                'dir' => '/newsystem/',

                     'name' => 'Standard',

                     'description' => 'Standard.'

             ),

             3 => array(

-              'label' => 'black',

-              'dir' => '/black/',

+                'label' => 'black',

+                'dir' => '/black/',

                     'name' => 'Den sorte ridder',

                     'description' => 'Det gamle tema. Nydeligt og kedeligt.'

             )

Spacing +6 added lines, -6 removed lines

@@ -87,14 +87,14 @@ 
             // menuen

             $this->menu = array();

             $i = 0;

-            $this->menu[$i]['name'] = $this->t('dashboard', 'dashboard');;

+            $this->menu[$i]['name'] = $this->t('dashboard', 'dashboard'); ;

             $this->menu[$i]['url'] = url('/core/restricted/');

             $i++;

             $res = $this->db->query("SELECT name, menu_label, name FROM module WHERE active = 1 AND show_menu = 1 ORDER BY menu_index");

             foreach ($res->fetchAll() as $row) {

                 if ($this->kernel->user->hasModuleAccess($row['name'])) {

                     $this->menu[$i]['name'] = $this->t($row['name'], $row['name']);

-                    $this->menu[$i]['url'] = url('/core/restricted/module/' . $row["name"]);

+                    $this->menu[$i]['url'] = url('/core/restricted/module/'.$row["name"]);

                     $i++;

                 }

             }

@@ -110,7 +110,7 @@ 
                         if ($all_submenu[$i]['sub_access'] != '') {

                             $sub = explode(":", $all_submenu[$i]['sub_access']);

 

-                            switch($sub[0]) {

+                            switch ($sub[0]) {

                                 case 'sub_access':

                                     if ($this->kernel->user->hasSubAccess($this->primary_module->module_name, $sub[1])) {

                                         $access = true;

@@ -133,7 +133,7 @@ 
 

                         if ($access) {

                             $this->submenu[$j]['name'] = $this->t($all_submenu[$i]['label'], $this->primary_module->getName());

-                            $this->submenu[$j]['url'] = $this->primary_module->getPath(). $all_submenu[$i]['url'];

+                            $this->submenu[$j]['url'] = $this->primary_module->getPath().$all_submenu[$i]['url'];

                             $j++;

                         }

                     }

@@ -143,7 +143,7 @@ 
             $javascript = '';

             if (!empty($this->javascript_path) AND count($this->javascript_path) > 0) {

                 for ($i = 0, $max = count($this->javascript_path); $i < $max; $i++) {

-                    $javascript .= '<script type="text/javascript" src="'.$this->javascript_path[$i].'"></script>' . "\n";

+                    $javascript .= '<script type="text/javascript" src="'.$this->javascript_path[$i].'"></script>'."\n";

                 }

             }

             /*

@@ -198,7 +198,7 @@ 
             $this->usermenu[1]['url'] = url('/core/restricted/switchintranet');

         }

         }

-        $this->usermenu[2]['name'] = $this->t('control panel', 'common');;

+        $this->usermenu[2]['name'] = $this->t('control panel', 'common'); ;

         $this->usermenu[2]['url'] = url('/core/restricted/module/controlpanel');

 

         //include(PATH_INCLUDE_IHTML.'/intraface/bottom.php');

src/Intraface/XMLRPC/OnlinePayment/Server0002.php

Indentation +6 added lines, -6 removed lines

@@ -171,12 +171,12 @@
         }

 

         $data = array('contact_id' => $debtor->getContact()->getId(),

-                      'subject'    => $subject,

-                      'body'       => $body,

-                      'from_email' => $this->kernel->intranet->address->get('email'),

-                      'from_name'  => $this->kernel->intranet->address->get('name'),

-                      'type_id'    => 13, // onlinepayment

-                      'belong_to'  => $payment_id);

+                        'subject'    => $subject,

+                        'body'       => $body,

+                        'from_email' => $this->kernel->intranet->address->get('email'),

+                        'from_name'  => $this->kernel->intranet->address->get('name'),

+                        'type_id'    => 13, // onlinepayment

+                        'belong_to'  => $payment_id);

 

         if (!$email->save($data)) {

             throw new Exception('Could not save email to onlinepayment');

Spacing +9 added lines, -9 removed lines

@@ -131,7 +131,7 @@ 
 

         if (!$payment_id = $onlinepayment->save($values)) {

             // this is probably a little to hard reaction.

-            throw new XML_RPC2_FaultException('Onlinebetaling kunne ikke blive gemt ' . strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('Onlinebetaling kunne ikke blive gemt '.strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

         }

 

         if ($onlinepayment->get('status') == 'authorized') {

@@ -154,20 +154,20 @@ 
 

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

 

-            $subject = $settings->getConfirmationEmailSubject($shop->getLanguage()) . ' (#' . $payment_id . ')';

-            $body = $settings->getConfirmationEmailBody($shop->getLanguage()) . "\n\n" . $this->kernel->intranet->address->get('name');

+            $subject = $settings->getConfirmationEmailSubject($shop->getLanguage()).' (#'.$payment_id.')';

+            $body = $settings->getConfirmationEmailBody($shop->getLanguage())."\n\n".$this->kernel->intranet->address->get('name');

 

         } catch (Exception $e) {

         }

 

         if (empty($subject)) {

-            $subject = 'Payment confirmation / betalingsbekræftelse (#' . $payment_id . ')';

+            $subject = 'Payment confirmation / betalingsbekræftelse (#'.$payment_id.')';

         }

 

         if (empty($body)) {

-            $body    = 'We have received your payment for order #' .$debtor->getId(). '.' . "\n\n";

-            $body   .= 'Vi har modtaget din betaling for ordre #' .$debtor->getId(). '.';

-            $body   .= "\n\nYours sincerely / Venlig hilsen\n".  $this->kernel->intranet->address->get('name');

+            $body    = 'We have received your payment for order #'.$debtor->getId().'.'."\n\n";

+            $body   .= 'Vi har modtaget din betaling for ordre #'.$debtor->getId().'.';

+            $body   .= "\n\nYours sincerely / Venlig hilsen\n".$this->kernel->intranet->address->get('name');

         }

 

         $data = array('contact_id' => $debtor->getContact()->getId(),

@@ -184,7 +184,7 @@ 
 

         if (!$email->queue()) {

             $this->error->merge($email->error->getMessage());

-            throw new Exception('Could not send email to ' . $debtor->getContact()->getId());

+            throw new Exception('Could not send email to '.$debtor->getContact()->getId());

         }

 

         return true;

@@ -204,7 +204,7 @@ 
 

         if (!$payment_id = $onlinepayment->create()) {

             // this is probably a little to hard reaction

-            throw new XML_RPC2_FaultException('onlinepayment could not be created' . strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('onlinepayment could not be created'.strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData($payment_id);

src/Intraface/XMLRPC/OnlinePayment/Server.php

Indentation +6 added lines, -6 removed lines

@@ -114,12 +114,12 @@
         $body   .= "\n\nYours sincerely / Venlig hilsen\n".  $this->kernel->intranet->address->get('name');

 

         $data = array('contact_id' => $debtor->getContact()->getId(),

-                      'subject'    => $subject,

-                      'body'       => $body,

-                      'from_email' => $this->kernel->intranet->address->get('email'),

-                      'from_name'  => $this->kernel->intranet->address->get('name'),

-                      'type_id'    => 13, // onlinepayment

-                      'belong_to'  => $payment_id);

+                        'subject'    => $subject,

+                        'body'       => $body,

+                        'from_email' => $this->kernel->intranet->address->get('email'),

+                        'from_name'  => $this->kernel->intranet->address->get('name'),

+                        'type_id'    => 13, // onlinepayment

+                        'belong_to'  => $payment_id);

 

         if (!$email->save($data)) {

             throw new Exception('Could not save email to onlinepayment');;

Spacing +8 added lines, -8 removed lines

@@ -95,7 +95,7 @@ 
 

         if (!$payment_id = $onlinepayment->save($values)) {

             // this is probably a little to hard reaction.

-            throw new XML_RPC2_FaultException('Onlinebetaling kunne ikke blive gemt ' . strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('Onlinebetaling kunne ikke blive gemt '.strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

         }

 

         $this->sendEmailOnOnlinePayment($debtor, $payment_id);

@@ -108,10 +108,10 @@ 
         $this->kernel->useShared('email');

         $email = new Email($this->kernel);

 

-        $subject = 'Payment confirmation / betalingsbekræftelse (#' . $payment_id . ')';

-        $body    = 'We have received your payment for order #' .$debtor->getId(). '.' . "\n\n";

-        $body   .= 'Vi har modtaget din betaling for ordre #' .$debtor->getId(). '.';

-        $body   .= "\n\nYours sincerely / Venlig hilsen\n".  $this->kernel->intranet->address->get('name');

+        $subject = 'Payment confirmation / betalingsbekræftelse (#'.$payment_id.')';

+        $body    = 'We have received your payment for order #'.$debtor->getId().'.'."\n\n";

+        $body   .= 'Vi har modtaget din betaling for ordre #'.$debtor->getId().'.';

+        $body   .= "\n\nYours sincerely / Venlig hilsen\n".$this->kernel->intranet->address->get('name');

 

         $data = array('contact_id' => $debtor->getContact()->getId(),

                       'subject'    => $subject,

@@ -122,13 +122,13 @@ 
                       'belong_to'  => $payment_id);

 

         if (!$email->save($data)) {

-            throw new Exception('Could not save email to onlinepayment');;

+            throw new Exception('Could not save email to onlinepayment'); ;

             return false;

         }

 

         if (!$email->queue()) {

             $this->error->merge($email->error->getMessage());

-            throw new Exception('Could not send email to ' . $debtor->getContact()->getId());;

+            throw new Exception('Could not send email to '.$debtor->getContact()->getId()); ;

             return false;

         }

 

@@ -151,7 +151,7 @@ 
 

         if (!$payment_id = $onlinepayment->create()) {

             // this is probably a little to hard reaction

-            throw new XML_RPC2_FaultException('onlinepayment could not be created' . strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('onlinepayment could not be created'.strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData($payment_id);

src/Intraface/XMLRPC/OnlinePayment/Server0100.php

Indentation +6 added lines, -6 removed lines

@@ -183,12 +183,12 @@
         }

 

         $data = array('contact_id' => $debtor->getContact()->getId(),

-                      'subject'    => $subject,

-                      'body'       => $body,

-                      'from_email' => $this->kernel->intranet->address->get('email'),

-                      'from_name'  => $this->kernel->intranet->address->get('name'),

-                      'type_id'    => 13, // onlinepayment

-                      'belong_to'  => $payment_id);

+                        'subject'    => $subject,

+                        'body'       => $body,

+                        'from_email' => $this->kernel->intranet->address->get('email'),

+                        'from_name'  => $this->kernel->intranet->address->get('name'),

+                        'type_id'    => 13, // onlinepayment

+                        'belong_to'  => $payment_id);

 

         if (!$email->save($data)) {

             throw new Exception('Could not save email to onlinepayment');

Spacing +9 added lines, -9 removed lines

@@ -133,7 +133,7 @@ 
 

         if (!$payment_id = $onlinepayment->save($values)) {

             // this is probably a little to hard reaction.

-            throw new XML_RPC2_FaultException('Onlinebetaling kunne ikke blive gemt ' . strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('Onlinebetaling kunne ikke blive gemt '.strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

         }

 

         if ($onlinepayment->get('status') == 'authorized') {

@@ -166,20 +166,20 @@ 
             // @todo: Change with gateway.

             $settings = $doctrine->getTable('Intraface_modules_onlinepayment_Language')->findOneByIntranetId($kernel->intranet->getId());

 

-            $subject = $settings->getConfirmationEmailSubject($shop->getLanguage()) . ' (#' . $payment_id . ')';

-            $body = $settings->getConfirmationEmailBody($shop->getLanguage()) . "\n\n" . $this->kernel->intranet->address->get('name');

+            $subject = $settings->getConfirmationEmailSubject($shop->getLanguage()).' (#'.$payment_id.')';

+            $body = $settings->getConfirmationEmailBody($shop->getLanguage())."\n\n".$this->kernel->intranet->address->get('name');

 

         } catch (Exception $e) {

         }

 

         if (empty($subject)) {

-            $subject = 'Payment confirmation / betalingsbekræftelse (#' . $payment_id . ')';

+            $subject = 'Payment confirmation / betalingsbekræftelse (#'.$payment_id.')';

         }

 

         if (empty($body)) {

-            $body    = 'We have received your payment for order #' .$debtor->getId(). '.' . "\n\n";

-            $body   .= 'Vi har modtaget din betaling for ordre #' .$debtor->getId(). '.';

-            $body   .= "\n\nYours sincerely / Venlig hilsen\n".  $this->kernel->intranet->address->get('name');

+            $body    = 'We have received your payment for order #'.$debtor->getId().'.'."\n\n";

+            $body   .= 'Vi har modtaget din betaling for ordre #'.$debtor->getId().'.';

+            $body   .= "\n\nYours sincerely / Venlig hilsen\n".$this->kernel->intranet->address->get('name');

         }

 

         $data = array('contact_id' => $debtor->getContact()->getId(),

@@ -196,7 +196,7 @@ 
 

         if (!$email->queue()) {

             $this->error->merge($email->error->getMessage());

-            throw new Exception('Could not send email to ' . $debtor->getContact()->getId());

+            throw new Exception('Could not send email to '.$debtor->getContact()->getId());

         }

 

         return true;

@@ -216,7 +216,7 @@ 
 

         if (!$payment_id = $onlinepayment->create()) {

             // this is probably a little to hard reaction

-            throw new XML_RPC2_FaultException('onlinepayment could not be created' . strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('onlinepayment could not be created'.strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData($payment_id);

src/Intraface/XMLRPC/OnlinePayment/Server0001.php

Indentation +6 added lines, -6 removed lines

@@ -119,12 +119,12 @@
         $body   .= "\n\nYours sincerely / Venlig hilsen\n".  $this->kernel->intranet->address->get('name');

 

         $data = array('contact_id' => $debtor->getContact()->getId(),

-                      'subject'    => $subject,

-                      'body'       => $body,

-                      'from_email' => $this->kernel->intranet->address->get('email'),

-                      'from_name'  => $this->kernel->intranet->address->get('name'),

-                      'type_id'    => 13, // onlinepayment

-                      'belong_to'  => $payment_id);

+                        'subject'    => $subject,

+                        'body'       => $body,

+                        'from_email' => $this->kernel->intranet->address->get('email'),

+                        'from_name'  => $this->kernel->intranet->address->get('name'),

+                        'type_id'    => 13, // onlinepayment

+                        'belong_to'  => $payment_id);

 

         if (!$email->save($data)) {

             throw new Exception('Could not save email to onlinepayment');;

Spacing +8 added lines, -8 removed lines

@@ -98,7 +98,7 @@ 
 

         if (!$payment_id = $onlinepayment->save($values)) {

             // this is probably a little to hard reaction.

-            throw new XML_RPC2_FaultException('Onlinebetaling kunne ikke blive gemt ' . strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('Onlinebetaling kunne ikke blive gemt '.strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

         }

 

         if ($onlinepayment->get('status') == 'authorized') {

@@ -113,10 +113,10 @@ 
         $this->kernel->useShared('email');

         $email = new Email($this->kernel);

 

-        $subject = 'Payment confirmation / betalingsbekræftelse (#' . $payment_id . ')';

-        $body    = 'We have received your payment for order #' .$debtor->getId(). '.' . "\n\n";

-        $body   .= 'Vi har modtaget din betaling for ordre #' .$debtor->getId(). '.';

-        $body   .= "\n\nYours sincerely / Venlig hilsen\n".  $this->kernel->intranet->address->get('name');

+        $subject = 'Payment confirmation / betalingsbekræftelse (#'.$payment_id.')';

+        $body    = 'We have received your payment for order #'.$debtor->getId().'.'."\n\n";

+        $body   .= 'Vi har modtaget din betaling for ordre #'.$debtor->getId().'.';

+        $body   .= "\n\nYours sincerely / Venlig hilsen\n".$this->kernel->intranet->address->get('name');

 

         $data = array('contact_id' => $debtor->getContact()->getId(),

                       'subject'    => $subject,

@@ -127,13 +127,13 @@ 
                       'belong_to'  => $payment_id);

 

         if (!$email->save($data)) {

-            throw new Exception('Could not save email to onlinepayment');;

+            throw new Exception('Could not save email to onlinepayment'); ;

             return false;

         }

 

         if (!$email->queue()) {

             $this->error->merge($email->error->getMessage());

-            throw new Exception('Could not send email to ' . $debtor->getContact()->getId());;

+            throw new Exception('Could not send email to '.$debtor->getContact()->getId()); ;

             return false;

         }

 

@@ -156,7 +156,7 @@ 
 

         if (!$payment_id = $onlinepayment->create()) {

             // this is probably a little to hard reaction

-            throw new XML_RPC2_FaultException('onlinepayment could not be created' . strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

+            throw new XML_RPC2_FaultException('onlinepayment could not be created'.strtolower(implode(', ', $onlinepayment->error->getMessage())), -4);

         }

 

         return $this->prepareResponseData($payment_id);