intraface / intraface.dk

src/Intraface/modules/cms/Controller/Navigation.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     {
         $webshop_module = $this->getKernel()->module('cms');
 
-        $this->document->setTitle('Navigation for ' . $this->getSite()->get('name'));
+        $this->document->setTitle('Navigation for '.$this->getSite()->get('name'));
 
         $data['categories'] = $this->getNavigationGateway()->findBySite($this->getSite());
 

src/Intraface/modules/cms/HTML/Parser.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
                 $element['extra_style'] = ' style="'.$element['extra_style'].'"';
             }
 
-            $function =  'parse'.$element['type'] . 'Element';
+            $function = 'parse'.$element['type'].'Element';
             $output = $this->$function($element);
 
             $display .= '<div id="element-'.$element['id'].'"'.$element['extra_class'].$element['extra_style'].'>';
@@ -57,9 +57,9 @@ 
             } else {
                 $display .= '       <li><a href="'.$_SERVER['PHP_SELF'].'?action=move&amp;element_id='.$element['id'].'&amp;id='.$element['section_id'].'">'.$this->translation->get('move').'</a></li>';
             }
-            $display .= '       <li><a class="confirm" href="' . $_SERVER['PHP_SELF'] . '?delete='.$element['id'].'">'.$this->translation->get('delete').'</a></li>';
+            $display .= '       <li><a class="confirm" href="'.$_SERVER['PHP_SELF'].'?delete='.$element['id'].'">'.$this->translation->get('delete').'</a></li>';
             $display .= '   </ul>';
-            $display .= '<div>' .           $output . '</div>';
+            $display .= '<div>'.$output.'</div>';
             $display .= '</div>';
         }
         return $display;

src/Intraface/modules/newsletter/SubscribersGateway.php

Spacing +7 added lines, -7 removed lines

@@ -16,7 +16,7 @@ 
 
     function getAllUnsubscribersForList($list)
     {
-        $this->dbquery = new Intraface_DBQuery($list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=". $list->get('id') . " AND newsletter_subscriber.intranet_id = " . $list->kernel->intranet->get('id'));
+        $this->dbquery = new Intraface_DBQuery($list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=".$list->get('id')." AND newsletter_subscriber.intranet_id = ".$list->kernel->intranet->get('id'));
         $this->dbquery->setJoin("LEFT", "contact", "newsletter_subscriber.contact_id = contact.id AND contact.intranet_id = ".$list->kernel->intranet->get("id"), '');
         $this->dbquery->setJoin("LEFT", "address", "address.belong_to_id = contact.id AND address.active = 1 AND address.type = 3", '');
         $this->dbquery->setFilter('optin', 1);
@@ -30,7 +30,7 @@ 
 
     function getByContactId($list, $id)
     {
-        $this->dbquery = new Intraface_DBQuery($list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=". $list->get('id') . " AND newsletter_subscriber.intranet_id = " . $list->kernel->intranet->get('id'));
+        $this->dbquery = new Intraface_DBQuery($list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=".$list->get('id')." AND newsletter_subscriber.intranet_id = ".$list->kernel->intranet->get('id'));
         $this->dbquery->setFilter('contact_id', $id);
         $this->getDBQuery()->setCondition('newsletter_subscriber.contact_id = '.$this->getDBQuery()->getFilter('contact_id'));
 
@@ -41,14 +41,14 @@ 
     {
         // @todo - make sure to delete old ones
         $db = MDB2::singleton();
-        $db->query('UPDATE newsletter_subscriber SET contact_id = ' . $new_id . ' WHERE contact_id = ' . $old_id);
+        $db->query('UPDATE newsletter_subscriber SET contact_id = '.$new_id.' WHERE contact_id = '.$old_id);
     }
 
     public function findCountByContactId($contact_id)
     {
         $sql = "SELECT id
                 FROM newsletter_subscriber
-                    WHERE intranet_id = " . $this->kernel->intranet->get("id") . "
+                    WHERE intranet_id = " . $this->kernel->intranet->get("id")."
                         AND contact_id = ".(int)$contact_id."
               AND active = 1";
 
@@ -65,7 +65,7 @@ 
         $code = strip_tags($code);
 
         $db = new DB_Sql;
-        $db->query("SELECT id, list_id FROM newsletter_subscriber WHERE code = '".$code."' AND intranet_id = " . $this->kernel->intranet->get('id')." and active = 1");
+        $db->query("SELECT id, list_id FROM newsletter_subscriber WHERE code = '".$code."' AND intranet_id = ".$this->kernel->intranet->get('id')." and active = 1");
         if (!$db->nextRecord()) {
             return false;
         }
@@ -84,8 +84,8 @@ 
                     LEFT JOIN address
                         ON address.belong_to_id = contact.id
                     WHERE address.email = '".$email."'
-                        AND newsletter_subscriber.list_id = " . $list->get('id') . "
-                        AND newsletter_subscriber.intranet_id = " . $this->kernel->intranet->get('id') . "
+                        AND newsletter_subscriber.list_id = " . $list->get('id')."
+                        AND newsletter_subscriber.intranet_id = " . $this->kernel->intranet->get('id')."
                         AND newsletter_subscriber.active = 1
                         AND contact.active = 1");
         if (!$db->nextRecord()) {

src/Intraface/modules/newsletter/ListGateway.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     function findByContactId($contact_id)
     {
         $db = new DB_Sql;
-        $db->query('SELECT * FROM newsletter_subscriber WHERE contact_id = ' . $contact_id);
+        $db->query('SELECT * FROM newsletter_subscriber WHERE contact_id = '.$contact_id);
         $lists = array();
         while ($db->nextRecord()) {
             $lists[$db->f('list_id')]['list'] = $this->findById($db->f('list_id'));

src/Intraface/modules/newsletter/Observer/OptinMail.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
         $data = array(
             'subject' => 'Bekræft tilmelding',
             'body' =>
-                $this->list->get('subscribe_message') . "\n\n" .
+                $this->list->get('subscribe_message')."\n\n".
                 "\n\nMed venlig hilsen\n".$this->list->get('sender_name'),
             'contact_id' => $subscriber->get('contact_id'),
             'from_email' => $this->list->get('reply_email'),
@@ -86,7 +86,7 @@ 
 
         if ($email->queue()) {
             $db = new DB_Sql;
-            $db->query("UPDATE newsletter_subscriber SET date_optin_email_sent = NOW() WHERE id = " . $subscriber->get('id'));
+            $db->query("UPDATE newsletter_subscriber SET date_optin_email_sent = NOW() WHERE id = ".$subscriber->get('id'));
             return true;
         }
 

src/Intraface/modules/newsletter/NewsletterSubscriber.php

Spacing +23 added lines, -23 removed lines

@@ -52,7 +52,7 @@ 
             return $this->dbquery;
         }
         // optin = 1 should not be set here
-        $this->dbquery = new Intraface_DBQuery($this->list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=". $this->list->get("id") . " AND newsletter_subscriber.intranet_id = " . $this->list->kernel->intranet->get('id'));
+        $this->dbquery = new Intraface_DBQuery($this->list->kernel, "newsletter_subscriber", "newsletter_subscriber.list_id=".$this->list->get("id")." AND newsletter_subscriber.intranet_id = ".$this->list->kernel->intranet->get('id'));
         $this->dbquery->setJoin("LEFT", "contact", "newsletter_subscriber.contact_id = contact.id AND contact.intranet_id = ".$this->list->kernel->intranet->get("id"), '');
         $this->dbquery->setJoin("LEFT", "address", "address.belong_to_id = contact.id AND address.active = 1 AND address.type = 3", '');
         $this->dbquery->useErrorObject($this->error);
@@ -135,7 +135,7 @@ 
     private function load()
     {
         $db = new DB_Sql;
-        $db->query("SELECT * FROM newsletter_subscriber WHERE id = " . $this->id." and active = 1");
+        $db->query("SELECT * FROM newsletter_subscriber WHERE id = ".$this->id." and active = 1");
         if (!$db->nextRecord()) {
 
             $this->id = 0;
@@ -159,7 +159,7 @@ 
     public function delete()
     {
         $db = new DB_Sql;
-        $db->query('UPDATE newsletter_subscriber SET active = 0 WHERE id = ' . $this->id);
+        $db->query('UPDATE newsletter_subscriber SET active = 0 WHERE id = '.$this->id);
         return true;
     }
 
@@ -185,7 +185,7 @@ 
     {
         $db = new DB_sql;
 
-        $db->query("SELECT id FROM newsletter_subscriber WHERE contact_id = '".$contact->getId()."' AND list_id = " . $this->list->get("id") . " AND intranet_id = ".$this->list->kernel->intranet->get('id')." AND active = 1");
+        $db->query("SELECT id FROM newsletter_subscriber WHERE contact_id = '".$contact->getId()."' AND list_id = ".$this->list->get("id")." AND intranet_id = ".$this->list->kernel->intranet->get('id')." AND active = 1");
         if ($db->nextRecord()) {
             return $db->f('id');
         }
@@ -193,10 +193,10 @@ 
         // Spørgsmålet er om vedkommende bør få en e-mail, hvor man kan acceptere?
         $db->query("INSERT INTO newsletter_subscriber SET
                     contact_id = '".$contact->getId()."',
-                    list_id = " . $this->list->get("id") . ",
+                    list_id = " . $this->list->get("id").",
                     date_submitted=NOW(),
                     optin = 1,
-                    code = '".md5($this->list->get("id") . $this->list->kernel->intranet->get('id') . date('Y-m-d H:i:s') . $contact->getId())."',
+                    code = '".md5($this->list->get("id").$this->list->kernel->intranet->get('id').date('Y-m-d H:i:s').$contact->getId())."',
                     intranet_id = ".$this->list->kernel->intranet->get('id'));
 
         return $db->insertedId();
@@ -215,7 +215,7 @@ 
         $input = array_map('strip_tags', $input);
 
         $validator = new Intraface_Validator($this->error);
-        $validator->isEmail($input['email'], $input['email'] . ' er ikke en gyldig e-mail');
+        $validator->isEmail($input['email'], $input['email'].' er ikke en gyldig e-mail');
 
         if (empty($input['name'])) {
             $input['name'] = $input['email'];
@@ -283,7 +283,7 @@ 
                     date_submitted = NOW(),
                     ip_submitted = '".$input['ip']."'
                 WHERE id = ".$this->id."
-                    AND list_id = " . $this->list->get("id") . "
+                    AND list_id = " . $this->list->get("id")."
                     AND intranet_id = " . $this->list->kernel->intranet->get('id'));
             //code =  '" . md5($input['email'] . date('Y-m-d H:i:s') . $input['ip'])."'
 
@@ -307,10 +307,10 @@ 
                     contact_id = '".$contact->get('id')."',
                     email = '".$input['email']."',
                     name='".$input['name']."',
-                    list_id = " . $this->list->get("id") . ",
+                    list_id = " . $this->list->get("id").",
                     ip_submitted='".$input['ip']."',
                     date_submitted=NOW(),
-                    code= '" . md5($input['email'] . date('Y-m-d H:i:s') . $input['ip'])."',
+                    code= '" . md5($input['email'].date('Y-m-d H:i:s').$input['ip'])."',
                     intranet_id = ".$this->list->kernel->intranet->get('id'));
 
         }
@@ -346,7 +346,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("SELECT * FROM newsletter_subscriber WHERE id = " . $this->id." and active = 1");
+        $db->query("SELECT * FROM newsletter_subscriber WHERE id = ".$this->id." and active = 1");
         if (!$db->nextRecord()) {
             return false;
         }
@@ -384,7 +384,7 @@ 
         $this->load();
 
         $db = new DB_Sql;
-        $db->query("UPDATE newsletter_subscriber SET active = 0, date_unsubscribe = '".date('Y-m-d H:i:s')."' WHERE id=".$this->id." AND list_id = " . $this->list->get("id") . " AND intranet_id = " . $this->list->kernel->intranet->get('id'));
+        $db->query("UPDATE newsletter_subscriber SET active = 0, date_unsubscribe = '".date('Y-m-d H:i:s')."' WHERE id=".$this->id." AND list_id = ".$this->list->get("id")." AND intranet_id = ".$this->list->kernel->intranet->get('id'));
         return true;
     }
 
@@ -402,16 +402,16 @@ 
         // optin really wants to optin, so we will not make that a part of the select query
         // and we will set it in the update query
         $db = new DB_Sql;
-        $db->query("SELECT id, ip_submitted FROM newsletter_subscriber WHERE code = '".$code."' AND list_id = " . $this->list->get('id'));
+        $db->query("SELECT id, ip_submitted FROM newsletter_subscriber WHERE code = '".$code."' AND list_id = ".$this->list->get('id'));
         if (!$db->nextRecord()) {
             return false;
         }
 
-        $db->query("UPDATE newsletter_subscriber SET optin = 1, ip_optin = '".$ip."', date_optin = NOW(), active = 1 WHERE code = '" . $code . "' AND list_id = " . $this->list->get('id'));
+        $db->query("UPDATE newsletter_subscriber SET optin = 1, ip_optin = '".$ip."', date_optin = NOW(), active = 1 WHERE code = '".$code."' AND list_id = ".$this->list->get('id'));
 
         // makes sure that the submitted ip is also set - not really a part of this method.
         if ($db->f('ip_submitted')) {
-            $db->query("UPDATE newsletter_subscriber SET ip_submitted = '".$ip."' WHERE id = " . $db->f("id"));
+            $db->query("UPDATE newsletter_subscriber SET ip_submitted = '".$ip."' WHERE id = ".$db->f("id"));
         }
         return true;
     }
@@ -456,8 +456,8 @@ 
         $data = array(
                 'subject' => $subscribe_subject,
                 'body' =>
-                    $this->list->get('subscribe_message') . "\n\n" .
-                    $this->getLoginUrl($contact) .
+                    $this->list->get('subscribe_message')."\n\n".
+                    $this->getLoginUrl($contact).
                     "\n\n".$this->list->get('sender_name'),
                 'contact_id' => $this->get('contact_id'),
                 'from_email' => $this->list->get('reply_email'),
@@ -467,16 +467,16 @@ 
             );
 
         if (!$email->save($data)) {
-            $this->error->set('could not send the e-mail' . implode(',', $email->error->messages));
+            $this->error->set('could not send the e-mail'.implode(',', $email->error->messages));
             return false;
         }
 
         if ($email->queue()) {
             $db = new DB_Sql;
-            $db->query("UPDATE newsletter_subscriber SET date_optin_email_sent = NOW() WHERE id = " . $this->id);
+            $db->query("UPDATE newsletter_subscriber SET date_optin_email_sent = NOW() WHERE id = ".$this->id);
             return true;
         }
-        $this->error->set('could not send the e-mail' . implode(',', $email->error->message));
+        $this->error->set('could not send the e-mail'.implode(',', $email->error->message));
         return false;
     }
 
@@ -488,7 +488,7 @@ 
     {
         if ($this->sendOptInEmail()) {
             $db = new DB_Sql;
-            $db->query("UPDATE newsletter_subscriber SET resend_optin_email_count = resend_optin_email_count + 1 WHERE id = " . $this->id);
+            $db->query("UPDATE newsletter_subscriber SET resend_optin_email_count = resend_optin_email_count + 1 WHERE id = ".$this->id);
             return true;
         }
     }
@@ -496,9 +496,9 @@ 
     private function getLoginUrl($contact)
     {
         if (!$link = $this->list->get('optin_link')) {
-            return $contact->getLoginUrl() . '&optin=' . $this->get('code');
+            return $contact->getLoginUrl().'&optin='.$this->get('code');
         }
-        return $link . '?optin=' . $this->get('code');
+        return $link.'?optin='.$this->get('code');
     }
 
     /**

src/Intraface/modules/newsletter/NewsletterList.php

Spacing +8 added lines, -8 removed lines

@@ -51,7 +51,7 @@ 
     {
         $db  = new DB_Sql;
         $db2 = new DB_Sql;
-        $db->query("SELECT * FROM newsletter_list WHERE active = 1 AND id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT * FROM newsletter_list WHERE active = 1 AND id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         if (!$db->nextRecord()) {
             return false;
         }
@@ -75,8 +75,8 @@ 
         $db2->query("SELECT *
             FROM newsletter_subscriber
             INNER JOIN contact ON newsletter_subscriber.contact_id = contact.id
-            WHERE list_id = " . $db->f('id') . "
-                AND newsletter_subscriber.intranet_id = " . $this->kernel->intranet->get('id') . "
+            WHERE list_id = " . $db->f('id')."
+                AND newsletter_subscriber.intranet_id = " . $this->kernel->intranet->get('id')."
                 AND optin = 1
                 AND contact.active = 1
                 AND newsletter_subscriber.active = 1");
@@ -166,9 +166,9 @@ 
             // subscribe_option_key = ".$var['subscribe_option_key'].",
 
         if ($this->id > 0) {
-            $db->query("UPDATE newsletter_list SET ".$sql.", date_changed = NOW() WHERE id = " . $this->id);
+            $db->query("UPDATE newsletter_list SET ".$sql.", date_changed = NOW() WHERE id = ".$this->id);
         } else {
-            $db->query("INSERT INTO newsletter_list SET ".$sql.", intranet_id = " . $this->kernel->intranet->get('id').", date_created = NOW(), date_changed = NOW()");
+            $db->query("INSERT INTO newsletter_list SET ".$sql.", intranet_id = ".$this->kernel->intranet->get('id').", date_created = NOW(), date_changed = NOW()");
             $this->id = $db->insertedId();
         }
 
@@ -185,7 +185,7 @@ 
     function delete()
     {
         $db = new DB_Sql;
-        $db->query("UPDATE newsletter_list SET active = 0 WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("UPDATE newsletter_list SET active = 0 WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         return true;
     }
 
@@ -197,7 +197,7 @@ 
     function doesListExist()
     {
         $db = new DB_Sql;
-        $db->query("SELECT id FROM newsletter_list WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT id FROM newsletter_list WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         return ($db->numRows() > 0);
     }
 
@@ -212,7 +212,7 @@ 
         $db    = new DB_Sql;
         $db2   = new DB_Sql;
         $i     = 0;
-        $db->query("SELECT * FROM newsletter_list WHERE intranet_id = " . $this->kernel->intranet->get('id')." AND active = 1");
+        $db->query("SELECT * FROM newsletter_list WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND active = 1");
         while ($db->nextRecord()) {
             $list                     = new Newsletterlist($this->kernel, $db->f('id'));
             $lists[$i]['id']          = $db->f('id');

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

Spacing +2 added lines, -2 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -19,13 +19,13 @@
     {
         $module = $this->getKernel()->module("newsletter");
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/lists');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/lists');
         return $smarty->render($this);
     }
 
     function renderHtmlCreate()
     {
-        $smarty = $this->template->create(dirname(__FILE__) . '/templates/list-edit');
+        $smarty = $this->template->create(dirname(__FILE__).'/templates/list-edit');
         return $smarty->render($this);
     }