intraface / intraface.dk

src/Intraface/Auth/User.php

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
         $result = $this->db->query("SELECT id FROM user WHERE email = ".$this->db->quote($this->email, 'text')." AND password = ".$this->db->quote(md5($this->password), 'text'));
 
         if (PEAR::isError($result)) {
-            throw new Exception('result is an error' . $result->getMessage() . $result->getUserInfo());
+            throw new Exception('result is an error'.$result->getMessage().$result->getUserInfo());
         }
 
         if ($result->numRows() != 1) {
@@ -48,9 +48,9 @@ 
         }
         $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
 
-        $result = $this->db->exec("UPDATE user SET lastlogin = NOW(), session_id = ".$this->db->quote($this->session_id, 'text')." WHERE id = ". $this->db->quote($row['id'], 'integer'));
+        $result = $this->db->exec("UPDATE user SET lastlogin = NOW(), session_id = ".$this->db->quote($this->session_id, 'text')." WHERE id = ".$this->db->quote($row['id'], 'integer'));
         if (PEAR::isError($result)) {
-            throw new Exception('could not update user ' . $result->getMessage() . $result->getUserInfo());
+            throw new Exception('could not update user '.$result->getMessage().$result->getUserInfo());
         }
 
         $user = new Intraface_User($row['id']);
@@ -67,7 +67,7 @@ 
     {
         $result = $this->db->query("SELECT id FROM user WHERE session_id = ".$this->db->quote($this->session_id, 'text'));
         if (PEAR::isError($result)) {
-            throw new Exception('could not check if user is logged in ' . $result->getUserInfo());
+            throw new Exception('could not check if user is logged in '.$result->getUserInfo());
         }
 
         if ($result->numRows() == 0) {
@@ -85,10 +85,10 @@ 
      */
     public function logout()
     {
-        $result = $this->db->exec("UPDATE user SET session_id = " . $this->db->quote('', 'text') . " WHERE session_id = " . $this->db->quote($this->session_id, 'text'));
+        $result = $this->db->exec("UPDATE user SET session_id = ".$this->db->quote('', 'text')." WHERE session_id = ".$this->db->quote($this->session_id, 'text'));
 
         if (PEAR::isError($result)) {
-             throw new Exception('could not log user out ' . $result->getUserInfo());
+             throw new Exception('could not log user out '.$result->getUserInfo());
         }
         return true;
     }

src/Intraface/Fileimport/Controller/Index.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
             'fileimport' => $this->fileimport
         );
 
-        $tpl = $this->template->create(dirname(__FILE__) . '/templates/index');
+        $tpl = $this->template->create(dirname(__FILE__).'/templates/index');
         return $tpl->render($this, $data);
     }
 
@@ -100,7 +100,7 @@ 
                     $_SESSION['shared_fileimport_data'] = $data;
                     $this->session()->set('fileimport_data', $data);
 
-                    return new k_SeeOther($this->url('../', array('header' => $this->body('header'),'file_id' => $this->filehandler->get('id'), 'fields' => $this->body('fields'))));
+                    return new k_SeeOther($this->url('../', array('header' => $this->body('header'), 'file_id' => $this->filehandler->get('id'), 'fields' => $this->body('fields'))));
 
                     /*
 

src/Intraface/Kernel.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         }
         $this->db = MDB2:: singleton(DB_DSN);
         if (PEAR::isError($this->db)) {
-            throw new Exception($this->db->getMessage() . $this->db->getUserInfo());
+            throw new Exception($this->db->getMessage().$this->db->getUserInfo());
         }
     }
 

src/Intraface/Doctrine/Template/Listener/Intranet.php

Spacing +5 added lines, -5 removed lines

@@ -8,16 +8,16 @@ 
         $invoker = $event->getInvoker();
         $class   = get_class($invoker);
 
-        $field = $params['alias'] . '.intranet_id';
+        $field = $params['alias'].'.intranet_id';
         $query = $event->getQuery();
 
         // if it is not the class from FROM statement, it is left or inner join.
         // then we add the possibility for IS NULL. Actually it is only relevant in
         // left join, but how do we find out which kind of join it is?
         if ($query->contains('FROM '.$class)) {
-            $query->addWhere($field . '  = ?', array($this->getIntranetId()));
+            $query->addWhere($field.'  = ?', array($this->getIntranetId()));
         } else {
-            $query->addWhere('('.$field.' IS NULL OR '.$field . '  = ?)', array($this->getIntranetId()));
+            $query->addWhere('('.$field.' IS NULL OR '.$field.'  = ?)', array($this->getIntranetId()));
         }
     }
 
@@ -36,9 +36,9 @@ 
     public function preDqlDelete(Doctrine_Event $event)
     {
         $params = $event->getParams();
-        $field = $params['alias'] . '.intranet_id';
+        $field = $params['alias'].'.intranet_id';
         $query = $event->getQuery();
-        $query->addWhere($field . ' = ?', array($this->getIntranetId()));
+        $query->addWhere($field.' = ?', array($this->getIntranetId()));
     }
 
     private function getIntranetId()

src/Intraface/shared/email/Email.php

Spacing +13 added lines, -13 removed lines

@@ -81,7 +81,7 @@ 
 
         $db = new DB_Sql;
         $db->query('SET NAMES utf8'); /* To be removed when everything is in utf-8 */
-        $sql = "SELECT id, email.date_sent, DATE_FORMAT(date_sent, '%d-%m-%Y') as date_sent_dk, subject, from_name, from_email, user_id, body, status, contact_id, contact_person_id, type_id, belong_to_id, status, bcc_to_user FROM email WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = " . $this->id;
+        $sql = "SELECT id, email.date_sent, DATE_FORMAT(date_sent, '%d-%m-%Y') as date_sent_dk, subject, from_name, from_email, user_id, body, status, contact_id, contact_person_id, type_id, belong_to_id, status, bcc_to_user FROM email WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = ".$this->id;
         $db->query($sql);
         if (!$db->nextRecord()) {
             return false;
@@ -174,12 +174,12 @@ 
         if ($this->id == 0) {
             $sql_type = "INSERT INTO ";
             $sql_end = ", date_created = NOW(),
-                belong_to_id = ".(int)$var['belong_to'] . ",
-                type_id = ".(int)$var['type_id'] . ",
+                belong_to_id = ".(int)$var['belong_to'].",
+                type_id = ".(int)$var['type_id'].",
                 contact_id=".$var['contact_id'];
         } else {
             $sql_type = "UPDATE ";
-            $sql_end = " WHERE id = " . $this->id;
+            $sql_end = " WHERE id = ".$this->id;
         }
 
         if (!empty($var['date_deadline'])) {
@@ -191,7 +191,7 @@ 
         // gemme userid hvis vi er inde i systemet
         if (is_object($this->kernel->user) AND $this->kernel->user->get('id') > 0) {
             //$db->query("UPDATE email SET user_id = ".$this->kernel->user->get('id')." WHERE id = " . $this->id);
-            $sql_extra = ', user_id = ' . $db->quote($this->kernel->user->get('id'), 'integer');
+            $sql_extra = ', user_id = '.$db->quote($this->kernel->user->get('id'), 'integer');
         }
 
         if (!isset($var['contact_person_id'])) {
@@ -203,11 +203,11 @@ 
         }
 
         // status 1 = draft
-        $sql = $sql_type . " email SET
+        $sql = $sql_type." email SET
             contact_person_id = ".(int)$var['contact_person_id'].",
             bcc_to_user = ".(int)$var['bcc_to_user'].",
             date_updated = NOW(),
-            intranet_id = " . $this->kernel->intranet->get('id') . ",
+            intranet_id = " . $this->kernel->intranet->get('id').",
             subject = '".$var['subject']."',
             body = '".$var['body']."',
             date_deadline = ".$date_deadline.",
@@ -245,7 +245,7 @@ 
     function saveErrorMsg($error)
     {
         $db = new DB_Sql;
-        $db->query("UPDATE email SET error_msg = '".$error."' WHERE id = " . $this->id);
+        $db->query("UPDATE email SET error_msg = '".$error."' WHERE id = ".$this->id);
         return true;
     }
 
@@ -260,7 +260,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("UPDATE email SET status = 3, date_sent = NOW() WHERE id = " . $this->id);
+        $db->query("UPDATE email SET status = 3, date_sent = NOW() WHERE id = ".$this->id);
         return true;
     }
 
@@ -291,7 +291,7 @@ 
 
         $db = new DB_Sql;
         // Putter e-mailen i outboxen (status = 2)
-        $db->query("UPDATE email SET status = 2 WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = " . $this->id);
+        $db->query("UPDATE email SET status = 2 WHERE intranet_id = ".$this->kernel->intranet->get('id')." AND id = ".$this->id);
         return true;
     }
 
@@ -299,7 +299,7 @@ 
     {
         $contact = $this->getContact();
         if ($this->get('contact_id') == 0 OR !is_object($contact)) {
-            $this->error->set('Der kunne ikke sendes e-mail til email #' . $this->get('id') . ' fordi der ikke var nogen kunde sat');
+            $this->error->set('Der kunne ikke sendes e-mail til email #'.$this->get('id').' fordi der ikke var nogen kunde sat');
             return false;
         }
 
@@ -383,7 +383,7 @@ 
     {
         $db = new DB_Sql;
         $db->query("SELECT file_id, filename FROM email_attachment
-            WHERE intranet_id = " .$this->kernel->intranet->get('id') . " AND email_id = " . $this->id);
+            WHERE intranet_id = " .$this->kernel->intranet->get('id')." AND email_id = ".$this->id);
         $file = array();
         $i = 0;
         while ($db->nextRecord()) {
@@ -415,7 +415,7 @@ 
             return false;
         }
         $db = new DB_Sql;
-        $db->query("DELETE FROM email WHERE id = " . $this->id . " AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("DELETE FROM email WHERE id = ".$this->id." AND intranet_id = ".$this->kernel->intranet->get('id'));
         return true;
     }
 

src/Intraface/shared/email/EmailGateway.php

Spacing +6 added lines, -6 removed lines

@@ -56,14 +56,14 @@ 
     function findCountByContactId($contact_id)
     {
         $db = new DB_Sql;
-        $db->query('SELECT * FROM email WHERE contact_id = ' . $contact_id);
+        $db->query('SELECT * FROM email WHERE contact_id = '.$contact_id);
         return $db->numRows();
     }
 
     function setNewContactId($old_contact_id, $new_contact_id)
     {
         $db = new DB_Sql;
-        $db->query('UPDATE email SET contact_id = ' . $new_contact_id . ' WHERE contact_id = ' . $old_contact_id);
+        $db->query('UPDATE email SET contact_id = '.$new_contact_id.' WHERE contact_id = '.$old_contact_id);
         return true;
     }
 
@@ -78,7 +78,7 @@ 
     function countQueue()
     {
         $db = new DB_Sql;
-        $db->query("SELECT COUNT(*) AS antal FROM email WHERE status = 2 AND intranet_id = " . $this->kernel->intranet->get('id'));
+        $db->query("SELECT COUNT(*) AS antal FROM email WHERE status = 2 AND intranet_id = ".$this->kernel->intranet->get('id'));
         $this->value['outbox'] = 0;
         if ($db->nextRecord()) {
             $this->value['outbox'] = $db->f('antal');
@@ -99,7 +99,7 @@ 
             $list[$i]['status'] = $this->status[$db->f('status')];
 
             if ($db->f('contact_id') == 0) {
-                $this->error->set('Kan ikke finde #' . $db->f('id') . ' fordi den ikke har noget kontakt_id');
+                $this->error->set('Kan ikke finde #'.$db->f('id').' fordi den ikke har noget kontakt_id');
                 continue;
             }
             $this->kernel->useModule('contact');
@@ -133,13 +133,13 @@ 
     {
         $sent_this_hour = $this->sentThisHour();
 
-        $limit_query = abs($this->allowed_limit-$sent_this_hour-$this->system_buffer);
+        $limit_query = abs($this->allowed_limit - $sent_this_hour - $this->system_buffer);
 
         $sql = "SELECT id
                 FROM email
                 WHERE status = 2
                     AND date_deadline <= NOW()
-                    AND intranet_id = " . $this->kernel->intranet->get('id') . "
+                    AND intranet_id = " . $this->kernel->intranet->get('id')."
                     AND contact_id > 0
                 LIMIT " . $limit_query;
         $db = new DB_Sql;

src/Intraface/ModuleGateway.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
     public function __construct(MDB2_Driver_Common $db)
     {
-        $this->db =  $db;
+        $this->db = $db;
         $this->error = new Intraface_Error;
     }
 

src/Intraface/Keyword/Controller/Index.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
     function renderHtml()
     {
-        return get_class($this) . ': intentionally left blank';
+        return get_class($this).': intentionally left blank';
     }
 
     function getModel()

src/Intraface/Keyword/Controller/Connect.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
         	'keywords' => $keywords,
         	'checked' => $checked);
 
-        $smarty = $this->template->create(dirname(__FILE__) . '/../templates/connect');
+        $smarty = $this->template->create(dirname(__FILE__).'/../templates/connect');
         return $smarty->render($this, $data);
     }