intraface / intraface.dk

src/Intraface/modules/debtor/Controller/ReminderEmail.php

Spacing +21 added lines, -21 removed lines

@@ -10,14 +10,14 @@ 
 

     function visit(Reminder $reminder)

     {

-        $this->output .= "Dato: " . $reminder->get("dk_this_date") ."\n\n";

-        $this->output .= $reminder->contact->address->get("name") . "\n";

+        $this->output .= "Dato: ".$reminder->get("dk_this_date")."\n\n";

+        $this->output .= $reminder->contact->address->get("name")."\n";

         if ($reminder->get("attention_to") != "") {

             $this->output .= "Att.: ".$reminder->get("attention_to")."\n";

         }

-        $this->output .= $reminder->contact->address->get("address") . "\n";

-        $this->output .= $reminder->contact->address->get("postcode") . "  " .  $reminder->contact->address->get("city") ."\n\n";

-        $this->output .= $reminder->get("text") . "\n\n";

+        $this->output .= $reminder->contact->address->get("address")."\n";

+        $this->output .= $reminder->contact->address->get("postcode")."  ".$reminder->contact->address->get("city")."\n\n";

+        $this->output .= $reminder->get("text")."\n\n";

 

         // Overskrifter - Vareudskrivning

         $this->output .= "Beskrivelse          Dato        Forfaldsdato    Beløb\n";

@@ -27,25 +27,25 @@ 
         for ($i = 0, $max = count($items); $i < $max; $i++) {

             $this->output .= "\nFak# ".$items[$i]["number"];

             $spaces = -strlen($items[$i]["number"]) - 5 + 20;

-            for ($j = 0; $j < $spaces; $j++) { $this->output .= ' ';  }

-                $this->output .= ' ' . $items[$i]["dk_this_date"];

-                $this->output .= '  ' . $items[$i]["dk_due_date"];

-                $this->output .= '      ' . number_format($items[$i]["arrears"], 2, ",", ".");

+            for ($j = 0; $j < $spaces; $j++) { $this->output .= ' '; }

+                $this->output .= ' '.$items[$i]["dk_this_date"];

+                $this->output .= '  '.$items[$i]["dk_due_date"];

+                $this->output .= '      '.number_format($items[$i]["arrears"], 2, ",", ".");

                 $total += $items[$i]["arrears"];

             }

             $items = $reminder->item->getList("reminder");

             for ($i = 0, $max = count($items); $i < $max; $i++) {

                 $this->output .= "\nTidl. rykkkergebyr  ";

-                $this->output .= ' ' . $items[$i]["dk_this_date"];

-                $this->output .= '  ' .$items[$i]["dk_due_date"];

-                $this->output .= '      ' . number_format($items[$i]["reminder_fee"], 2, ",", ".");

+                $this->output .= ' '.$items[$i]["dk_this_date"];

+                $this->output .= '  '.$items[$i]["dk_due_date"];

+                $this->output .= '      '.number_format($items[$i]["reminder_fee"], 2, ",", ".");

                 $total += $items[$i]["reminder_fee"];

             }

             if ($reminder->get("reminder_fee") != 0) {

                 $this->output .= "\nRykkergebyr                                      ".number_format($reminder->get("reminder_fee"), 2, ",", ".");

                 $total += $reminder->get("reminder_fee");

             }

-            $this->output .= "\n\nTotal:                                           " . number_format($total, 2, ",", ".");

+            $this->output .= "\n\nTotal:                                           ".number_format($total, 2, ",", ".");

 

             $parameter = array(

                 "contact" => $reminder->contact,

@@ -53,7 +53,7 @@ 
                 "amount" => $total,

                 "due_date" => $reminder->get("dk_due_date"),

                 "girocode" => $reminder->get("girocode"));

-            $this->output .= "\n\nDet skyldige beløb betales senest: " . $parameter['due_date'];

+            $this->output .= "\n\nDet skyldige beløb betales senest: ".$parameter['due_date'];

 

             // TODO: change to payment_method

             switch ($reminder->get('payment_method_key')) {

@@ -63,16 +63,16 @@ 
                     $this->output .= "\nBank:                ".$reminder->kernel->setting->get('intranet', 'bank_name');

                     $this->output .= "\nRegnr.:              ".$reminder->kernel->setting->get('intranet', 'bank_reg_number');

                     $this->output .= "\nKontonr.:            ".$reminder->kernel->setting->get('intranet', 'bank_account_number');

-                    $this->output .= "\nBesked til modtager: " . "Kunde #" . $reminder->contact->get("number");

+                    $this->output .= "\nBesked til modtager: "."Kunde #".$reminder->contact->get("number");

                 break;

                 case 3:

                     $this->output .= "\n\nBetaling via homebanking\n+71< ".str_repeat("0", 15 - strlen($parameter["girocode"])).$parameter["girocode"]." +".$this->context->getKernel()->setting->get('intranet', 'giro_account_number')."<";

                 break;

             }

 

-            $this->output .= "\n\nMed venlig hilsen\n\n" . $reminder->kernel->user->getAddress()->get("name") . "\n" .$reminder->kernel->intranet->get("name");

-            $this->output .= "\n" . $reminder->kernel->intranet->address->get("address");

-            $this->output .= "\n" . $reminder->kernel->intranet->address->get("postcode") . "  " . $reminder->kernel->intranet->address->get("city");

+            $this->output .= "\n\nMed venlig hilsen\n\n".$reminder->kernel->user->getAddress()->get("name")."\n".$reminder->kernel->intranet->get("name");

+            $this->output .= "\n".$reminder->kernel->intranet->address->get("address");

+            $this->output .= "\n".$reminder->kernel->intranet->address->get("postcode")."  ".$reminder->kernel->intranet->address->get("city");

     }

 

     public function getText()

@@ -104,14 +104,14 @@ 
             throw new Exception('Kontaktpersonen har ikke nogen email');

         }

 

-        $subject  =	"Påmindelse om betaling";

+        $subject = "Påmindelse om betaling";

 

         $reminder_text = new Reminder_Text();

         $reminder_text->visit($reminder);

 

         $body = $reminder_text->getText();

 

-        switch($this->context->getKernel()->setting->get('intranet', 'debtor.sender')) {

+        switch ($this->context->getKernel()->setting->get('intranet', 'debtor.sender')) {

             case 'intranet':

                 $from_email = '';

                 $from_name = '';

@@ -142,7 +142,7 @@ 
         if ($id = $email->save($var)) {

             $redirect = new Intraface_Redirect($this->context->getKernel());

             $shared_email = $this->context->getKernel()->useModule('email');

-            $url = $redirect->setDestination($shared_email->getPath().$id . '?edit', NET_SCHME . NET_HOST . $this->context->url());

+            $url = $redirect->setDestination($shared_email->getPath().$id.'?edit', NET_SCHME.NET_HOST.$this->context->url());

             $redirect->setIdentifier('send_email');

             $redirect->askParameter('send_email_status');

             return new k_SeeOther($url);

src/Intraface/modules/debtor/Controller/Payments.php

Indentation +5 added lines, -5 removed lines

@@ -24,11 +24,11 @@
         $object = $this->getModel();
         $payment = $this->getPayment();
         if ($id = $payment->update($_POST)) {
-             if ($this->getKernel()->user->hasModuleAccess('accounting')) {
-                 return new k_SeeOther($this->url($id . '/state'));
-             } else {
-                 return new k_SeeOther($this->url('../'));
-             }
+                if ($this->getKernel()->user->hasModuleAccess('accounting')) {
+                    return new k_SeeOther($this->url($id . '/state'));
+                } else {
+                    return new k_SeeOther($this->url('../'));
+                }
         }
         return $this->render();
     }

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 
     function renderHtml()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/payment');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/payment');
         return $smarty->render($this);
     }
 
@@ -25,7 +25,7 @@ 
         $payment = $this->getPayment();
         if ($id = $payment->update($_POST)) {
              if ($this->getKernel()->user->hasModuleAccess('accounting')) {
-                 return new k_SeeOther($this->url($id . '/state'));
+                 return new k_SeeOther($this->url($id.'/state'));
              } else {
                  return new k_SeeOther($this->url('../'));
              }

src/Intraface/modules/debtor/Controller/Item.php

Indentation +13 added lines, -13 removed lines

@@ -30,12 +30,12 @@ 
         $product_module = $this->getKernel()->useModule('product');
 
         if (isset($_GET['change_product'])) {
-        	$redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
-        	$url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('selectproduct'), NET_SCHEME . NET_HOST . $this->url());
-        	$redirect->askParameter('product_id');
-        	return new k_SeeOther($url);
+            $redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
+            $url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('selectproduct'), NET_SCHEME . NET_HOST . $this->url());
+            $redirect->askParameter('product_id');
+            return new k_SeeOther($url);
         }
-		/*
+        /*
         elseif (isset($_GET['return_redirect_id'])) {
         	$redirect = Intraface_Redirect::factory($this->getKernel(), 'return');
             $returned_values = unserialize($redirect->getParameter('product_id'));
@@ -65,15 +65,15 @@ 
 
     function postForm()
     {
-       	$debtor = $this->context->getDebtor();
-       	$debtor->loadItem(intval($_POST["id"]));
+            $debtor = $this->context->getDebtor();
+            $debtor->loadItem(intval($_POST["id"]));
 
-       	if ($id = $debtor->item->save($_POST)) {
-       		return new k_SeeOther($this->url('../../'));
-       	} else {
-       		$values = $_POST;
-       	}
-       	return $this->render();
+            if ($id = $debtor->item->save($_POST)) {
+                return new k_SeeOther($this->url('../../'));
+            } else {
+                $values = $_POST;
+            }
+            return $this->render();
     }
 
     function addItem($returned_values)

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 
         if (isset($_GET['change_product'])) {
         	$redirect = Intraface_Redirect::factory($this->getKernel(), 'go');
-        	$url = $redirect->setDestination(NET_SCHEME . NET_HOST . $this->url('selectproduct'), NET_SCHEME . NET_HOST . $this->url());
+        	$url = $redirect->setDestination(NET_SCHEME.NET_HOST.$this->url('selectproduct'), NET_SCHEME.NET_HOST.$this->url());
         	$redirect->askParameter('product_id');
         	return new k_SeeOther($url);
         }
@@ -44,7 +44,7 @@ 
         }
         */
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/item-edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/item-edit');
         return $smarty->render($this);
     }
 

src/Intraface/modules/debtor/Controller/Reminder.php

Spacing +23 added lines, -23 removed lines

@@ -51,7 +51,7 @@ 
             }

         }

 

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

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

         return $smarty->render($this);

     }

 

@@ -82,7 +82,7 @@ 
             $checked_reminder[] = $reminders[$i]["reminder_id"];

         }

 

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

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

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

     }

 

@@ -180,14 +180,14 @@ 
             throw new Exception('Kontaktpersonen har ikke nogen email');

         }

 

-        $subject  =	"Påmindelse om betaling";

+        $subject = "Påmindelse om betaling";

 

         $reminder_text = new Reminder_Text();

         $reminder_text->visit($reminder);

 

         $body = $reminder_text->getText();

 

-        switch($this->getKernel()->setting->get('intranet', 'debtor.sender')) {

+        switch ($this->getKernel()->setting->get('intranet', 'debtor.sender')) {

             case 'intranet':

                 $from_email = '';

                 $from_name = '';

@@ -218,7 +218,7 @@ 
         if ($id = $email->save($var)) {

             $redirect = new Intraface_Redirect($this->getKernel());

             $shared_email = $this->getKernel()->useModule('email');

-            $url = $redirect->setDestination($shared_email->getPath() . $id . '?edit', NET_SCHEME . NET_HOST . $this->url());

+            $url = $redirect->setDestination($shared_email->getPath().$id.'?edit', NET_SCHEME.NET_HOST.$this->url());

             $redirect->setIdentifier('send_email');

             $redirect->askParameter('send_email_status');

             return new k_SeeOther($url);

@@ -263,14 +263,14 @@ 
 

     function visit(Reminder $reminder)

     {

-        $this->output .= "Dato: " . $reminder->get("dk_this_date") ."\n\n";

-        $this->output .= $reminder->contact->address->get("name") . "\n";

+        $this->output .= "Dato: ".$reminder->get("dk_this_date")."\n\n";

+        $this->output .= $reminder->contact->address->get("name")."\n";

         if ($reminder->get("attention_to") != "") {

             $this->output .= "Att.: ".$reminder->get("attention_to")."\n";

         }

-        $this->output .= $reminder->contact->address->get("address") . "\n";

-        $this->output .= $reminder->contact->address->get("postcode") . "  " .  $reminder->contact->address->get("city") ."\n\n";

-        $this->output .= $reminder->get("text") . "\n\n";

+        $this->output .= $reminder->contact->address->get("address")."\n";

+        $this->output .= $reminder->contact->address->get("postcode")."  ".$reminder->contact->address->get("city")."\n\n";

+        $this->output .= $reminder->get("text")."\n\n";

 

         // Overskrifter - Vareudskrivning

         $this->output .= "Beskrivelse          Dato        Forfaldsdato    Bel�b\n";

@@ -280,25 +280,25 @@ 
         for ($i = 0, $max = count($items); $i < $max; $i++) {

             $this->output .= "\nFak# ".$items[$i]["number"];

             $spaces = -strlen($items[$i]["number"]) - 5 + 20;

-            for ($j = 0; $j < $spaces; $j++) { $this->output .= ' ';  }

-                $this->output .= ' ' . $items[$i]["dk_this_date"];

-                $this->output .= '  ' . $items[$i]["dk_due_date"];

-                $this->output .= '      ' . number_format($items[$i]["arrears"], 2, ",", ".");

+            for ($j = 0; $j < $spaces; $j++) { $this->output .= ' '; }

+                $this->output .= ' '.$items[$i]["dk_this_date"];

+                $this->output .= '  '.$items[$i]["dk_due_date"];

+                $this->output .= '      '.number_format($items[$i]["arrears"], 2, ",", ".");

                 $total += $items[$i]["arrears"];

             }

             $items = $reminder->item->getList("reminder");

             for ($i = 0, $max = count($items); $i < $max; $i++) {

                 $this->output .= "\nTidl. rykkkergebyr  ";

-                $this->output .= ' ' . $items[$i]["dk_this_date"];

-                $this->output .= '  ' .$items[$i]["dk_due_date"];

-                $this->output .= '      ' . number_format($items[$i]["reminder_fee"], 2, ",", ".");

+                $this->output .= ' '.$items[$i]["dk_this_date"];

+                $this->output .= '  '.$items[$i]["dk_due_date"];

+                $this->output .= '      '.number_format($items[$i]["reminder_fee"], 2, ",", ".");

                 $total += $items[$i]["reminder_fee"];

             }

             if ($reminder->get("reminder_fee") != 0) {

                 $this->output .= "\nRykkergebyr                                      ".number_format($reminder->get("reminder_fee"), 2, ",", ".");

                 $total += $reminder->get("reminder_fee");

             }

-            $this->output .= "\n\nTotal:                                           " . number_format($total, 2, ",", ".");

+            $this->output .= "\n\nTotal:                                           ".number_format($total, 2, ",", ".");

 

             $parameter = array(

                 "contact" => $reminder->contact,

@@ -306,7 +306,7 @@ 
                 "amount" => $total,

                 "due_date" => $reminder->get("dk_due_date"),

                 "girocode" => $reminder->get("girocode"));

-            $this->output .= "\n\nDet skyldige beløb betales senest: " . $parameter['due_date'];

+            $this->output .= "\n\nDet skyldige beløb betales senest: ".$parameter['due_date'];

 

             // TODO: change to payment_method

             switch ($reminder->get('payment_method_key')) {

@@ -316,16 +316,16 @@ 
                     $this->output .= "\nBank:                ".$reminder->kernel->setting->get('intranet', 'bank_name');

                     $this->output .= "\nRegnr.:              ".$reminder->kernel->setting->get('intranet', 'bank_reg_number');

                     $this->output .= "\nKontonr.:            ".$reminder->kernel->setting->get('intranet', 'bank_account_number');

-                    $this->output .= "\nBesked til modtager: " . "Kunde #" . $reminder->contact->get("number");

+                    $this->output .= "\nBesked til modtager: "."Kunde #".$reminder->contact->get("number");

                 break;

                 case 3:

                     $this->output .= "\n\nBetaling via homebanking\n+71< ".str_repeat("0", 15 - strlen($parameter["girocode"])).$parameter["girocode"]." +".$kernel->setting->get('intranet', 'giro_account_number')."<";

                 break;

             }

 

-            $this->output .= "\n\nMed venlig hilsen\n\n" . $reminder->kernel->user->getAddress()->get("name") . "\n" .$reminder->kernel->intranet->get("name");

-            $this->output .= "\n" . $reminder->kernel->intranet->address->get("address");

-            $this->output .= "\n" . $reminder->kernel->intranet->address->get("postcode") . "  " . $reminder->kernel->intranet->address->get("city");

+            $this->output .= "\n\nMed venlig hilsen\n\n".$reminder->kernel->user->getAddress()->get("name")."\n".$reminder->kernel->intranet->get("name");

+            $this->output .= "\n".$reminder->kernel->intranet->address->get("address");

+            $this->output .= "\n".$reminder->kernel->intranet->address->get("postcode")."  ".$reminder->kernel->intranet->address->get("city");

     }

 

     public function getText()

src/Intraface/modules/shop/Shop.php

Indentation +1 added lines, -1 removed lines

@@ -93,6 +93,6 @@
 
     function getLanguage()
     {
-    	return Intraface_modules_language_Gateway::getByKey($this->language_key);
+        return Intraface_modules_language_Gateway::getByKey($this->language_key);
     }
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -4,21 +4,21 @@
     public function setTableDefinition()
     {
         $this->setTableName('shop');
-        $this->hasColumn('name',                         'string',  255);
-        $this->hasColumn('description',                  'string',  65555);
-        $this->hasColumn('identifier',                   'string',  255);
-        $this->hasColumn('show_online',                  'integer', 1);
-        $this->hasColumn('send_confirmation',            'integer', 1);
-        $this->hasColumn('confirmation_subject',         'string',  255);
-        $this->hasColumn('confirmation_greeting',        'string',  255);
-        $this->hasColumn('confirmation',                 'string',  65555);
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('description', 'string', 65555);
+        $this->hasColumn('identifier', 'string', 255);
+        $this->hasColumn('show_online', 'integer', 1);
+        $this->hasColumn('send_confirmation', 'integer', 1);
+        $this->hasColumn('confirmation_subject', 'string', 255);
+        $this->hasColumn('confirmation_greeting', 'string', 255);
+        $this->hasColumn('confirmation', 'string', 65555);
         $this->hasColumn('confirmation_add_contact_url', 'integer', 1);
-        $this->hasColumn('receipt',                      'string',  65555);
-        $this->hasColumn('payment_link',                 'string',  255);
-        $this->hasColumn('payment_link_add',             'integer', 1);
-        $this->hasColumn('terms_of_trade_url',           'string',  255);
-        $this->hasColumn('default_currency_id',          'integer');
-        $this->hasColumn('language_key',                 'integer');
+        $this->hasColumn('receipt', 'string', 65555);
+        $this->hasColumn('payment_link', 'string', 255);
+        $this->hasColumn('payment_link_add', 'integer', 1);
+        $this->hasColumn('terms_of_trade_url', 'string', 255);
+        $this->hasColumn('default_currency_id', 'integer');
+        $this->hasColumn('language_key', 'integer');
 
     }
 

src/Intraface/modules/shop/PaymentMethods.php

Spacing +3 added lines, -3 removed lines

@@ -4,9 +4,9 @@
     public function setTableDefinition()
     {
         $this->setTableName('shop_paymentmethods');
-        $this->hasColumn('paymentmethod_key', 'integer',  11);
-        $this->hasColumn('text',  'string',  65555);
-        $this->hasColumn('shop_id',   'integer',  11);
+        $this->hasColumn('paymentmethod_key', 'integer', 11);
+        $this->hasColumn('text', 'string', 65555);
+        $this->hasColumn('shop_id', 'integer', 11);
     }
 
     public function setUp()

src/Intraface/modules/shop/DiscountCampaign/Voucher.php

Spacing +3 added lines, -3 removed lines

@@ -10,10 +10,10 @@
     {
         $this->setTableName('shop_dicount_campaign_voucher');
         $this->hasColumn('shop_discount_campaign_id', 'integer', 4, array('type' => 'integer', 'length' => 4, 'default' => '0', 'notnull' => true));
-        $this->hasColumn('code', 'string',  255, array('type' => 'string', 'length' => 255, 'notnull' => true));
+        $this->hasColumn('code', 'string', 255, array('type' => 'string', 'length' => 255, 'notnull' => true));
         $this->hasColumn('quantity', 'integer', 11, array('type' => 'integer', 'length' => 11, 'default' => '0', 'notnull' => true));
-        $this->hasColumn('date_created', 'timestamp',  NULL, array('type' => 'timestamp', 'default' => new Doctrine_Expression('NOW()'), 'notnull' => true));
-        $this->hasColumn('date_expiry', 'timestamp',  NULL, array('type' => 'timestamp', 'notnull' => true));
+        $this->hasColumn('date_created', 'timestamp', NULL, array('type' => 'timestamp', 'default' => new Doctrine_Expression('NOW()'), 'notnull' => true));
+        $this->hasColumn('date_expiry', 'timestamp', NULL, array('type' => 'timestamp', 'notnull' => true));
         $this->hasColumn('used_on_debtor_id', 'integer', 11, array('type' => 'integer', 'length' => 11, 'default' => '0', 'notnull' => true));
         $this->hasColumn('created_from_debtor_id', 'integer', 11, array('type' => 'integer', 'length' => 11, 'default' => '0', 'notnull' => true));
 

src/Intraface/modules/shop/DiscountCampaign.php

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
     public function setTableDefinition()
     {
         $this->setTableName('shop_dicount_campaign');
-        $this->hasColumn('name', 'string',  255, array('type' => 'string', 'length' => 255, 'notnull' => true));
-        $this->hasColumn('voucher_code_prefix', 'string',  255, array('type' => 'string', 'length' => 255, 'notnull' => true));
+        $this->hasColumn('name', 'string', 255, array('type' => 'string', 'length' => 255, 'notnull' => true));
+        $this->hasColumn('voucher_code_prefix', 'string', 255, array('type' => 'string', 'length' => 255, 'notnull' => true));
         // $this->hasColumn('start_date', 'string',  65555);
         // $this->hasColumn('end_date', 'string',  255);
         // $this->hasColumn('validity_period', 'string',  255);

src/Intraface/modules/shop/Controller/BasketEvaluation/Index.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     {
         $shop = $this->getShop();
 
-        $this->document->setTitle('Basket evaluation for' . ' ' . $shop->name);
+        $this->document->setTitle('Basket evaluation for'.' '.$shop->name);
         $this->document->options = array($this->url('../') => 'Close');
 
         $basketevaluation = new Intraface_modules_shop_BasketEvaluation($this->mdb2, $this->getKernel()->intranet, $shop);
@@ -33,7 +33,7 @@ 
 
         $data = array('shop' => $shop, 'evaluations' => $evaluations);
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/../tpl/evaluation-index');
+        $tpl = $this->template->create(dirname(__FILE__).'/../tpl/evaluation-index');
         return $tpl->render($this, $data);
     }