intraface / intraface.dk

src/Intraface/modules/newsletter/Newsletter.php

Spacing +15 added lines, -15 removed lines

@@ -77,7 +77,7 @@ 
     private function load()
     {
         $db = new DB_Sql;
-         $db->query("SELECT id, list_id, subject, text, deadline, sent_to_receivers, status FROM newsletter_archieve WHERE id = " . $this->id . " AND active = 1 LIMIT 1");
+         $db->query("SELECT id, list_id, subject, text, deadline, sent_to_receivers, status FROM newsletter_archieve WHERE id = ".$this->id." AND active = 1 LIMIT 1");
 
         $db2 = new DB_Sql;
         if ($db->nextRecord()) {
@@ -118,7 +118,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE newsletter_archieve SET active = 0 WHERE id = " . $this->get("id") . "  AND intranet_id = " . $this->list->getIntranet()->getId() . " AND locked = 0");
+        $db->query("UPDATE newsletter_archieve SET active = 0 WHERE id = ".$this->get("id")."  AND intranet_id = ".$this->list->getIntranet()->getId()." AND locked = 0");
 
         return true;
     }
@@ -148,10 +148,10 @@ 
             $sql_end  = ', date_created = NOW()';
         } else {
             $sql_type = "UPDATE";
-            $sql_end  = " WHERE id = " . $this->id;
+            $sql_end  = " WHERE id = ".$this->id;
         }
         $db  = new DB_Sql;
-        $sql = $sql_type . " newsletter_archieve
+        $sql = $sql_type." newsletter_archieve
             SET subject = '".$var['subject']."',
             text = '".$var['text']."',
             intranet_id = ".$this->list->getIntranet()->getId().",
@@ -181,7 +181,7 @@ 
     private function updateSent($receivers)
     {
         $db = new DB_Sql;
-        $db->query("UPDATE newsletter_archieve SET status = 1, sent_to_receivers = '".(int)$receivers."' WHERE id = " . $this->id . " AND intranet_id = " . $this->list->getIntranet()->getId());
+        $db->query("UPDATE newsletter_archieve SET status = 1, sent_to_receivers = '".(int)$receivers."' WHERE id = ".$this->id." AND intranet_id = ".$this->list->getIntranet()->getId());
         return true;
     }
 
@@ -222,7 +222,7 @@ 
         $db        = MDB2::singleton(DB_DSN);
 
         if (PEAR::isError($db)) {
-            throw new Exception($result->getMessage() . $result->getUserInfo());
+            throw new Exception($result->getMessage().$result->getUserInfo());
         }
 
         $i       = 0;
@@ -259,19 +259,19 @@ 
                 '".$name."',
                 8,
                 2,
-                ".$this->get('id') . ",
-                '".$this->get('deadline'). "',
-                " .$this->list->getIntranet()->getId(). " ,
-                " .$subscriber['contact_id']. " ,
+                ".$this->get('id').",
+                '".$this->get('deadline')."',
+                " .$this->list->getIntranet()->getId()." ,
+                " .$subscriber['contact_id']." ,
                 " .$this->list->kernel->user->get('id').",
                 ".$subject.",
                 ".$body.")";
 
             if ($i == 40) {
-                $result = $db->exec($sql . implode($params, ','));
+                $result = $db->exec($sql.implode($params, ','));
 
                 if (PEAR::isError($result)) {
-                    $error[] = $result->getMessage() . $result->getUserInfo();
+                    $error[] = $result->getMessage().$result->getUserInfo();
                     return false;
                 }
 
@@ -285,11 +285,11 @@ 
 
         // If the number of contacts can be divided evenly into 40 there will be no more params here.
         if (count($params) > 0) {
-            $result = $db->exec($sql . implode($params, ','));
+            $result = $db->exec($sql.implode($params, ','));
         }
 
         if (PEAR::isError($result)) {
-            $error[] = $result->getMessage() . $result->getUserInfo();
+            $error[] = $result->getMessage().$result->getUserInfo();
         }
 
         if (!empty($error)) {
@@ -321,7 +321,7 @@ 
     {
         $list = array();
         $db   = new DB_Sql;
-        $db->query("SELECT * FROM newsletter_archieve WHERE active = 1 AND list_id = " . $this->list->get('id') . " ORDER BY deadline DESC");
+        $db->query("SELECT * FROM newsletter_archieve WHERE active = 1 AND list_id = ".$this->list->get('id')." ORDER BY deadline DESC");
         $i = 0;
         while ($db->nextRecord()) {
             $list[$i]['subject'] = $db->f('subject');

src/Intraface/modules/newsletter/Controller/templates/subscribers.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -49,11 +49,11 @@
     <tbody>
     <?php foreach ($context->getSubscribers() as $s) : ?>
     <tr>
-        <td><a href="<?php e(url('../../../../contact/' . $s['contact_id'])); ?>"><?php e($s['contact_name']); ?></a></td>
+        <td><a href="<?php e(url('../../../../contact/'.$s['contact_id'])); ?>"><?php e($s['contact_name']); ?></a></td>
         <td><?php e($s['contact_email']); ?></td>
         <td><?php e($s['dk_date_submitted']); ?></td>
         <td>
-            <?php if ($s['optin'] == 0 and $s['date_optin_email_sent'] < date('Y-m-d', time() - 60 * 60 * 24 * 3)) : ?>
+            <?php if ($s['optin'] == 0 and $s['date_optin_email_sent'] < date('Y-m-d', time() - 60*60*24*3)) : ?>
                 <a href="<?php e(url($s['id'], array('remind' => 'true', 'use_stored' => 'true'))); ?>"><?php e(t('Remind')); ?></a>
             <?php elseif ($s['optin'] == 0) : ?>
                 <?php e(t('Not opted in')); ?>

src/Intraface/modules/newsletter/Controller/templates/list-edit.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
 
     <div style="clear: both;">
-        <p><?php e(t('Either you are using this link')); ?> <strong><?php e('http://' . $context->getKernel()->setting->get('intranet', 'contact.login_url') . '/' .$context->getKernel()->intranet->get('identifier') . '/login'); ?></strong> <?php e(t('or you can write your own')); ?>:</p>
+        <p><?php e(t('Either you are using this link')); ?> <strong><?php e('http://'.$context->getKernel()->setting->get('intranet', 'contact.login_url').'/'.$context->getKernel()->intranet->get('identifier').'/login'); ?></strong> <?php e(t('or you can write your own')); ?>:</p>
         <label for="optin_link"><?php e(t('Link for the optin page')); ?></label><br />
         <input type="text" name="optin_link" value="<?php if (!empty($value['optin_link'])) {
             e($value['optin_link']);

src/Intraface/modules/newsletter/Controller/templates/letters.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         </td>
         <td class="buttons">
             <?php if ($letter['status'] != 'sent') : ?>
-                <a href="<?php e(url($letter['id'] . '/send')); ?>"><?php e(t('Send')); ?></a>
+                <a href="<?php e(url($letter['id'].'/send')); ?>"><?php e(t('Send')); ?></a>
                 <a class="edit" href="<?php e(url($letter['id'], array('edit'))); ?>"><?php e(t('Edit')); ?></a>
                 <a class="delete" href="<?php e(url($letter['id'], array('delete'))); ?>"><?php e(t('Delete')); ?></a>
             <?php endif; ?>

src/Intraface/modules/newsletter/Controller/templates/list.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     </tr>
     <tr>
         <th><?php e(t('Email sender name')); ?></th>
-        <td><?php e($value['sender_name']); ?> <?php echo htmlspecialchars('<' . $value['reply_email'] . '>'); ?></td>
+        <td><?php e($value['sender_name']); ?> <?php echo htmlspecialchars('<'.$value['reply_email'].'>'); ?></td>
     </tr>
 <!--
     <tr>

src/Intraface/modules/newsletter/Controller/templates/contact-lists.tpl.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
     <tbody>
     <?php foreach ($lists as $list) : ?>
     <tr>
-        <td><a href="<?php e(url('lists/' . $list['list']->get('id'))); ?>"><?php e($list['list']->get('title')); ?></a></td>
+        <td><a href="<?php e(url('lists/'.$list['list']->get('id'))); ?>"><?php e($list['list']->get('title')); ?></a></td>
         <td class="options">
-            <a class="delete" href="<?php e(url('lists/' . $list['list']->get('id') . '/subscriber/' . $list['subscriber_id'], array('remove'))); ?>"><?php e(t('Remove')); ?></a>
+            <a class="delete" href="<?php e(url('lists/'.$list['list']->get('id').'/subscriber/'.$list['subscriber_id'], array('remove'))); ?>"><?php e(t('Remove')); ?></a>
         </td>
 
     </tr>

src/Intraface/modules/newsletter/Controller/templates/send.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     <fieldset>
         <legend><?php e(t('Body text')); ?></legend>
         <div>
-        <pre><?php e(wordwrap($context->getLetter()->get('text') . "\n\n" . $context->getLetter()->list->get('unsubscribe')), 72); ?></pre>
+        <pre><?php e(wordwrap($context->getLetter()->get('text')."\n\n".$context->getLetter()->list->get('unsubscribe')), 72); ?></pre>
     </div>
     </fieldset>
   <div>

src/Intraface/modules/newsletter/Controller/Subscribers.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 
         }*/
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/subscribers');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/subscribers');
         return $smarty->render($this);
     }
 

src/Intraface/modules/newsletter/Controller/Send.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     {
         $module = $this->getKernel()->module("newsletter");
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/send');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/send');
         return $smarty->render($this);
     }