intraface / intraface.dk

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

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
                 $api = $this->get('api_key');
             }
 
-                $this->value['map']  = '<script type="text/javascript" src="http://api.maps.yahoo.com/ajaxymap?'.htmlentities('v=2.0&appid=' . $api) .'"></script>';
+                $this->value['map'] = '<script type="text/javascript" src="http://api.maps.yahoo.com/ajaxymap?'.htmlentities('v=2.0&appid='.$api).'"></script>';
                 /* flash version
                 $this->value['map'] .= '<script type="text/javascript">';
                 $this->value['map'] .= '    var latlon = new LatLon(' .$a['ResultSet']['Result']['Latitude'] . ', '. $a['ResultSet']['Result']['Longitude'].');';
@@ -51,7 +51,7 @@ 
                 $this->value['map'] .= '		var words = "title";';
                 $this->value['map'] .= '		marker.openSmartWindow(words);';
                 $this->value['map'] .= '	} ';
-                $this->value['map'] .= '	var latlon = new YGeoPoint(' .$this->get('latitude') . ', '. $this->get('longitude').');';
+                $this->value['map'] .= '	var latlon = new YGeoPoint('.$this->get('latitude').', '.$this->get('longitude').');';
                 $this->value['map'] .= '	var mymap = new  YMap(document.getElementById("mapContainer"));';
                 $this->value['map'] .= '	var marker = new YMarker(latlon);';
                 $this->value['map'] .= '	marker.addLabel("<b>A</b>"); ';
@@ -84,7 +84,7 @@ 
                 $this->value['map'] .= '    }';
                 $this->value['map'] .= '}';
                 $this->value['map'] .= 'load();';
-                $this->value['map'] .= '    var latlon = new YGeoPoint(' .$this->get('latitude') . ', '. $this->get('longitude').');';
+                $this->value['map'] .= '    var latlon = new YGeoPoint('.$this->get('latitude').', '.$this->get('longitude').');';
                 $this->value['map'] .= '    var mymap = new  YMap(document.getElementById("mapContainer"));';
                 $this->value['map'] .= '    var marker = new YMarker(latlon);';
                 $this->value['map'] .= '    marker.addLabel("<b>A</b>"); ';

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

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
         $url = parse_url($var['url']);
 
         // cleans up url
-        $var['url'] = $url['scheme'] . '://' . $url['host'] . $url['path'];
+        $var['url'] = $url['scheme'].'://'.$url['host'].$url['path'];
 
         $this->parameter->save('url', $var['url']);
 

src/Intraface/modules/cms/section/Mixed.php

Spacing +2 added lines, -2 removed lines

@@ -52,8 +52,8 @@
         $db = new DB_Sql;
         $db->query("SELECT id FROM cms_element
             WHERE intranet_id = ".$this->kernel->intranet->get('id')."
-                AND section_id = " . $this->id . "
-                AND active = 1 " . $sql_expire . $sql_publish . "
+                AND section_id = " . $this->id."
+                AND active = 1 " . $sql_expire.$sql_publish."
             ORDER BY position ASC");
         $i = 0;
 

src/Intraface/modules/invoice/Payment.php

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;

Doc Comments +4 added lines, -3 removed lines

@@ -39,10 +39,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.
      */
@@ -136,7 +137,7 @@ 
     /**
      * returns possible payment types
      *
-     * @return array payment types
+     * @return string[] payment types
      *
      */
     public static function getTypes()
@@ -149,7 +150,7 @@ 
     /**
      * returns the possible types payments can be for.
      *
-     * @return array payment for types
+     * @return string[] payment for types
      */
     private static function getPaymentForTypes()
     {

src/Intraface/modules/invoice/Pdf/Reminder.php

Spacing +7 added lines, -7 removed lines

@@ -61,7 +61,7 @@ 
             if ($line == "") {
                 $this->doc->setY('-'.$this->doc->get('font_spacing'));
 
-                if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                     $this->doc->nextPage(true);
                 }
             } else {
@@ -71,7 +71,7 @@ 
               
                     $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
 
-                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+                    if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                         $this->doc->nextPage(true);
                     }
                 }
@@ -82,7 +82,7 @@ 
 
         $this->doc->setY('-20'); // space to product list
 
-        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 3) {
+        if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*3) {
             $this->doc->nextPage(true);
         }
 
@@ -96,7 +96,7 @@ 
         $this->doc->addText($apointX["text"], $this->doc->get('y'), $this->doc->get("font_size"), "Beskrivelse");
         $this->doc->addText($apointX["invoice_date"], $this->doc->get('y'), $this->doc->get("font_size"), "Dato");
         $this->doc->addText($apointX["due_date"], $this->doc->get('y'), $this->doc->get("font_size"), "Forfaldsdato");
-        $this->doc->addText($apointX["amount"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Beløb") -3, $this->doc->get('y'), $this->doc->get("font_size"), "Bel�b");
+        $this->doc->addText($apointX["amount"] - $this->doc->getTextWidth($this->doc->get("font_size"), "Beløb") - 3, $this->doc->get('y'), $this->doc->get("font_size"), "Bel�b");
 
         $this->doc->setY('-'.($this->doc->get("font_spacing") - $this->doc->get("font_size")));
 
@@ -129,7 +129,7 @@ 
             $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
             $total += $items[$i]["arrears"];
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
         }
@@ -154,7 +154,7 @@ 
             $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
             $total += $items[$i]["reminder_fee"];
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
         }
@@ -175,7 +175,7 @@ 
             $this->doc->setY('-'.$this->doc->get("font_padding_bottom"));
             $total += $reminder->get("reminder_fee");
 
-            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing") * 2) {
+            if ($this->doc->get('y') < $this->doc->get("margin_bottom") + $this->doc->get("font_spacing")*2) {
                 $this->doc->nextPage(true);
             }
         }

Doc Comments +3 added lines

@@ -13,6 +13,9 @@
         parent::__construct($translation, $file);
     }
 
+    /**
+     * @param Reminder $reminder
+     */
     function visit($reminder)
     {
         if ($reminder->get('id') == 0) {

src/Intraface/modules/email/Controller/templates/show.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
     <?php if ($email->get('status') != 'sent') : ?>
     <li><a href="<?php e(url(null, array('edit'))); ?>"><?php e(t('Edit')); ?></a></li>
     <?php endif; ?>
-    <li><a class="pdf" href="<?php e(url(null . '.pdf')); ?>"><?php e(t('Pdf')); ?></a></li>
+    <li><a class="pdf" href="<?php e(url(null.'.pdf')); ?>"><?php e(t('Pdf')); ?></a></li>
 </ul>
 
 <?php if ($email->get('status') == 'sent') : ?>

Braces +3 added lines, -1 removed lines

@@ -38,8 +38,10 @@
             ?></pre>
         <pre><?php e(t('From')); ?>: <?php if (isset($value['from_email']) && $value['from_email'] != '') :
             e($value['from_name']." <".$value['from_email'].">");
-else :
+else {
+    :
     e($kernel->intranet->address->get('name')." <".$kernel->intranet->address->get('email').">");
+}
 endif; ?></pre>
 
         <pre><?php e($value['subject']); ?></pre>

src/Intraface/modules/email/Controller/templates/index.tpl.php

Braces +10 added lines, -4 removed lines

@@ -10,9 +10,12 @@ 
 
     <p><?php e(t('no e-mails has been sent')); ?></p>
 
-<?php else : ?>
+<?php else {
+    : ?>
     <?php if ($queue > 0) : ?>
-        <p><?php e(t('E-mails are in queue - the will be sent soon')); ?></p>
+        <p><?php e(t('E-mails are in queue - the will be sent soon'));
+}
+?></p>
     <?php endif; ?>
 
     <?php echo $gateway->getDBQuery()->display('character'); ?>
@@ -37,8 +40,11 @@ 
         <?php if (!empty($email['status']) and $email['status'] != 'sent') : ?>
             <a class="edit" href="<?php e(url($email['id'], array('edit'))); ?>"><?php e(t('edit')); ?></a>
             <a class="delete" href="<?php e(url($email['id'], array('delete'))); ?>"><?php e(t('delete')); ?></a>
-        <?php else : ?>
-            <?php e(t($email['status'])); ?>
+        <?php else {
+    : ?>
+            <?php e(t($email['status']));
+}
+?>
         <?php endif; ?>
         </td>
     </tr>

src/Intraface/modules/email/Controller/Email.php

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
         $value = $email->get();
         $contact = $email->getContact();
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/show');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/show');
         $data = array(
             'contact' => $contact,
             'value' => $value,
@@ -35,18 +35,18 @@ 
         $size = 12; // font size
 
         // udskriv adressehoved
-        $text = $this->getEmail()->getContact()->address->get('name') .
-            "\n" . $this->getEmail()->getContact()->address->get('address') .
-            "\n" . $this->getEmail()->getContact()->address->get('postcode') .
-            "  " . $this->getEmail()->getContact()->address->get('city') . "\n\n\n";
+        $text = $this->getEmail()->getContact()->address->get('name').
+            "\n".$this->getEmail()->getContact()->address->get('address').
+            "\n".$this->getEmail()->getContact()->address->get('postcode').
+            "  ".$this->getEmail()->getContact()->address->get('city')."\n\n\n";
 
         $pdf->ezText($text, $size);
 
         // uskriv subject
-        $pdf->ezText($this->getEmail()->get('subject') . "\n\n", $size);
+        $pdf->ezText($this->getEmail()->get('subject')."\n\n", $size);
 
         // udskriv body
-        $pdf->ezText($this->getEmail()->get('body') . "\n", $size);
+        $pdf->ezText($this->getEmail()->get('body')."\n", $size);
 
         // udskriv greeting
 
@@ -104,7 +104,7 @@ 
         $contact = $email->getContact();
         $redirect = Intraface_Redirect::factory($this->getKernel(), 'receive');
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/edit');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/edit');
         $data = array(
             'contact' => $contact,
             'value' => $value,

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

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
         $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));
     }