chamilo / chamilo-lms

main/inc/lib/phpmailer/class.phpmailer.php

Spacing +235 added lines, -236 removed lines

@@ -38,7 +38,7 @@ 
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
  */
 
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
+if (version_compare(PHP_VERSION, '5.0.0', '<')) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
 
 class PHPMailer {
 
@@ -50,64 +50,64 @@ 
    * Email priority (1 = High, 3 = Normal, 5 = low).
    * @var int
    */
-  public $Priority          = 3;
+  public $Priority = 3;
 
   /**
    * Sets the CharSet of the message.
    * @var string
    */
-  public $CharSet           = 'iso-8859-1';
+  public $CharSet = 'iso-8859-1';
 
   /**
    * Sets the Content-type of the message.
    * @var string
    */
-  public $ContentType       = 'text/plain';
+  public $ContentType = 'text/plain';
 
   /**
    * Sets the Encoding of the message. Options for this are
    *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
    * @var string
    */
-  public $Encoding          = '8bit';
+  public $Encoding = '8bit';
 
   /**
    * Holds the most recent mailer error message.
    * @var string
    */
-  public $ErrorInfo         = '';
+  public $ErrorInfo = '';
 
   /**
    * Sets the From email address for the message.
    * @var string
    */
-  public $From              = 'root@localhost';
+  public $From = 'root@localhost';
 
   /**
    * Sets the From name of the message.
    * @var string
    */
-  public $FromName          = 'Root User';
+  public $FromName = 'Root User';
 
   /**
    * Sets the Sender email (Return-Path) of the message.  If not empty,
    * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
    * @var string
    */
-  public $Sender            = '';
+  public $Sender = '';
 
   /**
    * Sets the Subject of the message.
    * @var string
    */
-  public $Subject           = '';
+  public $Subject = '';
 
   /**
    * Sets the Body of the message.  This can be either an HTML or text body.
    * If HTML then run IsHTML(true).
    * @var string
    */
-  public $Body              = '';
+  public $Body = '';
 
   /**
    * Sets the text-only body of the message.  This automatically sets the
@@ -116,39 +116,39 @@ 
    * that can read HTML will view the normal Body.
    * @var string
    */
-  public $AltBody           = '';
+  public $AltBody = '';
 
   /**
    * Sets word wrapping on the body of the message to a given number of
    * characters.
    * @var int
    */
-  public $WordWrap          = 0;
+  public $WordWrap = 0;
 
   /**
    * Method to send mail: ("mail", "sendmail", or "smtp").
    * @var string
    */
-  public $Mailer            = 'mail';
+  public $Mailer = 'mail';
 
   /**
    * Sets the path of the sendmail program.
    * @var string
    */
-  public $Sendmail          = '/usr/sbin/sendmail';
+  public $Sendmail = '/usr/sbin/sendmail';
 
   /**
    * Path to PHPMailer plugins.  Useful if the SMTP class
    * is in a different directory than the PHP include path.
    * @var string
    */
-  public $PluginDir         = '';
+  public $PluginDir = '';
 
   /**
    * Sets the email address that a reading confirmation will be sent.
    * @var string
    */
-  public $ConfirmReadingTo  = '';
+  public $ConfirmReadingTo = '';
 
   /**
    * Sets the hostname to use in Message-Id and Received headers
@@ -156,14 +156,14 @@ 
    * by SERVER_NAME is used or 'localhost.localdomain'.
    * @var string
    */
-  public $Hostname          = '';
+  public $Hostname = '';
 
   /**
    * Sets the message ID to be used in the Message-Id header.
    * If empty, a unique id will be generated.
    * @var string
    */
-  public $MessageID         = '';
+  public $MessageID = '';
 
   /////////////////////////////////////////////////
   // PROPERTIES FOR SMTP
@@ -177,57 +177,57 @@ 
    * Hosts will be tried in order.
    * @var string
    */
-  public $Host          = 'localhost';
+  public $Host = 'localhost';
 
   /**
    * Sets the default SMTP server port.
    * @var int
    */
-  public $Port          = 25;
+  public $Port = 25;
 
   /**
    * Sets the SMTP HELO of the message (Default is $Hostname).
    * @var string
    */
-  public $Helo          = '';
+  public $Helo = '';
 
   /**
    * Sets connection prefix.
    * Options are "", "ssl" or "tls"
    * @var string
    */
-  public $SMTPSecure    = '';
+  public $SMTPSecure = '';
 
   /**
    * Sets SMTP authentication. Utilizes the Username and Password variables.
    * @var bool
    */
-  public $SMTPAuth      = false;
+  public $SMTPAuth = false;
 
   /**
    * Sets SMTP username.
    * @var string
    */
-  public $Username      = '';
+  public $Username = '';
 
   /**
    * Sets SMTP password.
    * @var string
    */
-  public $Password      = '';
+  public $Password = '';
 
   /**
    * Sets the SMTP server timeout in seconds.
    * This function will not work with the win32 version.
    * @var int
    */
-  public $Timeout       = 10;
+  public $Timeout = 10;
 
   /**
    * Sets SMTP class debugging on or off.
    * @var bool
    */
-  public $SMTPDebug     = false;
+  public $SMTPDebug = false;
 
   /**
    * Prevents the SMTP connection from being closed after each mail
@@ -242,7 +242,7 @@ 
    * emails, instead of sending to entire TO addresses
    * @var bool
    */
-  public $SingleTo      = false;
+  public $SingleTo = false;
 
    /**
    * If SingleTo is true, this provides the array to hold the email addresses
@@ -254,34 +254,34 @@ 
    * Provides the ability to change the line ending
    * @var string
    */
-  public $LE              = "\n";
+  public $LE = "\n";
 
   /**
    * Used with DKIM DNS Resource Record
    * @var string
    */
-  public $DKIM_selector   = 'phpmailer';
+  public $DKIM_selector = 'phpmailer';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_identity   = '';
+  public $DKIM_identity = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_domain     = '';
+  public $DKIM_domain = '';
 
   /**
    * Used with DKIM DNS Resource Record
    * optional, in format of email address 'you@yourdomain.com'
    * @var string
    */
-  public $DKIM_private    = '';
+  public $DKIM_private = '';
 
   /**
    * Callback Action function name
@@ -300,7 +300,7 @@ 
    * Sets the PHPMailer Version number
    * @var string
    */
-  public $Version         = '5.1';
+  public $Version = '5.1';
 
   /////////////////////////////////////////////////
   // PROPERTIES, PRIVATE AND PROTECTED
@@ -451,13 +451,13 @@ 
    */
   private function AddAnAddress($kind, $address, $name = '') {
     if (!preg_match('/^(to|cc|bcc|ReplyTo)$/', $kind)) {
-      error_log('Invalid recipient array: ' . $kind);
+      error_log('Invalid recipient array: '.$kind);
       return false;
     }
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
+      $this->SetError($this->Lang('invalid_address').': '.$address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
@@ -485,11 +485,11 @@ 
  * @param string $name
  * @return boolean
  */
-  public function SetFrom($address, $name = '',$auto=1) {
+  public function SetFrom($address, $name = '', $auto = 1) {
     $address = trim($address);
     $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
     if (!self::ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
+      $this->SetError($this->Lang('invalid_address').': '.$address);
       if ($this->exceptions) {
         throw new phpmailerException($this->Lang('invalid_address').': '.$address);
       }
@@ -522,7 +522,7 @@ 
    */
   public static function ValidateAddress($address) {
     if (function_exists('filter_var')) { //Introduced in PHP 5.2
-      if(filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
+      if (filter_var($address, FILTER_VALIDATE_EMAIL) === FALSE) {
         return false;
       } else {
         return true;
@@ -549,7 +549,7 @@ 
       }
 
       // Set whether the message is multipart/alternative
-      if(!empty($this->AltBody)) {
+      if (!empty($this->AltBody)) {
         $this->ContentType = 'multipart/alternative';
       }
 
@@ -564,12 +564,12 @@ 
 
       // digitally sign with DKIM if enabled
       if ($this->DKIM_domain && $this->DKIM_private) {
-        $header_dkim = $this->DKIM_Add($header,$this->Subject,$body);
-        $header = str_replace("\r\n","\n",$header_dkim) . $header;
+        $header_dkim = $this->DKIM_Add($header, $this->Subject, $body);
+        $header = str_replace("\r\n", "\n", $header_dkim).$header;
       }
 
       // Choose the mailer and send through it
-      switch($this->Mailer) {
+      switch ($this->Mailer) {
         case 'sendmail':
           return $this->SendmailSend($header, $body);
         case 'smtp':
@@ -602,32 +602,32 @@ 
     }
     if ($this->SingleTo === true) {
       foreach ($this->SingleToArray as $key => $val) {
-        if(!@$mail = popen($sendmail, 'w')) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        if (!@$mail = popen($sendmail, 'w')) {
+          throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
         }
-        fputs($mail, "To: " . $val . "\n");
+        fputs($mail, "To: ".$val."\n");
         fputs($mail, $header);
         fputs($mail, $body);
         $result = pclose($mail);
         // implement call back function if it exists
         $isSent = ($result == 0) ? 1 : 0;
-        $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
-        if($result != 0) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
+        if ($result != 0) {
+          throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
         }
       }
     } else {
-      if(!@$mail = popen($sendmail, 'w')) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      if (!@$mail = popen($sendmail, 'w')) {
+        throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
       }
       fputs($mail, $header);
       fputs($mail, $body);
       $result = pclose($mail);
       // implement call back function if it exists
       $isSent = ($result == 0) ? 1 : 0;
-      $this->doCallback($isSent,$this->to,$this->cc,$this->bcc,$this->Subject,$body);
-      if($result != 0) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+      $this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body);
+      if ($result != 0) {
+        throw new phpmailerException($this->Lang('execute').$this->Sendmail, self::STOP_CRITICAL);
       }
     }
     return true;
@@ -642,13 +642,13 @@ 
    */
   protected function MailSend($header, $body) {
     $toArr = array();
-    foreach($this->to as $t) {
+    foreach ($this->to as $t) {
       $toArr[] = $this->AddrFormat($t);
     }
     $to = implode(', ', $toArr);
 
     $params = sprintf("-oi -f %s", $this->Sender);
-    if ($this->Sender != '' && strlen(ini_get('safe_mode'))< 1) {
+    if ($this->Sender != '' && strlen(ini_get('safe_mode')) < 1) {
       $old_from = ini_get('sendmail_from');
       ini_set('sendmail_from', $this->Sender);
       if ($this->SingleTo === true && count($toArr) > 1) {
@@ -656,13 +656,13 @@ 
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
           // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
         }
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
       }
     } else {
       if ($this->SingleTo === true && count($toArr) > 1) {
@@ -670,19 +670,19 @@ 
           $rt = @mail($val, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header, $params);
           // implement call back function if it exists
           $isSent = ($rt == 1) ? 1 : 0;
-          $this->doCallback($isSent,$val,$this->cc,$this->bcc,$this->Subject,$body);
+          $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
         }
       } else {
         $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($this->Subject)), $body, $header);
         // implement call back function if it exists
         $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent,$to,$this->cc,$this->bcc,$this->Subject,$body);
+        $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
       }
     }
     if (isset($old_from)) {
       ini_set('sendmail_from', $old_from);
     }
-    if(!$rt) {
+    if (!$rt) {
       throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
     }
     return true;
@@ -698,64 +698,64 @@ 
    * @return bool
    */
   protected function SmtpSend($header, $body) {
-    require_once $this->PluginDir . 'class.smtp.php';
+    require_once $this->PluginDir.'class.smtp.php';
     $bad_rcpt = array();
 
-    if(!$this->SmtpConnect()) {
+    if (!$this->SmtpConnect()) {
       throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
     }
     $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
-      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
+    if (!$this->smtp->Mail($smtp_from)) {
+      throw new phpmailerException($this->Lang('from_failed').$smtp_from, self::STOP_CRITICAL);
     }
 
     // Attempt to send attach all recipients
-    foreach($this->to as $to) {
+    foreach ($this->to as $to) {
       if (!$this->smtp->Recipient($to[0])) {
         $bad_rcpt[] = $to[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,$to[0],'','',$this->Subject,$body);
+        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
       }
     }
-    foreach($this->cc as $cc) {
+    foreach ($this->cc as $cc) {
       if (!$this->smtp->Recipient($cc[0])) {
         $bad_rcpt[] = $cc[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,'',$cc[0],'',$this->Subject,$body);
+        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
       }
     }
-    foreach($this->bcc as $bcc) {
+    foreach ($this->bcc as $bcc) {
       if (!$this->smtp->Recipient($bcc[0])) {
         $bad_rcpt[] = $bcc[0];
         // implement call back function if it exists
         $isSent = 0;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
       } else {
         // implement call back function if it exists
         $isSent = 1;
-        $this->doCallback($isSent,'','',$bcc[0],$this->Subject,$body);
+        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
       }
     }
 
 
-    if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
+    if (count($bad_rcpt) > 0) { //Create error message for any bad addresses
       $badaddresses = implode(', ', $bad_rcpt);
-      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
+      throw new phpmailerException($this->Lang('recipients_failed').$badaddresses);
     }
-    if(!$this->smtp->Data($header . $body)) {
+    if (!$this->smtp->Data($header.$body)) {
       throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
     }
-    if($this->SMTPKeepAlive == true) {
+    if ($this->SMTPKeepAlive == true) {
       $this->smtp->Reset();
     }
     return true;
@@ -769,7 +769,7 @@ 
    * @return bool
    */
   public function SmtpConnect() {
-    if(is_null($this->smtp)) {
+    if (is_null($this->smtp)) {
       $this->smtp = new SMTP();
     }
 
@@ -780,7 +780,7 @@ 
 
     // Retry while there is no connection
     try {
-      while($index < count($hosts) && !$connection) {
+      while ($index < count($hosts) && !$connection) {
         $hostinfo = array();
         if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
           $host = $hostinfo[1];
@@ -793,7 +793,7 @@ 
         $tls = ($this->SMTPSecure == 'tls');
         $ssl = ($this->SMTPSecure == 'ssl');
 
-        if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
+        if ($this->smtp->Connect(($ssl ? 'ssl://' : '').$host, $port, $this->Timeout)) {
 
           $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
           $this->smtp->Hello($hello);
@@ -831,8 +831,8 @@ 
    * @return void
    */
   public function SmtpClose() {
-    if(!is_null($this->smtp)) {
-      if($this->smtp->Connected()) {
+    if (!is_null($this->smtp)) {
+      if ($this->smtp->Connected()) {
         $this->smtp->Quit();
         $this->smtp->Close();
       }
@@ -894,7 +894,7 @@ 
    * @return string
    */
   public function AddrAppend($type, $addr) {
-    $addr_str = $type . ': ';
+    $addr_str = $type.': ';
     $addresses = array();
     foreach ($addr as $a) {
       $addresses[] = $this->AddrFormat($a);
@@ -914,7 +914,7 @@ 
     if (empty($addr[1])) {
       return $this->SecureHeader($addr[0]);
     } else {
-      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
+      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase')." <".$this->SecureHeader($addr[0]).">";
     }
   }
 
@@ -941,10 +941,10 @@ 
 
     $line = explode($this->LE, $message);
     $message = '';
-    for ($i=0 ;$i < count($line); $i++) {
+    for ($i = 0; $i < count($line); $i++) {
       $line_part = explode(' ', $line[$i]);
       $buf = '';
-      for ($e = 0; $e<count($line_part); $e++) {
+      for ($e = 0; $e < count($line_part); $e++) {
         $word = $line_part[$e];
         if ($qp_mode and (strlen($word) > $length)) {
           $space_left = $length - strlen($buf) - 1;
@@ -960,10 +960,10 @@ 
               }
               $part = substr($word, 0, $len);
               $word = substr($word, $len);
-              $buf .= ' ' . $part;
-              $message .= $buf . sprintf("=%s", $this->LE);
+              $buf .= ' '.$part;
+              $message .= $buf.sprintf("=%s", $this->LE);
             } else {
-              $message .= $buf . $soft_break;
+              $message .= $buf.$soft_break;
             }
             $buf = '';
           }
@@ -980,22 +980,22 @@ 
             $word = substr($word, $len);
 
             if (strlen($word) > 0) {
-              $message .= $part . sprintf("=%s", $this->LE);
+              $message .= $part.sprintf("=%s", $this->LE);
             } else {
               $buf = $part;
             }
           }
         } else {
           $buf_o = $buf;
-          $buf .= ($e == 0) ? $word : (' ' . $word);
+          $buf .= ($e == 0) ? $word : (' '.$word);
 
           if (strlen($buf) > $length and $buf_o != '') {
-            $message .= $buf_o . $soft_break;
+            $message .= $buf_o.$soft_break;
             $buf = $word;
           }
         }
       }
-      $message .= $buf . $this->LE;
+      $message .= $buf.$this->LE;
     }
 
     return $message;
@@ -1024,8 +1024,7 @@ 
         if ($dec < 128) { // Single byte character.
           // If the encoded char was found at pos 0, it will fit
           // otherwise reduce maxLength to start of the encoded char
-          $maxLength = ($encodedCharPos == 0) ? $maxLength :
-          $maxLength - ($lookBack - $encodedCharPos);
+          $maxLength = ($encodedCharPos == 0) ? $maxLength : $maxLength - ($lookBack - $encodedCharPos);
           $foundSplitPos = true;
         } elseif ($dec >= 192) { // First byte of a multi byte character
           // Reduce maxLength to split at start of character
@@ -1049,11 +1048,11 @@ 
    * @return void
    */
   public function SetWordWrap() {
-    if($this->WordWrap < 1) {
+    if ($this->WordWrap < 1) {
       return;
     }
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
       case 'alt_attachments':
         $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
@@ -1074,24 +1073,24 @@ 
 
     // Set the boundaries
     $uniq_id = md5(uniqid(time()));
-    $this->boundary[1] = 'b1_' . $uniq_id;
-    $this->boundary[2] = 'b2_' . $uniq_id;
+    $this->boundary[1] = 'b1_'.$uniq_id;
+    $this->boundary[2] = 'b2_'.$uniq_id;
 
     $result .= $this->HeaderLine('Date', self::RFCDate());
-    if($this->Sender == '') {
+    if ($this->Sender == '') {
       $result .= $this->HeaderLine('Return-Path', trim($this->From));
     } else {
       $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
     }
 
     // To be created automatically by mail()
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       if ($this->SingleTo === true) {
-        foreach($this->to as $t) {
+        foreach ($this->to as $t) {
           $this->SingleToArray[] = $this->AddrFormat($t);
         }
       } else {
-        if(count($this->to) > 0) {
+        if (count($this->to) > 0) {
           $result .= $this->AddrAppend('To', $this->to);
         } elseif (count($this->cc) == 0) {
           $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
@@ -1105,38 +1104,38 @@ 
     $result .= $this->AddrAppend('From', $from);
 
     // sendmail and mail() extract Cc from the header before sending
-    if(count($this->cc) > 0) {
+    if (count($this->cc) > 0) {
       $result .= $this->AddrAppend('Cc', $this->cc);
     }
 
     // sendmail and mail() extract Bcc from the header before sending
-    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
+    if ((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
       $result .= $this->AddrAppend('Bcc', $this->bcc);
     }
 
-    if(count($this->ReplyTo) > 0) {
+    if (count($this->ReplyTo) > 0) {
       $result .= $this->AddrAppend('Reply-to', $this->ReplyTo);
     }
 
     // mail() sets the subject itself
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
     }
 
-    if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-ID',$this->MessageID);
+    if ($this->MessageID != '') {
+      $result .= $this->HeaderLine('Message-ID', $this->MessageID);
     } else {
       $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
     }
     $result .= $this->HeaderLine('X-Priority', $this->Priority);
     $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (phpmailer.sourceforge.net)');
 
-    if($this->ConfirmReadingTo != '') {
-      $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+    if ($this->ConfirmReadingTo != '') {
+      $result .= $this->HeaderLine('Disposition-Notification-To', '<'.trim($this->ConfirmReadingTo).'>');
     }
 
     // Add custom headers
-    for($index = 0; $index < count($this->CustomHeader); $index++) {
+    for ($index = 0; $index < count($this->CustomHeader); $index++) {
       $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
     }
     if (!$this->sign_key_file) {
@@ -1154,27 +1153,27 @@ 
    */
   public function GetMailMIME() {
     $result = '';
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'plain':
         $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
         $result .= sprintf("Content-Type: %s; charset=\"%s\"", $this->ContentType, $this->CharSet);
         break;
       case 'attachments':
       case 'alt_attachments':
-        if($this->InlineImageExists()){
+        if ($this->InlineImageExists()) {
           $result .= sprintf("Content-Type: %s;%s\ttype=\"text/html\";%s\tboundary=\"%s\"%s", 'multipart/related', $this->LE, $this->LE, $this->boundary[1], $this->LE);
         } else {
           $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
-          $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+          $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"');
         }
         break;
       case 'alt':
         $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
-        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
+        $result .= $this->TextLine("\tboundary=\"".$this->boundary[1].'"');
         break;
     }
 
-    if($this->Mailer != 'mail') {
+    if ($this->Mailer != 'mail') {
       $result .= $this->LE.$this->LE;
     }
 
@@ -1195,7 +1194,7 @@ 
 
     $this->SetWordWrap();
 
-    switch($this->message_type) {
+    switch ($this->message_type) {
       case 'alt':
         $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
@@ -1216,11 +1215,11 @@ 
         break;
       case 'alt_attachments':
         $body .= sprintf("--%s%s", $this->boundary[1], $this->LE);
-        $body .= sprintf("Content-Type: %s;%s" . "\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '') . $this->LE; // Create text body
+        $body .= sprintf("Content-Type: %s;%s"."\tboundary=\"%s\"%s", 'multipart/alternative', $this->LE, $this->boundary[2], $this->LE.$this->LE);
+        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '').$this->LE; // Create text body
         $body .= $this->EncodeString($this->AltBody, $this->Encoding);
         $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '') . $this->LE; // Create the HTML body
+        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '').$this->LE; // Create the HTML body
         $body .= $this->EncodeString($this->Body, $this->Encoding);
         $body .= $this->LE.$this->LE;
         $body .= $this->EndBoundary($this->boundary[2]);
@@ -1261,16 +1260,16 @@ 
    */
   private function GetBoundary($boundary, $charSet, $contentType, $encoding) {
     $result = '';
-    if($charSet == '') {
+    if ($charSet == '') {
       $charSet = $this->CharSet;
     }
-    if($contentType == '') {
+    if ($contentType == '') {
       $contentType = $this->ContentType;
     }
-    if($encoding == '') {
+    if ($encoding == '') {
       $encoding = $this->Encoding;
     }
-    $result .= $this->TextLine('--' . $boundary);
+    $result .= $this->TextLine('--'.$boundary);
     $result .= sprintf("Content-Type: %s; charset = \"%s\"", $contentType, $charSet);
     $result .= $this->LE;
     $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
@@ -1284,7 +1283,7 @@ 
    * @access private
    */
   private function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
+    return $this->LE.'--'.$boundary.'--'.$this->LE;
   }
 
   /**
@@ -1293,16 +1292,16 @@ 
    * @return void
    */
   private function SetMessageType() {
-    if(count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
+    if (count($this->attachment) < 1 && strlen($this->AltBody) < 1) {
       $this->message_type = 'plain';
     } else {
-      if(count($this->attachment) > 0) {
+      if (count($this->attachment) > 0) {
         $this->message_type = 'attachments';
       }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
+      if (strlen($this->AltBody) > 0 && count($this->attachment) < 1) {
         $this->message_type = 'alt';
       }
-      if(strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
+      if (strlen($this->AltBody) > 0 && count($this->attachment) > 0) {
         $this->message_type = 'alt_attachments';
       }
     }
@@ -1314,7 +1313,7 @@ 
    * @return string
    */
   public function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
+    return $name.': '.$value.$this->LE;
   }
 
   /**
@@ -1323,7 +1322,7 @@ 
    * @return string
    */
   public function TextLine($value) {
-    return $value . $this->LE;
+    return $value.$this->LE;
   }
 
   /////////////////////////////////////////////////
@@ -1342,11 +1341,11 @@ 
    */
   public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
     try {
-      if ( !@is_file($path) ) {
-        throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
+      if (!@is_file($path)) {
+        throw new phpmailerException($this->Lang('file_access').$path, self::STOP_CONTINUE);
       }
       $filename = basename($path);
-      if ( $name == '' ) {
+      if ($name == '') {
         $name = $filename;
       }
 
@@ -1356,7 +1355,7 @@ 
         2 => $name,
         3 => $encoding,
         4 => $type,
-        5 => false,  // isStringAttachment
+        5 => false, // isStringAttachment
         6 => 'attachment',
         7 => 0
       );
@@ -1367,7 +1366,7 @@ 
         throw $e;
       }
       error_log($e->getMessage()."\n");
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
+      if ($e->getCode() == self::STOP_CRITICAL) {
         return false;
       }
     }
@@ -1412,29 +1411,29 @@ 
       $disposition = $attachment[6];
       $cid         = $attachment[7];
       $incl[]      = $attachment[0];
-      if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
+      if ($disposition == 'inline' && isset($cidUniq[$cid])) { continue; }
       $cidUniq[$cid] = true;
 
       $mime[] = sprintf("--%s%s", $this->boundary[1], $this->LE);
       $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
       $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
 
-      if($disposition == 'inline') {
+      if ($disposition == 'inline') {
         $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
       }
 
       $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
 
       // Encode as string attachment
-      if($bString) {
+      if ($bString) {
         $mime[] = $this->EncodeString($string, $encoding);
-        if($this->IsError()) {
+        if ($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
       } else {
         $mime[] = $this->EncodeFile($path, $encoding);
-        if($this->IsError()) {
+        if ($this->IsError()) {
           return '';
         }
         $mime[] = $this->LE.$this->LE;
@@ -1458,7 +1457,7 @@ 
   private function EncodeFile($path, $encoding = 'base64') {
     try {
       if (!is_readable($path)) {
-        throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
+        throw new phpmailerException($this->Lang('file_open').$path, self::STOP_CONTINUE);
       }
         $magic_quotes = get_magic_quotes_runtime();
         if ($magic_quotes) {
@@ -1492,9 +1491,9 @@ 
    * @access public
    * @return string
    */
-  public function EncodeString ($str, $encoding = 'base64') {
+  public function EncodeString($str, $encoding = 'base64') {
     $encoded = '';
-    switch(strtolower($encoding)) {
+    switch (strtolower($encoding)) {
       case 'base64':
         $encoded = chunk_split(base64_encode($str), 76, $this->LE);
         break;
@@ -1512,7 +1511,7 @@ 
         $encoded = $this->EncodeQP($str);
         break;
       default:
-        $this->SetError($this->Lang('encoding') . $encoding);
+        $this->SetError($this->Lang('encoding').$encoding);
         break;
     }
     return $encoded;
@@ -1554,7 +1553,7 @@ 
 
     $maxlen = 75 - 7 - strlen($this->CharSet);
     // Try to select the encoding which should produce the shortest output
-    if (strlen($str)/3 < $x) {
+    if (strlen($str) / 3 < $x) {
       $encoding = 'B';
       // Modified by Ivan Tcholakov, 24-JAN-2010.
       //if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
@@ -1635,7 +1634,7 @@ 
       }
       while (strlen($chunk) > $length);
 
-      $encoded .= $chunk . $this->LE;
+      $encoded .= $chunk.$this->LE;
     }
 
     // Chomp the last linefeed
@@ -1651,37 +1650,37 @@ 
   * @param integer $line_max Number of chars allowed on a line before wrapping
   * @return string
   */
-  public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
-    $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+  public function EncodeQPphp($input = '', $line_max = 76, $space_conv = false) {
+    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
     $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
     $eol = "\r\n";
     $escape = '=';
     $output = '';
-    while( list(, $line) = each($lines) ) {
+    while (list(, $line) = each($lines)) {
       $linlen = strlen($line);
       $newline = '';
-      for($i = 0; $i < $linlen; $i++) {
-        $c = substr( $line, $i, 1 );
-        $dec = ord( $c );
-        if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
+      for ($i = 0; $i < $linlen; $i++) {
+        $c = substr($line, $i, 1);
+        $dec = ord($c);
+        if (($i == 0) && ($dec == 46)) { // convert first point in the line into =2E
           $c = '=2E';
         }
-        if ( $dec == 32 ) {
-          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
+        if ($dec == 32) {
+          if ($i == ($linlen - 1)) { // convert space at eol only
             $c = '=20';
-          } else if ( $space_conv ) {
+          } else if ($space_conv) {
             $c = '=20';
           }
-        } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-          $h2 = floor($dec/16);
-          $h1 = floor($dec%16);
+        } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+          $h2 = floor($dec / 16);
+          $h1 = floor($dec % 16);
           $c = $escape.$hex[$h2].$hex[$h1];
         }
-        if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+        if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
           $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
           $newline = '';
           // check if newline first character will be point or not
-          if ( $dec == 46 ) {
+          if ($dec == 46) {
             $c = '=2E';
           }
         }
@@ -1733,7 +1732,7 @@ 
    * @access public
    * @return string
    */
-  public function EncodeQ ($str, $position = 'text') {
+  public function EncodeQ($str, $position = 'text') {
     // There should not be any EOL in the string
     $encoded = preg_replace('/[\r\n]*/', '', $str);
 
@@ -1776,7 +1775,7 @@ 
       2 => basename($filename),
       3 => $encoding,
       4 => $type,
-      5 => true,  // isStringAttachment
+      5 => true, // isStringAttachment
       6 => 'attachment',
       7 => 0
     );
@@ -1797,13 +1796,13 @@ 
    */
   public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
 
-    if ( !@is_file($path) ) {
-      $this->SetError($this->Lang('file_access') . $path);
+    if (!@is_file($path)) {
+      $this->SetError($this->Lang('file_access').$path);
       return false;
     }
 
     $filename = basename($path);
-    if ( $name == '' ) {
+    if ($name == '') {
       $name = $filename;
     }
 
@@ -1814,7 +1813,7 @@ 
       2 => $name,
       3 => $encoding,
       4 => $type,
-      5 => false,  // isStringAttachment
+      5 => false, // isStringAttachment
       6 => 'inline',
       7 => $cid
     );
@@ -1828,7 +1827,7 @@ 
    * @return bool
    */
   public function InlineImageExists() {
-    foreach($this->attachment as $attachment) {
+    foreach ($this->attachment as $attachment) {
       if ($attachment[6] == 'inline') {
         return true;
       }
@@ -1845,7 +1844,7 @@ 
    * @return void
    */
   public function ClearAddresses() {
-    foreach($this->to as $to) {
+    foreach ($this->to as $to) {
       unset($this->all_recipients[strtolower($to[0])]);
     }
     $this->to = array();
@@ -1856,7 +1855,7 @@ 
    * @return void
    */
   public function ClearCCs() {
-    foreach($this->cc as $cc) {
+    foreach ($this->cc as $cc) {
       unset($this->all_recipients[strtolower($cc[0])]);
     }
     $this->cc = array();
@@ -1867,7 +1866,7 @@ 
    * @return void
    */
   public function ClearBCCs() {
-    foreach($this->bcc as $bcc) {
+    foreach ($this->bcc as $bcc) {
       unset($this->all_recipients[strtolower($bcc[0])]);
     }
     $this->bcc = array();
@@ -1924,7 +1923,7 @@ 
     if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
       $lasterror = $this->smtp->getError();
       if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
-        $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
+        $msg .= '<p>'.$this->Lang('smtp_error').$lasterror['smtp_msg']."</p>\n";
       }
     }
     $this->ErrorInfo = $msg;
@@ -1940,7 +1939,7 @@ 
     $tz = date('Z');
     $tzs = ($tz < 0) ? '-' : '+';
     $tz = abs($tz);
-    $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
+    $tz = (int) ($tz / 3600) * 100 + ($tz % 3600) / 60;
     $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
 
     return $result;
@@ -1969,14 +1968,14 @@ 
    * @return string
    */
   private function Lang($key) {
-    if(count($this->language) < 1) {
+    if (count($this->language) < 1) {
       $this->SetLanguage('en'); // set the default language
     }
 
-    if(isset($this->language[$key])) {
+    if (isset($this->language[$key])) {
       return $this->language[$key];
     } else {
-      return 'Language string failed to load: ' . $key;
+      return 'Language string failed to load: '.$key;
     }
   }
 
@@ -2017,19 +2016,19 @@ 
    */
   public function MsgHTML($message, $basedir = '') {
     preg_match_all("/(src|background)=\"(.*)\"/Ui", $message, $images);
-    if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
+    if (isset($images[2])) {
+      foreach ($images[2] as $i => $url) {
         // do not change urls for absolute images (thanks to corvuscorax)
-        if (!preg_match('#^[A-z]+://#',$url)) {
+        if (!preg_match('#^[A-z]+://#', $url)) {
           $filename = basename($url);
           $directory = dirname($url);
-          ($directory == '.')?$directory='':'';
-          $cid = 'cid:' . md5($filename);
+          ($directory == '.') ? $directory = '' : '';
+          $cid = 'cid:'.md5($filename);
           $ext = pathinfo($filename, PATHINFO_EXTENSION);
-          $mimeType  = self::_mime_types($ext);
-          if ( strlen($basedir) > 1 && substr($basedir,-1) != '/') { $basedir .= '/'; }
-          if ( strlen($directory) > 1 && substr($directory,-1) != '/') { $directory .= '/'; }
-          if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64',$mimeType) ) {
+          $mimeType = self::_mime_types($ext);
+          if (strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; }
+          if (strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; }
+          if ($this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64', $mimeType)) {
             $message = preg_replace("/".$images[1][$i]."=\"".preg_quote($url, '/')."\"/Ui", $images[1][$i]."=\"".$cid."\"", $message);
           }
         }
@@ -2037,12 +2036,12 @@ 
     }
     $this->IsHTML(true);
     $this->Body = $message;
-    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s','',$message)));
+    $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $message)));
     if (!empty($textMsg) && empty($this->AltBody)) {
       $this->AltBody = html_entity_decode($textMsg);
     }
     if (empty($this->AltBody)) {
-      $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
+      $this->AltBody = 'To view this email message, open it in a program that understands HTML!'."\n\n";
     }
   }
 
@@ -2160,10 +2159,10 @@ 
   */
   public function set($name, $value = '') {
     try {
-      if (isset($this->$name) ) {
+      if (isset($this->$name)) {
         $this->$name = $value;
       } else {
-        throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
+        throw new phpmailerException($this->Lang('variable_set').$name, self::STOP_CRITICAL);
       }
     } catch (Exception $e) {
       $this->SetError($e->getMessage());
@@ -2207,14 +2206,14 @@ 
    * @param string $key_pass Password for private key
    */
   public function DKIM_QP($txt) {
-    $tmp="";
-    $line="";
-    for ($i=0;$i<strlen($txt);$i++) {
-      $ord=ord($txt[$i]);
-      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
-        $line.=$txt[$i];
+    $tmp = "";
+    $line = "";
+    for ($i = 0; $i < strlen($txt); $i++) {
+      $ord = ord($txt[$i]);
+      if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
+        $line .= $txt[$i];
       } else {
-        $line.="=".sprintf("%02X",$ord);
+        $line .= "=".sprintf("%02X", $ord);
       }
     }
     return $line;
@@ -2228,8 +2227,8 @@ 
    */
   public function DKIM_Sign($s) {
     $privKeyStr = file_get_contents($this->DKIM_private);
-    if ($this->DKIM_passphrase!='') {
-      $privKey = openssl_pkey_get_private($privKeyStr,$this->DKIM_passphrase);
+    if ($this->DKIM_passphrase != '') {
+      $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
     } else {
       $privKey = $privKeyStr;
     }
@@ -2245,15 +2244,15 @@ 
    * @param string $s Header
    */
   public function DKIM_HeaderC($s) {
-    $s=preg_replace("/\r\n\s+/"," ",$s);
-    $lines=explode("\r\n",$s);
+    $s = preg_replace("/\r\n\s+/", " ", $s);
+    $lines = explode("\r\n", $s);
     foreach ($lines as $key=>$line) {
-      list($heading,$value)=explode(":",$line,2);
-      $heading=strtolower($heading);
-      $value=preg_replace("/\s+/"," ",$value) ; // Compress useless spaces
-      $lines[$key]=$heading.":".trim($value) ; // Don't forget to remove WSP around the value
+      list($heading, $value) = explode(":", $line, 2);
+      $heading = strtolower($heading);
+      $value = preg_replace("/\s+/", " ", $value); // Compress useless spaces
+      $lines[$key] = $heading.":".trim($value); // Don't forget to remove WSP around the value
     }
-    $s=implode("\r\n",$lines);
+    $s = implode("\r\n", $lines);
     return $s;
   }
 
@@ -2266,11 +2265,11 @@ 
   public function DKIM_BodyC($body) {
     if ($body == '') return "\r\n";
     // stabilize line endings
-    $body=str_replace("\r\n","\n",$body);
-    $body=str_replace("\n","\r\n",$body);
+    $body = str_replace("\r\n", "\n", $body);
+    $body = str_replace("\n", "\r\n", $body);
     // END stabilize line endings
-    while (substr($body,strlen($body)-4,4) == "\r\n\r\n") {
-      $body=substr($body,0,strlen($body)-2);
+    while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
+      $body = substr($body, 0, strlen($body) - 2);
     }
     return $body;
   }
@@ -2283,52 +2282,52 @@ 
    * @param string $subject Subject
    * @param string $body Body
    */
-  public function DKIM_Add($headers_line,$subject,$body) {
+  public function DKIM_Add($headers_line, $subject, $body) {
     $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
     $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
     $DKIMquery            = 'dns/txt'; // Query method
-    $DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+    $DKIMtime             = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
     $subject_header       = "Subject: $subject";
-    $headers              = explode("\r\n",$headers_line);
-    foreach($headers as $header) {
-      if (strpos($header,'From:') === 0) {
-        $from_header=$header;
-      } elseif (strpos($header,'To:') === 0) {
-        $to_header=$header;
+    $headers              = explode("\r\n", $headers_line);
+    foreach ($headers as $header) {
+      if (strpos($header, 'From:') === 0) {
+        $from_header = $header;
+      } elseif (strpos($header, 'To:') === 0) {
+        $to_header = $header;
       }
     }
-    $from     = str_replace('|','=7C',$this->DKIM_QP($from_header));
-    $to       = str_replace('|','=7C',$this->DKIM_QP($to_header));
-    $subject  = str_replace('|','=7C',$this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
+    $from     = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+    $to       = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+    $subject  = str_replace('|', '=7C', $this->DKIM_QP($subject_header)); // Copied header fields (dkim-quoted-printable
     $body     = $this->DKIM_BodyC($body);
-    $DKIMlen  = strlen($body) ; // Length of body
-    $DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
-    $ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
-    $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
-                "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
+    $DKIMlen  = strlen($body); // Length of body
+    $DKIMb64  = base64_encode(pack("H*", sha1($body))); // Base64 of packed binary SHA-1 hash of body
+    $ident    = ($this->DKIM_identity == '') ? '' : " i=".$this->DKIM_identity.";";
+    $dkimhdrs = "DKIM-Signature: v=1; a=".$DKIMsignatureType."; q=".$DKIMquery."; l=".$DKIMlen."; s=".$this->DKIM_selector.";\r\n".
+                "\tt=".$DKIMtime."; c=".$DKIMcanonicalization.";\r\n".
                 "\th=From:To:Subject;\r\n".
-                "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
+                "\td=".$this->DKIM_domain.";".$ident."\r\n".
                 "\tz=$from\r\n".
                 "\t|$to\r\n".
                 "\t|$subject;\r\n".
-                "\tbh=" . $DKIMb64 . ";\r\n".
+                "\tbh=".$DKIMb64.";\r\n".
                 "\tb=";
-    $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
+    $toSign   = $this->DKIM_HeaderC($from_header."\r\n".$to_header."\r\n".$subject_header."\r\n".$dkimhdrs);
     $signed   = $this->DKIM_Sign($toSign);
     return "X-PHPMAILER-DKIM: phpmailer.worxware.com\r\n".$dkimhdrs.$signed."\r\n";
   }
 
-  protected function doCallback($isSent,$to,$cc,$bcc,$subject,$body) {
+  protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body) {
     if (!empty($this->action_function) && function_exists($this->action_function)) {
-      $params = array($isSent,$to,$cc,$bcc,$subject,$body);
-      call_user_func_array($this->action_function,$params);
+      $params = array($isSent, $to, $cc, $bcc, $subject, $body);
+      call_user_func_array($this->action_function, $params);
     }
   }
 }
 
 class phpmailerException extends Exception {
   public function errorMessage() {
-    $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+    $errorMsg = '<strong>'.$this->getMessage()."</strong><br />\n";
     return $errorMsg;
   }
 }

main/inc/lib/chat.lib.php

Spacing +4 added lines, -4 removed lines

@@ -186,7 +186,7 @@ 
         $to_user_id,
         $message,
         $printResult = true,
-        $sanitize =  true
+        $sanitize = true
     )
     {
         $user_friend_relation = SocialManager::get_relation_between_contacts(
@@ -206,7 +206,7 @@ 
                 $messagesan = $message;
             }
 
-            error_log(print_r($sanitize) . '----' . $messagesan);
+            error_log(print_r($sanitize).'----'.$messagesan);
 
             if (!isset($_SESSION['chatHistory'][$to_user_id])) {
                 $_SESSION['chatHistory'][$to_user_id] = array();
@@ -289,9 +289,9 @@ 
      */
     public static function disableChat()
     {
-        if (!empty($_SESSION['disable_chat'])){
+        if (!empty($_SESSION['disable_chat'])) {
             $status = $_SESSION['disable_chat'];
-            if ($status == true){
+            if ($status == true) {
                 $_SESSION['disable_chat'] = null;
                 return true;
             }

main/inc/lib/array.lib.php

Spacing +3 added lines, -3 removed lines

@@ -110,10 +110,10 @@ 
 {
 	$old_locale = setlocale(LC_ALL, null);
 	$code = api_get_language_isocode();
-	$locale_list = array($code.'.utf8', 'en.utf8','en_US.utf8','en_GB.utf8');
+	$locale_list = array($code.'.utf8', 'en.utf8', 'en_US.utf8', 'en_GB.utf8');
 	$try_sort = false;
 
-	foreach($locale_list as $locale) {
+	foreach ($locale_list as $locale) {
 		$my_local = setlocale(LC_COLLATE, $locale);
 		if ($my_local) {
 			$try_sort = true;
@@ -151,7 +151,7 @@ 
     $flatten = array();
     array_walk_recursive(
         $array,
-        function ($value) use (&$flatten) {
+        function($value) use (&$flatten) {
             $flatten[] = $value;
         }
     );

main/inc/lib/surveymanager.lib.php

Spacing +12 added lines, -12 removed lines

@@ -19,7 +19,7 @@ 
     {
         // Database table definitions
         $table_survey = Database :: get_course_table(TABLE_SURVEY);
-        $table_survey_question 	= Database :: get_course_table(TABLE_SURVEY_QUESTION);
+        $table_survey_question = Database :: get_course_table(TABLE_SURVEY_QUESTION);
         $table_user = Database :: get_main_table(TABLE_MAIN_USER);
 
         // searching
@@ -45,23 +45,23 @@ 
 				GROUP BY survey.survey_id";
 
         $res = Database::query($sql);
-        $surveys_parents = array ();
+        $surveys_parents = array();
         $refs = array();
         $list = array();
-        $plain_array=array();
+        $plain_array = array();
 
-        while ($survey = Database::fetch_array($res,'ASSOC')) {
-            $plain_array[$survey['survey_id']]=$survey;
-            $surveys_parents[]=$survey['survey_version'];
-            $thisref = &$refs[ $survey['survey_id'] ];
+        while ($survey = Database::fetch_array($res, 'ASSOC')) {
+            $plain_array[$survey['survey_id']] = $survey;
+            $surveys_parents[] = $survey['survey_version'];
+            $thisref = &$refs[$survey['survey_id']];
             $thisref['parent_id'] = $survey['parent_id'];
             $thisref['name'] = $survey['name'];
             $thisref['id'] = $survey['survey_id'];
             $thisref['survey_version'] = $survey['survey_version'];
             if ($survey['parent_id'] == 0) {
-                $list[ $survey['survey_id'] ] = &$thisref;
+                $list[$survey['survey_id']] = &$thisref;
             } else {
-                $refs[ $survey['parent_id'] ]['children'][ $survey['survey_id'] ] = &$thisref;
+                $refs[$survey['parent_id']]['children'][$survey['survey_id']] = &$thisref;
             }
         }
         $this->surveylist = $list;
@@ -80,7 +80,7 @@ 
     public function getParentId($id)
     {
         $node = $this->plainsurveylist[$id];
-        if (is_array($node)&& !empty($node['parent_id'])) {
+        if (is_array($node) && !empty($node['parent_id'])) {
             return $node['parent_id'];
         } else {
             return -1;
@@ -100,12 +100,12 @@ 
         if (is_array($list)) {
             foreach ($list as $key => $node) {
                 if (isset($node['children']) && is_array($node['children'])) {
-                    $result[$key]= $node['name'];
+                    $result[$key] = $node['name'];
                     $re = self::createList($node['children']);
                     if (!empty($re)) {
                         if (is_array($re)) {
                             foreach ($re as $key => $r) {
-                                $result[$key] = '' . $r;
+                                $result[$key] = ''.$r;
                             }
                         } else {
                             $result[] = $re;

main/inc/lib/notebook.lib.php

Spacing +25 added lines, -25 removed lines

@@ -29,7 +29,7 @@ 
         return "<script>
 				function confirmation (name)
 				{
-					if (confirm(\" " . get_lang("NoteConfirmDelete") . " \"+ name + \" ?\"))
+					if (confirm(\" " . get_lang("NoteConfirmDelete")." \"+ name + \" ?\"))
 						{return true;}
 					else
 						{return false;}
@@ -107,7 +107,7 @@ 
                 description 		AS note_comment,
                 session_id			AS session_id
                FROM $t_notebook
-               WHERE c_id = $course_id AND notebook_id = '" . intval($notebook_id) . "' ";
+               WHERE c_id = $course_id AND notebook_id = '".intval($notebook_id)."' ";
         $result = Database::query($sql);
         if (Database::num_rows($result) != 1) {
             return array();
@@ -181,8 +181,8 @@ 
         $sql = "DELETE FROM $t_notebook
                 WHERE
                     c_id = $course_id AND
-                    notebook_id='" . intval($notebook_id) . "' AND
-                    user_id = '" . api_get_user_id() . "'";
+                    notebook_id='".intval($notebook_id)."' AND
+                    user_id = '" . api_get_user_id()."'";
         $result = Database::query($sql);
         $affected_rows = Database::affected_rows($result);
         if ($affected_rows != 1) {
@@ -220,22 +220,22 @@ 
         echo '<div class="actions">';
         if (!api_is_anonymous()) {
             if (api_get_session_id() == 0)
-                echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' .
-                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+                echo '<a href="index.php?'.api_get_cidreq().'&action=addnote">'.
+                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
             elseif (api_is_allowed_to_session_edit(false, true)) {
-                echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' .
-                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+                echo '<a href="index.php?'.api_get_cidreq().'&action=addnote">'.
+                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
             }
         } else {
-            echo '<a href="javascript:void(0)">' . Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+            echo '<a href="javascript:void(0)">'.Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
         }
 
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=creation_date&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32') . '</a>';
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=update_date&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32') . '</a>';
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=title&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32') . '</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=creation_date&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32').'</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=update_date&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32').'</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=title&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32').'</a>';
         echo '</div>';
 
         if (!isset($_SESSION['notebook_view']) || !in_array($_SESSION['notebook_view'], array('creation_date', 'update_date', 'title'))) {
@@ -246,9 +246,9 @@ 
         $t_notebook = Database :: get_course_table(TABLE_NOTEBOOK);
         $order_by = "";
         if ($_SESSION['notebook_view'] == 'creation_date' || $_SESSION['notebook_view'] == 'update_date') {
-            $order_by = " ORDER BY " . $_SESSION['notebook_view'] . " $sort_direction ";
+            $order_by = " ORDER BY ".$_SESSION['notebook_view']." $sort_direction ";
         } else {
-            $order_by = " ORDER BY " . $_SESSION['notebook_view'] . " $sort_direction ";
+            $order_by = " ORDER BY ".$_SESSION['notebook_view']." $sort_direction ";
         }
 
         //condition for the session
@@ -261,7 +261,7 @@ 
         $sql = "SELECT * FROM $t_notebook
                 WHERE
                     c_id = $course_id AND
-                    user_id = '" . api_get_user_id() . "'
+                    user_id = '".api_get_user_id()."'
                     $condition_session
                     $cond_extra $order_by
                 ";
@@ -274,18 +274,18 @@ 
 
             $updateValue = '';
             if ($row['update_date'] <> $row['creation_date']) {
-                $updateValue = ', ' . get_lang('UpdateDate') . ': ' . date_to_str_ago($update_date) . '&nbsp;&nbsp;<span class="dropbox_date">' . $update_date . '</span>';
+                $updateValue = ', '.get_lang('UpdateDate').': '.date_to_str_ago($update_date).'&nbsp;&nbsp;<span class="dropbox_date">'.$update_date.'</span>';
             }
 
-            $actions = '<a href="' . api_get_self() . '?action=editnote&notebook_id=' . $row['notebook_id'] . '">' .
-                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . '</a>';
-            $actions .= '<a href="' . api_get_self() . '?action=deletenote&notebook_id=' . $row['notebook_id'] . '" onclick="return confirmation(\'' . $row['title'] . '\');">' .
-                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) . '</a>';
+            $actions = '<a href="'.api_get_self().'?action=editnote&notebook_id='.$row['notebook_id'].'">'.
+                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+            $actions .= '<a href="'.api_get_self().'?action=deletenote&notebook_id='.$row['notebook_id'].'" onclick="return confirmation(\''.$row['title'].'\');">'.
+                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
 
             echo Display::panel(
                 $row['description'],
-                $row['title'] . $session_img.' <div class="pull-right">'.$actions.'</div>',
-                get_lang('CreationDate') . ': ' . date_to_str_ago($creation_date) . '&nbsp;&nbsp;<span class="dropbox_date">' . $creation_date . $updateValue."</span>"
+                $row['title'].$session_img.' <div class="pull-right">'.$actions.'</div>',
+                get_lang('CreationDate').': '.date_to_str_ago($creation_date).'&nbsp;&nbsp;<span class="dropbox_date">'.$creation_date.$updateValue."</span>"
             );
         }
     }

main/inc/lib/legal.lib.php

Spacing +20 added lines, -20 removed lines

@@ -44,7 +44,7 @@ 
             Database::insert($legal_table, $params);
 
             return true;
-        } elseif($last['type'] != $type && $language==$last['language_id']) {
+        } elseif ($last['type'] != $type && $language == $last['language_id']) {
             //update
             $id = $last['legal_id'];
             $params = [
@@ -77,7 +77,7 @@ 
 	public static function get_last_condition_version($language)
     {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
+		$language = Database::escape_string($language);
 		$sql = "SELECT version FROM $legal_conditions_table
 		        WHERE language_id = '".$language."'
 		        ORDER BY legal_id DESC LIMIT 1 ";
@@ -97,10 +97,10 @@ 
 	 * @param int $language language id
 	 * @return array all the info of a Term and condition
 	 */
-	public static function get_last_condition ($language)
+	public static function get_last_condition($language)
     {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
+		$language = Database::escape_string($language);
 		$sql = "SELECT * FROM $legal_conditions_table
                 WHERE language_id = '".$language."'
                 ORDER BY version DESC
@@ -124,9 +124,9 @@ 
                 ORDER BY version DESC
                 LIMIT 1 ";
         $result = Database::query($sql);
-        if (Database::num_rows($result)>0){
+        if (Database::num_rows($result) > 0) {
             $version = Database::fetch_array($result);
-            $version = explode(':',$version[0]);
+            $version = explode(':', $version[0]);
 
             return $version[0];
         } else {
@@ -153,7 +153,7 @@ 
                 break;
                 // Page link
             case 1:
-                $preview ='<fieldset>
+                $preview = '<fieldset>
                              <legend>'.get_lang('TermsAndConditions').'</legend>';
                 $preview .= '<div id="legal-accept-wrapper" class="form-item">
                 <label class="option" for="legal-accept">
@@ -185,25 +185,25 @@ 
 		$number_of_items = intval($number_of_items);
 		$column = intval($column);
 
- 		$sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
+ 		$sql = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
 				FROM $legal_conditions_table inner join $lang_table l on(language_id = l.id) ";
 		$sql .= "ORDER BY language, version ASC ";
 		$sql .= "LIMIT $from, $number_of_items ";
 
 		$result = Database::query($sql);
-		$legals = array ();
-		$versions = array ();
+		$legals = array();
+		$versions = array();
 		while ($legal = Database::fetch_array($result)) {
 			// max 2000 chars
 			//echo strlen($legal[1]); echo '<br>';
-			$versions[]=$legal[0];
-			$languages[]=$legal[1];
-			if (strlen($legal[2])>2000)
-				$legal[2]= substr($legal[2],0,2000).' ... ';
-			if ($legal[4]==0)
-				$legal[4]= get_lang('HTMLText');
-			elseif($legal[4]==1)
-				$legal[4]=get_lang('PageLink');
+			$versions[] = $legal[0];
+			$languages[] = $legal[1];
+			if (strlen($legal[2]) > 2000)
+				$legal[2] = substr($legal[2], 0, 2000).' ... ';
+			if ($legal[4] == 0)
+				$legal[4] = get_lang('HTMLText');
+			elseif ($legal[4] == 1)
+				$legal[4] = get_lang('PageLink');
 			$legals[] = $legal;
 		}
 		return $legals;
@@ -220,7 +220,7 @@ 
 		        FROM $legal_conditions_table
 		        ORDER BY legal_id DESC ";
 		$result = Database::query($sql);
-		$url = Database::fetch_array($result,'ASSOC');
+		$url = Database::fetch_array($result, 'ASSOC');
 		$result = $url['count_result'];
 
 		return $result;
@@ -241,6 +241,6 @@ 
 		        WHERE legal_id="'.$legal_id.'" AND language_id="'.$language_id.'"';
 		$rs = Database::query($sql);
 
-		return Database::result($rs,0,'type');
+		return Database::result($rs, 0, 'type');
 	}
 }

main/inc/lib/blog.lib.php

Spacing +399 added lines, -399 removed lines

@@ -21,7 +21,7 @@ 
 	 *
 	 * @return String Blog Title
 	 */
-	public static function get_blog_title ($blog_id)
+	public static function get_blog_title($blog_id)
 	{
 	    $course_id = api_get_course_int_id();
 
@@ -30,8 +30,8 @@ 
 			$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
 
 			$sql = "SELECT blog_name
-					FROM " . $tbl_blogs . "
-					WHERE c_id = $course_id AND blog_id = " . intval($blog_id);
+					FROM " . $tbl_blogs."
+					WHERE c_id = $course_id AND blog_id = ".intval($blog_id);
 
 			$result = Database::query($sql);
 			$blog = Database::fetch_array($result);
@@ -78,15 +78,15 @@ 
 
 		// Get blog members
 		$sql = "SELECT user.user_id, user.firstname, user.lastname
-				FROM " . $tbl_blogs_rel_user . " blogs_rel_user
-				INNER JOIN " . $tbl_users . " user
+				FROM " . $tbl_blogs_rel_user." blogs_rel_user
+				INNER JOIN " . $tbl_users." user
 				ON blogs_rel_user.user_id = user.user_id
 				WHERE
 				    blogs_rel_user.c_id = $course_id AND
-					blogs_rel_user.blog_id = '" . (int)$blog_id."'";
+					blogs_rel_user.blog_id = '".(int) $blog_id."'";
 		$result = Database::query($sql);
-		$blog_members = array ();
-		while($user = Database::fetch_array($result)) {
+		$blog_members = array();
+		while ($user = Database::fetch_array($result)) {
 			$blog_members[$user['user_id']] = api_get_person_name($user['firstname'], $user['lastname']);
 		}
 
@@ -105,7 +105,7 @@ 
 		$_user = api_get_user_info();
         $course_id = api_get_course_int_id();
 
-		$current_date=date('Y-m-d H:i:s',time());
+		$current_date = date('Y-m-d H:i:s', time());
 		$session_id = api_get_session_id();
 		// Tabel definitions
         $tbl_blogs = Database::get_course_table(TABLE_BLOGS);
@@ -130,7 +130,7 @@ 
                 'blog_name' => $title,
                 'blog_subtitle' =>  $subtitle,
                 'date_creation' => $current_date,
-                'visibility' => 1 ,
+                'visibility' => 1,
                 'session_id' => $session_id,
             ];
 			$this_blog_id = Database::insert($tbl_blogs, $params);
@@ -169,7 +169,7 @@ 
 
 			// Put it on course homepage
 			$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, session_id)
-					VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int)$this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id')";
+					VALUES ($course_id, '".Database::escape_string($title)."','blog/blog.php?blog_id=".(int) $this_blog_id."','blog.gif','1','0','pastillegris.gif',0,'$session_id')";
 			Database::query($sql);
 
             $toolId = Database::insert_id();
@@ -204,7 +204,7 @@ 
 		        blog_subtitle = '".Database::escape_string($subtitle)."'
 		        WHERE
 		            c_id = $course_id AND
-		            blog_id ='".Database::escape_string((int)$blog_id)."'
+		            blog_id ='".Database::escape_string((int) $blog_id)."'
                 LIMIT 1";
 		Database::query($sql);
 
@@ -220,7 +220,7 @@ 
 		// Update course homepage link
 		$sql = "UPDATE $tbl_tool SET
 		        name = '".Database::escape_string($title)."'
-		        WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".(int)$blog_id."' LIMIT 1";
+		        WHERE c_id = $course_id AND link = 'blog/blog.php?blog_id=".(int) $blog_id."' LIMIT 1";
 		Database::query($sql);
 	}
 
@@ -263,7 +263,7 @@ 
 		Database::query($sql);
 
 		// Delete blog
-		$sql ="DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
+		$sql = "DELETE FROM $tbl_blogs WHERE c_id = $course_id AND blog_id ='".$blog_id."'";
 		Database::query($sql);
 
 		// Delete from course homepage
@@ -294,13 +294,13 @@ 
 		$course_id = $_course['real_id'];
 
 		$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
-		$upload_ok=true;
-		$has_attachment=false;
+		$upload_ok = true;
+		$has_attachment = false;
 		$current_date = api_get_utc_datetime();
 
 		if (!empty($_FILES['user_upload']['name'])) {
 			$upload_ok = process_uploaded_file($_FILES['user_upload']);
-			$has_attachment=true;
+			$has_attachment = true;
 		}
 
 		if ($upload_ok) {
@@ -309,7 +309,7 @@ 
 
 			// Create the post
 			$sql = "INSERT INTO $tbl_blogs_posts (c_id, title, full_text, date_creation, blog_id, author_id )
-					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."','".$current_date."', '".(int)$blog_id."', '".(int)$_user['user_id']."');";
+					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."','".$current_date."', '".(int) $blog_id."', '".(int) $_user['user_id']."');";
 
 			Database::query($sql);
 			$last_post_id = Database::insert_id();
@@ -320,7 +320,7 @@ 
             }
 
 			if ($has_attachment) {
-				$courseDir   = $_course['path'].'/upload/blog';
+				$courseDir = $_course['path'].'/upload/blog';
 				$sys_course_path = api_get_path(SYS_COURSE_PATH);
 				$updir = $sys_course_path.$courseDir;
 
@@ -371,9 +371,9 @@ 
 
 		// Create the post
 		$sql = "UPDATE $tbl_blogs_posts SET
-		        title = '" . Database::escape_string($title)."',
+		        title = '".Database::escape_string($title)."',
 		        full_text = '" . Database::escape_string($full_text)."'
-		        WHERE c_id = $course_id AND post_id ='".(int)$post_id."' AND blog_id ='".(int)$blog_id."'
+		        WHERE c_id = $course_id AND post_id ='".(int) $post_id."' AND blog_id ='".(int) $blog_id."'
 		        LIMIT 1 ";
 		Database::query($sql);
 	}
@@ -394,21 +394,21 @@ 
 
 		// Delete ratings on this comment
 		$sql = "DELETE FROM $tbl_blogs_rating
-				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND item_id = '".(int)$post_id."' AND rating_type = 'post'";
+				WHERE c_id = $course_id AND blog_id = '".(int) $blog_id."' AND item_id = '".(int) $post_id."' AND rating_type = 'post'";
 		Database::query($sql);
 
 		// Delete the post
 		$sql = "DELETE FROM $tbl_blogs_posts
-				WHERE c_id = $course_id AND post_id = '".(int)$post_id."'";
+				WHERE c_id = $course_id AND post_id = '".(int) $post_id."'";
 		Database::query($sql);
 
 		// Delete the comments
 		$sql = "DELETE FROM $tbl_blogs_comments
-				WHERE c_id = $course_id AND post_id = '".(int)$post_id."' AND blog_id = '".(int)$blog_id."'";
+				WHERE c_id = $course_id AND post_id = '".(int) $post_id."' AND blog_id = '".(int) $blog_id."'";
 		Database::query($sql);
 
 		// Delete posts and attachments
-		delete_all_blog_attachment($blog_id,$post_id);
+		delete_all_blog_attachment($blog_id, $post_id);
 	}
 
 	/**
@@ -424,7 +424,7 @@ 
 	{
 		$_user = api_get_user_info();
 		$_course = api_get_course_info();
-        $blog_table_attachment 	= Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
+        $blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
         $upload_ok = true;
         $has_attachment = false;
@@ -433,7 +433,7 @@ 
 
 		if (!empty($_FILES['user_upload']['name'])) {
 			$upload_ok = process_uploaded_file($_FILES['user_upload']);
-			$has_attachment=true;
+			$has_attachment = true;
 		}
 
 		if ($upload_ok) {
@@ -442,7 +442,7 @@ 
 
 			// Create the comment
 			$sql = "INSERT INTO $tbl_blogs_comments (c_id, title, comment, author_id, date_creation, blog_id, post_id, parent_comment_id, task_id )
-					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."', '".(int)$_user['user_id']."','".$current_date."', '".(int)$blog_id."', '".(int)$post_id."', '".(int)$parent_id."', '".(int)$task_id."')";
+					VALUES ($course_id, '".Database::escape_string($title)."', '".Database::escape_string($full_text)."', '".(int) $_user['user_id']."','".$current_date."', '".(int) $blog_id."', '".(int) $post_id."', '".(int) $parent_id."', '".(int) $task_id."')";
 			Database::query($sql);
 
 			// Empty post values, or they are shown on the page again
@@ -454,7 +454,7 @@ 
             }
 
 			if ($has_attachment) {
-				$courseDir   = $_course['path'].'/upload/blog';
+				$courseDir = $_course['path'].'/upload/blog';
 				$sys_course_path = api_get_path(SYS_COURSE_PATH);
 				$updir = $sys_course_path.$courseDir;
 
@@ -465,19 +465,19 @@ 
 				);
 
 				// user's file name
-				$file_name =$_FILES['user_upload']['name'];
+				$file_name = $_FILES['user_upload']['name'];
 
 				if (!filter_extension($new_file_name)) {
 					Display :: display_error_message(get_lang('UplUnableToSaveFileFilteredExtension'));
 				} else {
 					$new_file_name = uniqid('');
-					$new_path=$updir.'/'.$new_file_name;
-					$result= @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
+					$new_path = $updir.'/'.$new_file_name;
+					$result = @move_uploaded_file($_FILES['user_upload']['tmp_name'], $new_path);
 					$comment = Database::escape_string($file_comment);
 
 					// Storing the attachments if any
 					if ($result) {
-						$sql='INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
+						$sql = 'INSERT INTO '.$blog_table_attachment.'(c_id, filename,comment, path, post_id,size,blog_id,comment_id) '.
 							 "VALUES ($course_id, '".Database::escape_string($file_name)."', '".$comment."', '".Database::escape_string($new_file_name)."' , '".$post_id."', '".$_FILES['user_upload']['size']."',  '".$blog_id."', '".$last_id."'  )";
 						Database::query($sql);
 
@@ -526,7 +526,7 @@ 
 
 		// Delete them recursively
 		while ($comment = Database::fetch_array($result)) {
-			Blog::delete_comment($blog_id,$post_id,$comment['comment_id']);
+			Blog::delete_comment($blog_id, $post_id, $comment['comment_id']);
 		}
 
 		// Finally, delete the selected comment to
@@ -553,7 +553,7 @@ 
 
 		// Create the task
 		$sql = "INSERT INTO $tbl_blogs_tasks (c_id, blog_id, title, description, color, system_task)
-				VALUES ($course_id , '".(int)$blog_id."', '" . Database::escape_string($title)."', '" . Database::escape_string($description)."', '" . Database::escape_string($color)."', '0');";
+				VALUES ($course_id , '".(int) $blog_id."', '".Database::escape_string($title)."', '".Database::escape_string($description)."', '".Database::escape_string($color)."', '0');";
 		Database::query($sql);
 
 		$task_id = Database::insert_id();
@@ -563,13 +563,13 @@ 
             Database::query($sql);
         }
 
-		$tool = 'BLOG_' . $blog_id;
+		$tool = 'BLOG_'.$blog_id;
 
 		if ($articleDelete == 'on') {
-			$sql = " INSERT INTO " . $tbl_tasks_permissions . " ( c_id,  task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = " INSERT INTO ".$tbl_tasks_permissions." ( c_id,  task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_delete'
 				)";
 			Database::query($sql);
@@ -584,10 +584,10 @@ 
 
 		if ($articleEdit == 'on') {
 			$sql = "
-				INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+				INSERT INTO " . $tbl_tasks_permissions." (c_id, task_id, tool, action ) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_edit'
 				)";
 			Database::query($sql);
@@ -601,10 +601,10 @@ 
 
 		if ($commentsDelete == 'on') {
 			$sql = "
-				INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action ) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+				INSERT INTO " . $tbl_tasks_permissions." (c_id, task_id, tool, action ) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_comments_delete'
 				)";
 			Database::query($sql);
@@ -637,20 +637,20 @@ 
 					title = '".Database::escape_string($title)."',
 					description = '".Database::escape_string($description)."',
 					color = '".Database::escape_string($color)."'
-				WHERE c_id = $course_id AND task_id ='".(int)$task_id."' LIMIT 1";
+				WHERE c_id = $course_id AND task_id ='".(int) $task_id."' LIMIT 1";
 		Database::query($sql);
 
-		$tool = 'BLOG_' . $blog_id;
+		$tool = 'BLOG_'.$blog_id;
 
-		$sql = "DELETE FROM " . $tbl_tasks_permissions . "
-				WHERE c_id = $course_id AND task_id = '" . (int)$task_id."'";
+		$sql = "DELETE FROM ".$tbl_tasks_permissions."
+				WHERE c_id = $course_id AND task_id = '".(int) $task_id."'";
 		Database::query($sql);
 
 		if ($articleDelete == 'on') {
-			$sql = "INSERT INTO " . $tbl_tasks_permissions . " ( c_id, task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = "INSERT INTO ".$tbl_tasks_permissions." ( c_id, task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_delete'
 				)";
 			Database::query($sql);
@@ -663,10 +663,10 @@ 
 		}
 
 		if ($articleEdit == 'on') {
-			$sql = "INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = "INSERT INTO ".$tbl_tasks_permissions." (c_id, task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_edit'
 				)";
 			Database::query($sql);
@@ -679,10 +679,10 @@ 
 		}
 
 		if ($commentsDelete == 'on') {
-			$sql = " INSERT INTO " . $tbl_tasks_permissions . " (c_id, task_id, tool, action) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($tool) . "',
+			$sql = " INSERT INTO ".$tbl_tasks_permissions." (c_id, task_id, tool, action) VALUES (
+					'" . (int) $course_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($tool)."',
 					'article_comments_delete'
 				)";
 			Database::query($sql);
@@ -707,7 +707,7 @@ 
 
 		// Delete posts
 		$sql = "DELETE FROM $tbl_blogs_tasks
-				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND task_id = '".(int)$task_id."'";
+				WHERE c_id = $course_id AND blog_id = '".(int) $blog_id."' AND task_id = '".(int) $task_id."'";
 		Database::query($sql);
 	}
 
@@ -725,9 +725,9 @@ 
 		$sql = "DELETE FROM $tbl_blogs_tasks_rel_user
 				WHERE
 				    c_id = $course_id AND
-				    blog_id = '".(int)$blog_id."' AND
-				    task_id = '".(int)$task_id."' AND
-				    user_id = '".(int)$user_id."'";
+				    blog_id = '".(int) $blog_id."' AND
+				    task_id = '".(int) $task_id."' AND
+				    user_id = '".(int) $user_id."'";
 		Database::query($sql);
 	}
 
@@ -741,7 +741,7 @@ 
 		$_user = api_get_user_info();
 
 		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
-		$tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 
 		$course_id = api_get_course_int_id();
@@ -758,7 +758,7 @@ 
                         task.c_id = $course_id AND
                         blog.c_id = $course_id AND
                         task_rel_user.c_id = $course_id AND
-                        task_rel_user.user_id = ".(int)$_user['user_id']."
+                        task_rel_user.user_id = ".(int) $_user['user_id']."
                     ORDER BY target_date ASC";
 
 			$result = Database::query($sql);
@@ -766,7 +766,7 @@ 
 			if (Database::num_rows($result) > 0) {
 				echo '<ul>';
 				while ($mytask = Database::fetch_array($result)) {
-					echo '<li><a href="blog.php?action=execute_task&blog_id=' . $mytask['blog_id'] . '&task_id='.stripslashes($mytask['task_id']) . '" title="[Blog: '.stripslashes($mytask['blog_name']) . '] ' . get_lang('ExecuteThisTask') . '">'.stripslashes($mytask['title']) . '</a></li>';
+					echo '<li><a href="blog.php?action=execute_task&blog_id='.$mytask['blog_id'].'&task_id='.stripslashes($mytask['task_id']).'" title="[Blog: '.stripslashes($mytask['blog_name']).'] '.get_lang('ExecuteThisTask').'">'.stripslashes($mytask['title']).'</a></li>';
 				}
 				echo '<ul>';
 			} else {
@@ -790,7 +790,7 @@ 
 
 		// Get blog properties
 		$sql = "SELECT blog_name, visibility FROM $tbl_blogs
-				WHERE c_id = $course_id AND blog_id='".(int)$blog_id."'";
+				WHERE c_id = $course_id AND blog_id='".(int) $blog_id."'";
 		$result = Database::query($sql);
 		$blog = Database::fetch_array($result);
 		$visibility = $blog['visibility'];
@@ -799,7 +799,7 @@ 
 		if ($visibility == 1) {
 			// Change visibility state, remove from course home.
 			$sql = "UPDATE $tbl_blogs SET visibility = '0'
-					WHERE c_id = $course_id AND blog_id ='".(int)$blog_id."' LIMIT 1";
+					WHERE c_id = $course_id AND blog_id ='".(int) $blog_id."' LIMIT 1";
 			Database::query($sql);
 
 			$sql = "DELETE FROM $tbl_tool
@@ -808,11 +808,11 @@ 
 		} else {
 			// Change visibility state, add to course home.
 			$sql = "UPDATE $tbl_blogs SET visibility = '1'
-					WHERE c_id = $course_id AND blog_id ='".(int)$blog_id."' LIMIT 1";
+					WHERE c_id = $course_id AND blog_id ='".(int) $blog_id."' LIMIT 1";
 			Database::query($sql);
 
 			$sql = "INSERT INTO $tbl_tool (c_id, name, link, image, visibility, admin, address, added_tool, target )
-					VALUES ($course_id, '".Database::escape_string($title)."', 'blog/blog.php?blog_id=".(int)$blog_id."', 'blog.gif', '1', '0', 'pastillegris.gif', '0', '_self')";
+					VALUES ($course_id, '".Database::escape_string($title)."', 'blog/blog.php?blog_id=".(int) $blog_id."', 'blog.gif', '1', '0', 'pastillegris.gif', '0', '_self')";
 			Database::query($sql);
             $id = Database::insert_id();
 
@@ -843,14 +843,14 @@ 
 		        FROM $tbl_blogs_posts post
                 INNER JOIN $tbl_users user
                 ON post.author_id = user.user_id
-				WHERE 	post.blog_id = '".(int)$blog_id."' AND
+				WHERE 	post.blog_id = '".(int) $blog_id."' AND
 						post.c_id = $course_id AND
 						$filter
-				ORDER BY post_id DESC LIMIT 0,".(int)$max_number_of_posts;
+				ORDER BY post_id DESC LIMIT 0,".(int) $max_number_of_posts;
 		$result = Database::query($sql);
 
 		// Display
-		if(Database::num_rows($result) > 0) {
+		if (Database::num_rows($result) > 0) {
 		    $limit = 200;
 			while ($blog_post = Database::fetch_array($result)) {
 				// Get number of comments
@@ -858,8 +858,8 @@ 
 						FROM $tbl_blogs_comments
 						WHERE
 						    c_id = $course_id AND
-						    blog_id = '".(int)$blog_id."' AND
-						    post_id = '" . (int)$blog_post['post_id']."'";
+						    blog_id = '".(int) $blog_id."' AND
+						    post_id = '" . (int) $blog_post['post_id']."'";
 				$tmp = Database::query($sql);
 				$blog_post_comments = Database::fetch_array($tmp);
 
@@ -870,11 +870,11 @@ 
 
 				// Create an introduction text (but keep FULL sentences)
 				$words = 0;
-				$blog_post_text_cut = cut($blog_post_text, $limit) ;
+				$blog_post_text_cut = cut($blog_post_text, $limit);
 				$words = strlen($blog_post_text);
 
 				if ($words >= $limit) {
-					$readMoreLink = ' <div class="link" onclick="document.getElementById(\'blogpost_text_' . $blog_post_id . '\').style.display=\'block\'; document.getElementById(\'blogpost_introduction_' . $blog_post_id . '\').style.display=\'none\'">' . get_lang('ReadMore') . '</div>';
+					$readMoreLink = ' <div class="link" onclick="document.getElementById(\'blogpost_text_'.$blog_post_id.'\').style.display=\'block\'; document.getElementById(\'blogpost_introduction_'.$blog_post_id.'\').style.display=\'none\'">'.get_lang('ReadMore').'</div>';
 					$introduction_text = $blog_post_text_cut;
 				} else {
 				    $introduction_text = $blog_post_text;
@@ -884,27 +884,27 @@ 
 				$introduction_text = stripslashes($introduction_text);
 
 				echo '<div class="blogpost">';
-				echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
-				echo '<span class="blogpost_date"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . $blog_post_date . '</a></span>';
-				echo '<div class="blogpost_introduction" id="blogpost_introduction_'.$blog_post_id.'">' . $introduction_text.$readMoreLink.'</div>';
-				echo '<div class="blogpost_text" id="blogpost_text_' . $blog_post_id . '" style="display: none">' . $blog_post_text . '</div>';
+				echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$blog_post['post_id'].'#add_comment" title="'.get_lang('ReadPost').'" >'.stripslashes($blog_post['title']).'</a></span>';
+				echo '<span class="blogpost_date"><a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$blog_post['post_id'].'#add_comment" title="'.get_lang('ReadPost').'" >'.$blog_post_date.'</a></span>';
+				echo '<div class="blogpost_introduction" id="blogpost_introduction_'.$blog_post_id.'">'.$introduction_text.$readMoreLink.'</div>';
+				echo '<div class="blogpost_text" id="blogpost_text_'.$blog_post_id.'" style="display: none">'.$blog_post_text.'</div>';
 
-				$file_name_array = get_blog_attachment($blog_id,$blog_post_id,0);
+				$file_name_array = get_blog_attachment($blog_id, $blog_post_id, 0);
 
 				if (!empty($file_name_array)) {
 					echo '<br /><br />';
-					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+					echo Display::return_icon('attachment.gif', get_lang('Attachment'));
 					echo '<a href="download.php?file=';
 					echo $file_name_array['path'];
 					echo ' "> '.$file_name_array['filename'].' </a><br />';
 					echo '</span>';
 				}
 				$username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-				echo '<span class="blogpost_info">' . get_lang('Author') . ': ' . Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)) .' - <a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '#add_comment" title="' . get_lang('ReadPost') . '" >' . get_lang('Comments') . ': ' . $blog_post_comments['number_of_comments'] . '</a></span>';
+				echo '<span class="blogpost_info">'.get_lang('Author').': '.Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)).' - <a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$blog_post['post_id'].'#add_comment" title="'.get_lang('ReadPost').'" >'.get_lang('Comments').': '.$blog_post_comments['number_of_comments'].'</a></span>';
 				echo '</div>';
 			}
 		} else {
-			if($filter == '1=1') {
+			if ($filter == '1=1') {
 				echo get_lang('NoArticles');
 			} else {
 				echo get_lang('NoArticleMatches');
@@ -918,19 +918,19 @@ 
 	 * @param Integer $blog_id
 	 * @param String $query_string
 	 */
-	public static function display_search_results ($blog_id, $query_string)
+	public static function display_search_results($blog_id, $query_string)
 	{
 		// Init
 		$query_string = Database::escape_string($query_string);
-		$query_string_parts = explode(' ',$query_string);
+		$query_string_parts = explode(' ', $query_string);
 		$query_string = array();
 		foreach ($query_string_parts as $query_part) {
-			$query_string[] = " full_text LIKE '%" . $query_part."%' OR title LIKE '%" . $query_part."%' ";
+			$query_string[] = " full_text LIKE '%".$query_part."%' OR title LIKE '%".$query_part."%' ";
 		}
-		$query_string = '('.implode('OR',$query_string) . ')';
+		$query_string = '('.implode('OR', $query_string).')';
 
 		// Display the posts
-		echo '<span class="blogpost_title">' . get_lang('SearchResults') . '</span>';
+		echo '<span class="blogpost_title">'.get_lang('SearchResults').'</span>';
 		Blog::display_blog_posts($blog_id, $query_string);
 	}
 
@@ -943,14 +943,14 @@ 
 	public static function display_day_results($blog_id, $query_string)
 	{
 		$date_output = $query_string;
-		$date = explode('-',$query_string);
-		$query_string = ' DAYOFMONTH(date_creation) =' . intval($date[2]) . ' AND MONTH(date_creation) =' . intval($date[1]) . ' AND YEAR(date_creation) =' . intval($date[0]);
+		$date = explode('-', $query_string);
+		$query_string = ' DAYOFMONTH(date_creation) ='.intval($date[2]).' AND MONTH(date_creation) ='.intval($date[1]).' AND YEAR(date_creation) ='.intval($date[0]);
 
 		// Put date in correct output format
 		$date_output = api_format_date($date_output, DATE_FORMAT_LONG);
 
 		// Display the posts
-		echo '<span class="blogpost_title">' . get_lang('PostsOf') . ': ' . $date_output . '</span>';
+		echo '<span class="blogpost_title">'.get_lang('PostsOf').': '.$date_output.'</span>';
 		Blog::display_blog_posts($blog_id, $query_string);
 	}
 
@@ -977,8 +977,8 @@ 
 					ON post.author_id = user.user_id
                 WHERE
                     post.c_id = $course_id AND
-                    post.blog_id = '".(int)$blog_id."' AND
-                    post.post_id = '".(int)$post_id."'
+                    post.blog_id = '".(int) $blog_id."' AND
+                    post.post_id = '".(int) $post_id."'
                 ORDER BY post_id DESC";
 		$result = Database::query($sql);
 		$blog_post = Database::fetch_array($result);
@@ -986,7 +986,7 @@ 
 		// Get number of comments
 		$sql = "SELECT COUNT(1) as number_of_comments
 		        FROM $tbl_blogs_comments
-				WHERE c_id = $course_id AND blog_id = '".(int)$blog_id."' AND post_id = '".(int)$post_id."'";
+				WHERE c_id = $course_id AND blog_id = '".(int) $blog_id."' AND post_id = '".(int) $post_id."'";
 		$result = Database::query($sql);
 		$blog_post_comments = Database::fetch_array($result);
 
@@ -997,28 +997,28 @@ 
 
 		$task_id = (isset($_GET['task_id']) && is_numeric($_GET['task_id'])) ? intval($_GET['task_id']) : 0;
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id))
-			$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '"><img src="../img/edit.gif" /></a>';
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id))
+			$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id='.$blog_id.'&post_id='.$post_id.'&article_id='.$blog_post['post_id'].'&task_id='.$task_id.'" title="'.get_lang('EditThisPost').'"><img src="../img/edit.gif" /></a>';
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id))
-			$blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>';
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id))
+			$blog_post_actions .= '<a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$post_id.'&do=delete_article&article_id='.$blog_post['post_id'].'&task_id='.$task_id.'" title="'.get_lang('DeleteThisArticle').'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"><img src="../img/delete.gif" border="0" /></a>';
 
-		if(api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
-			$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_rate'))
+			$rating_select = Blog::display_rating_form('post', $blog_id, $post_id);
 
-		$blog_post_text=stripslashes($blog_post_text);
+		$blog_post_text = stripslashes($blog_post_text);
 
 		// Display post
 		echo '<div class="blogpost">';
-		echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $blog_post['post_id'] . '" title="' . get_lang('ReadPost') . '" >'.stripslashes($blog_post['title']) . '</a></span>';
-		echo '<span class="blogpost_date">' . $blog_post_date . '</span>';
-		echo '<span class="blogpost_text">' . $blog_post_text . '</span><br />';
+		echo '<span class="blogpost_title"><a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$blog_post['post_id'].'" title="'.get_lang('ReadPost').'" >'.stripslashes($blog_post['title']).'</a></span>';
+		echo '<span class="blogpost_date">'.$blog_post_date.'</span>';
+		echo '<span class="blogpost_text">'.$blog_post_text.'</span><br />';
 
 		$file_name_array = get_blog_attachment($blog_id, $post_id);
 
         if (!empty($file_name_array)) {
 			echo ' <br />';
-			echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+			echo Display::return_icon('attachment.gif', get_lang('Attachment'));
 			echo '<a href="download.php?file=';
 			echo $file_name_array['path'];
 			echo ' "> '.$file_name_array['filename'].' </a>';
@@ -1029,20 +1029,20 @@ 
 			echo '<br />';
 		}
         $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-		echo '<span class="blogpost_info">'.get_lang('Author').': ' .Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)).' - '.get_lang('Comments').': '.$blog_post_comments['number_of_comments'].' - '.get_lang('Rating').': '.Blog::display_rating('post',$blog_id,$post_id).$rating_select.'</span>';
-		echo '<span class="blogpost_actions">' . $blog_post_actions . '</span>';
+		echo '<span class="blogpost_info">'.get_lang('Author').': '.Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username)).' - '.get_lang('Comments').': '.$blog_post_comments['number_of_comments'].' - '.get_lang('Rating').': '.Blog::display_rating('post', $blog_id, $post_id).$rating_select.'</span>';
+		echo '<span class="blogpost_actions">'.$blog_post_actions.'</span>';
 		echo '</div>';
 
 		// Display comments if there are any
-		if($blog_post_comments['number_of_comments'] > 0) {
+		if ($blog_post_comments['number_of_comments'] > 0) {
 			echo '<div class="comments">';
-				echo '<span class="blogpost_title">' . get_lang('Comments') . '</span><br />';
+				echo '<span class="blogpost_title">'.get_lang('Comments').'</span><br />';
 				Blog::get_threaded_comments(0, 0, $blog_id, $post_id, $task_id);
 			echo '</div>';
 		}
 
 		// Display comment form
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_comments_add')) {
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) {
 			Blog::display_new_comment_form($blog_id, $post_id, $blog_post['title']);
 		}
 	}
@@ -1070,16 +1070,16 @@ 
 		$sql = "SELECT rating_id FROM $tbl_blogs_rating
                 WHERE
                     c_id = $course_id AND
-                    blog_id = '".(int)$blog_id."' AND
-                    item_id = '".(int)$item_id."' AND
+                    blog_id = '".(int) $blog_id."' AND
+                    item_id = '".(int) $item_id."' AND
                     rating_type = '".Database::escape_string($type)."' AND
-                    user_id = '".(int)$_user['user_id']."'";
+                    user_id = '".(int) $_user['user_id']."'";
 		$result = Database::query($sql);
 
         // Add rating
 		if (Database::num_rows($result) == 0) {
 			$sql = "INSERT INTO $tbl_blogs_rating (c_id, blog_id, rating_type, item_id, user_id, rating )
-					VALUES ($course_id, '".(int)$blog_id."', '".Database::escape_string($type)."', '".(int)$item_id."', '".(int)$_user['user_id']."', '".Database::escape_string($rating)."')";
+					VALUES ($course_id, '".(int) $blog_id."', '".Database::escape_string($type)."', '".(int) $item_id."', '".(int) $_user['user_id']."', '".Database::escape_string($rating)."')";
 			Database::query($sql);
 
             $id = Database::insert_id();
@@ -1112,8 +1112,8 @@ 
 		$sql = "SELECT AVG(rating) as rating FROM $tbl_blogs_rating
 				WHERE
 				    c_id = $course_id AND
-				    blog_id = '".(int)$blog_id."' AND
-				    item_id = '".(int)$item_id."' AND
+				    blog_id = '".(int) $blog_id."' AND
+				    item_id = '".(int) $item_id."' AND
 				    rating_type = '".Database::escape_string($type)."' ";
 		$result = Database::query($sql);
 		$result = Database::fetch_array($result);
@@ -1130,7 +1130,7 @@ 
 	 *
 	 *@return String
 	 */
-	public static function display_rating_form ($type, $blog_id, $post_id, $comment_id = NULL)
+	public static function display_rating_form($type, $blog_id, $post_id, $comment_id = NULL)
 	{
 		$_user = api_get_user_info();
 		$tbl_blogs_rating = Database::get_course_table(TABLE_BLOGS_RATING);
@@ -1140,14 +1140,14 @@ 
 			// Check if the user has already rated this post
 			$sql = "SELECT rating_id FROM $tbl_blogs_rating
 					WHERE c_id = $course_id AND
-					blog_id = '".(int)$blog_id."'
-					AND item_id = '".(int)$post_id."'
+					blog_id = '".(int) $blog_id."'
+					AND item_id = '".(int) $post_id."'
 					AND rating_type = '".Database::escape_string($type)."'
-					AND user_id = '".(int)$_user['user_id']."'";
+					AND user_id = '".(int) $_user['user_id']."'";
 			$result = Database::query($sql);
             // Add rating
             if (Database::num_rows($result) == 0) {
-				return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $post_id . '" name="frm_rating_' . $type . '_' . $post_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $post_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /></form>';
+				return ' - '.get_lang('RateThis').': <form method="get" action="blog.php" style="display: inline" id="frm_rating_'.$type.'_'.$post_id.'" name="frm_rating_'.$type.'_'.$post_id.'"><select name="rating" onchange="document.forms[\'frm_rating_'.$type.'_'.$post_id.'\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="'.$type.'" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="'.$blog_id.'" /><input type="hidden" name="post_id" value="'.$post_id.'" /></form>';
             } else {
 				return '';
 			}
@@ -1156,14 +1156,14 @@ 
         if ($type = 'comment') {
 			// Check if the user has already rated this comment
 			$sql = "SELECT rating_id FROM $tbl_blogs_rating
-					WHERE c_id = $course_id AND blog_id = '".(int)$blog_id ."'
-					AND item_id = '".(int)$comment_id."'
+					WHERE c_id = $course_id AND blog_id = '".(int) $blog_id."'
+					AND item_id = '".(int) $comment_id."'
 					AND rating_type = '".Database::escape_string($type)."'
-					AND user_id = '".(int)$_user['user_id']."'";
+					AND user_id = '".(int) $_user['user_id']."'";
 			$result = Database::query($sql);
 
             if (Database::num_rows($result) == 0) {
-				return ' - ' . get_lang('RateThis') . ': <form method="get" action="blog.php" style="display: inline" id="frm_rating_' . $type . '_' . $comment_id . '" name="frm_rating_' . $type . '_' . $comment_id . '"><select name="rating" onchange="document.forms[\'frm_rating_' . $type . '_' . $comment_id . '\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="' . $type . '" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="' . $blog_id . '" /><input type="hidden" name="post_id" value="' . $post_id . '" /><input type="hidden" name="comment_id" value="' . $comment_id . '" /></form>';
+				return ' - '.get_lang('RateThis').': <form method="get" action="blog.php" style="display: inline" id="frm_rating_'.$type.'_'.$comment_id.'" name="frm_rating_'.$type.'_'.$comment_id.'"><select name="rating" onchange="document.forms[\'frm_rating_'.$type.'_'.$comment_id.'\'].submit()"><option value="">-</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="7">7</option><option value="8">8</option><option value="9">9</option><option value="10">10</option></select><input type="hidden" name="action" value="view_post" /><input type="hidden" name="type" value="'.$type.'" /><input type="hidden" name="do" value="rate" /><input type="hidden" name="blog_id" value="'.$blog_id.'" /><input type="hidden" name="post_id" value="'.$post_id.'" /><input type="hidden" name="comment_id" value="'.$comment_id.'" /></form>';
             } else {
 				return '';
 			}
@@ -1198,11 +1198,11 @@ 
                 WHERE
                     comments.c_id = $course_id AND
                     parent_comment_id = $current AND
-                    comments.blog_id = '".(int)$blog_id."' AND
-                    comments.post_id = '".(int)$post_id."'";
+                    comments.blog_id = '".(int) $blog_id."' AND
+                    comments.post_id = '".(int) $post_id."'";
 		$result = Database::query($sql);
 
-		while($comment = Database::fetch_array($result)) {
+		while ($comment = Database::fetch_array($result)) {
 			// Select the children recursivly
 			$tmp = "SELECT comments.*, user.lastname, user.firstname, user.username
 			        FROM $tbl_blogs_comments comments
@@ -1211,8 +1211,8 @@ 
 					WHERE
 						comments.c_id = $course_id AND
 						comment_id = $current
-						AND blog_id = '".(int)$blog_id."'
-						AND post_id = '".(int)$post_id."'";
+						AND blog_id = '".(int) $blog_id."'
+						AND post_id = '".(int) $post_id."'";
 			$tmp = Database::query($tmp);
 			$tmp = Database::fetch_array($tmp);
 			$parent_cat = $tmp['parent_comment_id'];
@@ -1222,26 +1222,26 @@ 
 			$comment_text = make_clickable(stripslashes($comment['comment']));
 			$blog_comment_date = api_convert_and_format_date($comment['date_creation'], null, date_default_timezone_get());
 			$blog_comment_actions = "";
-			if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_comment&comment_id=' . $comment['comment_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisComment') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>'; }
-			if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_rate')) { $rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']); }
+			if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$post_id.'&do=delete_comment&comment_id='.$comment['comment_id'].'&task_id='.$task_id.'" title="'.get_lang('DeleteThisComment').'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"><img src="../img/delete.gif" border="0" /></a>'; }
+			if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_rate')) { $rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']); }
 
 			if (!is_null($comment['task_id'])) {
-				$border_color = ' border-left: 3px solid #' . $comment['color'];
+				$border_color = ' border-left: 3px solid #'.$comment['color'];
 			}
 
 			$comment_text = stripslashes($comment_text);
 
 			// Output...
 			$margin = $current_level * 30;
-			echo '<div class="blogpost_comment" style="margin-left: ' . $margin . 'px;' . $border_color . '">';
-				echo '<span class="blogpost_comment_title"><a href="#add_comment" onclick="document.getElementById(\'comment_parent_id\').value=\'' . $comment['comment_id'] . '\'; document.getElementById(\'comment_title\').value=\'Re: '.addslashes($comment['title']) . '\'" title="' . get_lang('ReplyToThisComment') . '" >'.stripslashes($comment['title']) . '</a></span>';
-				echo '<span class="blogpost_comment_date">' . $blog_comment_date . '</span>';
-				echo '<span class="blogpost_text">' . $comment_text . '</span>';
+			echo '<div class="blogpost_comment" style="margin-left: '.$margin.'px;'.$border_color.'">';
+				echo '<span class="blogpost_comment_title"><a href="#add_comment" onclick="document.getElementById(\'comment_parent_id\').value=\''.$comment['comment_id'].'\'; document.getElementById(\'comment_title\').value=\'Re: '.addslashes($comment['title']).'\'" title="'.get_lang('ReplyToThisComment').'" >'.stripslashes($comment['title']).'</a></span>';
+				echo '<span class="blogpost_comment_date">'.$blog_comment_date.'</span>';
+				echo '<span class="blogpost_text">'.$comment_text.'</span>';
 
-				$file_name_array=get_blog_attachment($blog_id,$post_id, $comment['comment_id']);
+				$file_name_array = get_blog_attachment($blog_id, $post_id, $comment['comment_id']);
 				if (!empty($file_name_array)) {
 					echo '<br /><br />';
-					echo Display::return_icon('attachment.gif',get_lang('Attachment'));
+					echo Display::return_icon('attachment.gif', get_lang('Attachment'));
 					echo '<a href="download.php?file=';
 					echo $file_name_array['path'];
 					echo ' "> '.$file_name_array['filename'].' </a>';
@@ -1251,7 +1251,7 @@ 
 				}
                 $username = api_htmlentities(sprintf(get_lang('LoginX'), $comment['username']), ENT_QUOTES);
 				echo '<span class="blogpost_comment_info">'.get_lang('Author').': '.Display::tag('span', api_get_person_name($comment['firstname'], $comment['lastname']), array('title'=>$username)).' - '.get_lang('Rating').': '.Blog::display_rating('comment', $blog_id, $comment['comment_id']).$rating_select.'</span>';
-				echo '<span class="blogpost_actions">' . $blog_comment_actions . '</span>';
+				echo '<span class="blogpost_actions">'.$blog_comment_actions.'</span>';
 			echo '</div>';
 
 			// Go further down the tree.
@@ -1267,11 +1267,11 @@ 
 	 */
 	public static function display_form_new_post($blog_id)
 	{
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_add')) {
 			$form = new FormValidator(
 				'add_post',
 				'post',
-				api_get_path(WEB_CODE_PATH)."blog/blog.php?action=new_post&blog_id=" . $blog_id . "&" . api_get_cidreq(),
+				api_get_path(WEB_CODE_PATH)."blog/blog.php?action=new_post&blog_id=".$blog_id."&".api_get_cidreq(),
 				null,
 				array('enctype' => 'multipart/form-data')
 			);
@@ -1315,8 +1315,8 @@ 
 				INNER JOIN $tbl_users user ON post.author_id = user.user_id
 				WHERE
 				post.c_id 			= $course_id AND
-				post.blog_id 		= '".(int)$blog_id ."'
-				AND post.post_id	= '".(int)$post_id."'
+				post.blog_id 		= '".(int) $blog_id."'
+				AND post.post_id	= '".(int) $post_id."'
 				ORDER BY post_id DESC";
 		$result = Database::query($sql);
 		$blog_post = Database::fetch_array($result);
@@ -1325,7 +1325,7 @@ 
 		$form = new FormValidator(
 			'edit_post',
 			'post',
-			api_get_path(WEB_CODE_PATH).'blog/blog.php?action=edit_post&post_id=' . intval($_GET['post_id']) . '&blog_id=' . intval($blog_id) . '&article_id='.intval($_GET['article_id']).'&task_id='.intval($_GET['task_id'])
+			api_get_path(WEB_CODE_PATH).'blog/blog.php?action=edit_post&post_id='.intval($_GET['post_id']).'&blog_id='.intval($blog_id).'&article_id='.intval($_GET['article_id']).'&task_id='.intval($_GET['task_id'])
 		);
 
 		$form->addHeader(get_lang('EditPost'));
@@ -1357,26 +1357,26 @@ 
 		global $charset;
         $course_id = api_get_course_int_id();
 
-		if (api_is_allowed('BLOG_' . $blog_id, 'article_add')) {
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_add')) {
 			$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 			$counter = 0;
 			global $color2;
 
 			echo '<div class="actions">';
-			echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=add"><img src="../img/blog_newtasks.gif" border="0" align="middle" alt="'.get_lang('AddTasks').'" />' . get_lang('AddTasks') . '</a> ';
-			echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign"><img src="../img/blog_task.gif" border="0" align="middle" alt="'.get_lang('AssignTasks').'" />' . get_lang('AssignTasks') . '</a>';
+			echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$blog_id.'&do=add"><img src="../img/blog_newtasks.gif" border="0" align="middle" alt="'.get_lang('AddTasks').'" />'.get_lang('AddTasks').'</a> ';
+			echo '<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$blog_id.'&do=assign"><img src="../img/blog_task.gif" border="0" align="middle" alt="'.get_lang('AssignTasks').'" />'.get_lang('AssignTasks').'</a>';
 			?>
-				<a href="<?php echo api_get_self(); ?>?action=manage_rights&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageRights') ?>"><?php echo Display::return_icon('blog_admin_users.png', get_lang('RightsManager'),'',ICON_SIZE_SMALL). get_lang('RightsManager') ?></a>
+				<a href="<?php echo api_get_self(); ?>?action=manage_rights&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageRights') ?>"><?php echo Display::return_icon('blog_admin_users.png', get_lang('RightsManager'), '', ICON_SIZE_SMALL).get_lang('RightsManager') ?></a>
 			<?php
 			echo '</div>';
 
-			echo '<span class="blogpost_title">' . get_lang('TaskList') . '</span><br />';
+			echo '<span class="blogpost_title">'.get_lang('TaskList').'</span><br />';
 			echo "<table class=\"data_table\">";
 			echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-					 "<th width='240'><b>",get_lang('Title'),"</b></th>\n",
-					 "<th><b>",get_lang('Description'),"</b></th>\n",
-					 "<th><b>",get_lang('Color'),"</b></th>\n",
-					 "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
+					 "<th width='240'><b>", get_lang('Title'), "</b></th>\n",
+					 "<th><b>", get_lang('Description'), "</b></th>\n",
+					 "<th><b>", get_lang('Color'), "</b></th>\n",
+					 "<th width='50'><b>", get_lang('Modify'), "</b></th>\n",
 				"</tr>\n";
 
 
@@ -1388,31 +1388,31 @@ 
                         description,
                         color,
                         system_task
-                    FROM " . $tbl_blogs_tasks . "
-                    WHERE c_id = $course_id AND blog_id = " . (int)$blog_id . "
+                    FROM " . $tbl_blogs_tasks."
+                    WHERE c_id = $course_id AND blog_id = ".(int) $blog_id."
                     ORDER BY system_task, title";
 			$result = Database::query($sql);
 
 
-			while($task = Database::fetch_array($result)) {
+			while ($task = Database::fetch_array($result)) {
 				$counter++;
 				$css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
 				$delete_icon = ($task['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
 				$delete_title = ($task['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
-				$delete_link = ($task['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=delete&task_id=' . $task['task_id'];
-				$delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
+				$delete_link = ($task['system_task'] == '1') ? '#' : api_get_self().'?action=manage_tasks&blog_id='.$task['blog_id'].'&do=delete&task_id='.$task['task_id'];
+				$delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"';
 
-				echo	'<tr class="' . $css_class . '" valign="top">',
-							 '<td width="240">' . Security::remove_XSS($task['title']) . '</td>',
-							 '<td>' . Security::remove_XSS($task['description']) . '</td>',
-							 '<td><span style="background-color: #' . $task['color'] . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
+				echo	'<tr class="'.$css_class.'" valign="top">',
+							 '<td width="240">'.Security::remove_XSS($task['title']).'</td>',
+							 '<td>'.Security::remove_XSS($task['description']).'</td>',
+							 '<td><span style="background-color: #'.$task['color'].'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
 							 '<td width="50">',
-							 	'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=edit&task_id=' . $task['task_id'] . '">',
-								'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
+							 	'<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$task['blog_id'].'&do=edit&task_id='.$task['task_id'].'">',
+								'<img src="../img/edit.gif" border="0" title="'.get_lang('EditTask').'" />',
 								"</a>\n",
-								'<a href="' . $delete_link . '"',
+								'<a href="'.$delete_link.'"',
 								$delete_confirm,
-								'><img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
+								'><img src="../img/'.$delete_icon.'" border="0" title="'.$delete_title.'" />',
 								"</a>\n",
 							 '</td>',
 						'</tr>';
@@ -1427,23 +1427,23 @@ 
 	 *
 	 * @param Integer $blog_id
 	 */
-	public static function display_assigned_task_list ($blog_id)
+	public static function display_assigned_task_list($blog_id)
     {
 		// Init
 		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
 		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
 		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 		$counter = 0;
-		global $charset,$color2;
+		global $charset, $color2;
 
-		echo '<span class="blogpost_title">' . get_lang('AssignedTasks') . '</span><br />';
+		echo '<span class="blogpost_title">'.get_lang('AssignedTasks').'</span><br />';
 		echo "<table class=\"data_table\">";
 		echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
-				 "<th width='240'><b>",get_lang('Member'),"</b></th>\n",
-				 "<th><b>",get_lang('Task'),"</b></th>\n",
-				 "<th><b>",get_lang('Description'),"</b></th>\n",
-				 "<th><b>",get_lang('TargetDate'),"</b></th>\n",
-				 "<th width='50'><b>",get_lang('Modify'),"</b></th>\n",
+				 "<th width='240'><b>", get_lang('Member'), "</b></th>\n",
+				 "<th><b>", get_lang('Task'), "</b></th>\n",
+				 "<th><b>", get_lang('Description'), "</b></th>\n",
+				 "<th><b>", get_lang('TargetDate'), "</b></th>\n",
+				 "<th width='50'><b>", get_lang('Modify'), "</b></th>\n",
 			"</tr>";
 
 		$course_id = api_get_course_int_id();
@@ -1455,32 +1455,32 @@ 
 				WHERE
 				    task_rel_user.c_id = $course_id AND
 					task.c_id = $course_id AND
-					task_rel_user.blog_id = '".(int)$blog_id."'
+					task_rel_user.blog_id = '".(int) $blog_id."'
 				ORDER BY target_date ASC";
 		$result = Database::query($sql);
 
 		while ($assignment = Database::fetch_array($result)) {
 			$counter++;
-			$css_class = (($counter % 2)==0) ? "row_odd" : "row_even";
+			$css_class = (($counter % 2) == 0) ? "row_odd" : "row_even";
 			$delete_icon = ($assignment['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
 			$delete_title = ($assignment['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
-			$delete_link = ($assignment['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete&task_id=' . $assignment['task_id'];
-			$delete_confirm = ($assignment['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
+			$delete_link = ($assignment['system_task'] == '1') ? '#' : api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=delete&task_id='.$assignment['task_id'];
+			$delete_confirm = ($assignment['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"';
 
             $username = api_htmlentities(sprintf(get_lang('LoginX'), $assignment['username']), ENT_QUOTES);
 
-			echo	'<tr class="' . $css_class . '" valign="top">',
-						 '<td width="240">' . Display::tag('span', api_get_person_name($assignment['firstname'], $assignment['lastname']), array('title'=>$username)) . '</td>',
-						 '<td>'.stripslashes($assignment['title']) . '</td>',
-						 '<td>'.stripslashes($assignment['description']) . '</td>',
-						 '<td>' . $assignment['target_date'] . '</td>',
+			echo	'<tr class="'.$css_class.'" valign="top">',
+						 '<td width="240">'.Display::tag('span', api_get_person_name($assignment['firstname'], $assignment['lastname']), array('title'=>$username)).'</td>',
+						 '<td>'.stripslashes($assignment['title']).'</td>',
+						 '<td>'.stripslashes($assignment['description']).'</td>',
+						 '<td>'.$assignment['target_date'].'</td>',
 						 '<td width="50">',
-						 	'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=edit_assignment&task_id=' . $assignment['task_id'] . '&user_id=' . $assignment['user_id'] . '">',
-							'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
+						 	'<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=edit_assignment&task_id='.$assignment['task_id'].'&user_id='.$assignment['user_id'].'">',
+							'<img src="../img/edit.gif" border="0" title="'.get_lang('EditTask').'" />',
 							"</a>\n",
-							'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete_assignment&task_id=' . $assignment['task_id'] . '&user_id=' . $assignment['user_id'] . '" ',
-							'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"',
-							'<img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
+							'<a href="'.api_get_self().'?action=manage_tasks&blog_id='.$assignment['blog_id'].'&do=delete_assignment&task_id='.$assignment['task_id'].'&user_id='.$assignment['user_id'].'" ',
+							'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;"',
+							'<img src="../img/'.$delete_icon.'" border="0" title="'.$delete_title.'" />',
 							"</a>\n",
 						 '</td>',
 					'</tr>';
@@ -1493,7 +1493,7 @@ 
 	 * @author Toon Keppens
 	 *
 	 */
-	public static function display_new_task_form ($blog_id)
+	public static function display_new_task_form($blog_id)
 	{
 		// Init
         $colors = array(
@@ -1515,7 +1515,7 @@ 
         );
 
 		// form
-		echo '<form name="add_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">';
+		echo '<form name="add_task" method="post" action="blog.php?action=manage_tasks&blog_id='.$blog_id.'">';
 
 		// form title
 		echo '<legend>'.get_lang('AddTask').'</legend>';
@@ -1523,7 +1523,7 @@ 
 		// task title
 		echo '	<div class="control-group">
 					<label class="control-label">
-						<span class="form_required">*</span>' . get_lang('Title') . '
+						<span class="form_required">*</span>' . get_lang('Title').'
 					</label>
 					<div class="controls">
 						<input name="task_name" type="text" size="70" />
@@ -1533,7 +1533,7 @@ 
 		// task comment
 		echo '	<div class="control-group">
 					<label class="control-label">
-						' . get_lang('Description') . '
+						' . get_lang('Description').'
 					</label>
 					<div class="controls">
 						<textarea name="task_description" cols="45"></textarea>
@@ -1543,18 +1543,18 @@ 
 		// task management
 		echo '	<div class="control-group">
 					<label class="control-label">
-						' . get_lang('TaskManager') . '
+						' . get_lang('TaskManager').'
 					</label>
 					<div class="controls">';
                 echo '<table class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
                     echo '<tr>';
-                        echo '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>';
-                        echo '<th width:223px;>' . get_lang('CommentManager') . '</th>';
+                        echo '<th colspan="2" style="width:223px;">'.get_lang('ArticleManager').'</th>';
+                        echo '<th width:223px;>'.get_lang('CommentManager').'</th>';
                     echo '</tr>';
                     echo '<tr>';
-                        echo '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>';
-                        echo '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>';
-                        echo '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>';
+                        echo '<th style="width:111px;"><label for="articleDelete">'.get_lang('Delete').'</label></th>';
+                        echo '<th style="width:112px;"><label for="articleEdit">'.get_lang('Edit').'</label></th>';
+                        echo '<th style="width:223px;"><label for="commentsDelete">'.get_lang('Delete').'</label></th>';
                     echo '</tr>';
                     echo '<tr>';
                         echo '<td style="text-align:center;"><input id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>';
@@ -1569,13 +1569,13 @@ 
 		// task color
 		echo '	<div class="control-group">
 					<label class="control-label">
-						' . get_lang('Color') . '
+						' . get_lang('Color').'
 					</label>
 					<div class="controls">';
         echo '<select name="task_color" id="color" style="width: 150px; background-color: #eeeeee" onchange="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value" onkeypress="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value">';
                 foreach ($colors as $color) {
-                    $style = 'style="background-color: #' . $color . '"';
-                    echo '<option value="' . $color . '" ' . $style . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
+                    $style = 'style="background-color: #'.$color.'"';
+                    echo '<option value="'.$color.'" '.$style.'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
                 }
         echo '</select>';
 		echo '		</div>
@@ -1586,7 +1586,7 @@ 
 					<div class="controls">
 							<input type="hidden" name="action" value="" />
 							<input type="hidden" name="new_task_submit" value="true" />
-						<button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button>
+						<button class="save" type="submit" name="Submit">' . get_lang('Save').'</button>
 					</div>
 				</div>';
 		echo '</form>';
@@ -1600,34 +1600,34 @@ 
 	 * @author Toon Keppens
 	 *
 	 */
-	public static function display_edit_task_form ($blog_id, $task_id) {
+	public static function display_edit_task_form($blog_id, $task_id) {
 		$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
         $course_id = api_get_course_int_id();
 
-		$colors = array('FFFFFF','FFFF99','FFCC99','FF9933','FF6699','CCFF99','CC9966','66FF00', '9966FF', 'CF3F3F', '990033','669933','0033FF','003366','000000');
+		$colors = array('FFFFFF', 'FFFF99', 'FFCC99', 'FF9933', 'FF6699', 'CCFF99', 'CC9966', '66FF00', '9966FF', 'CF3F3F', '990033', '669933', '0033FF', '003366', '000000');
 
-		$sql = "SELECT blog_id, task_id, title, description, color FROM $tbl_blogs_tasks WHERE c_id = $course_id AND task_id = '".(int)$task_id."'";
+		$sql = "SELECT blog_id, task_id, title, description, color FROM $tbl_blogs_tasks WHERE c_id = $course_id AND task_id = '".(int) $task_id."'";
 		$result = Database::query($sql);
 		$task = Database::fetch_array($result);
 
 		// Display
-		echo '<form name="edit_task" method="post" action="blog.php?action=manage_tasks&blog_id=' . $blog_id . '">
-					<legend>' . get_lang('EditTask') . '</legend>
+		echo '<form name="edit_task" method="post" action="blog.php?action=manage_tasks&blog_id='.$blog_id.'">
+					<legend>' . get_lang('EditTask').'</legend>
 					<table width="100%" border="0" cellspacing="2">
 						<tr>
-					   <td align="right">' . get_lang('Title') . ':&nbsp;&nbsp;</td>
-					   <td><input name="task_name" type="text" size="70" value="'.Security::remove_XSS($task['title']) . '" /></td>
+					   <td align="right">' . get_lang('Title').':&nbsp;&nbsp;</td>
+					   <td><input name="task_name" type="text" size="70" value="'.Security::remove_XSS($task['title']).'" /></td>
 						</tr>
 						<tr>
-					   <td align="right">' . get_lang('Description') . ':&nbsp;&nbsp;</td>
+					   <td align="right">' . get_lang('Description').':&nbsp;&nbsp;</td>
 					   <td><textarea name="task_description" cols="45">'.Security::remove_XSS($task['description']).'</textarea></td>
 						</tr>';
 
 						/* edit by Kevin Van Den Haute (kevin@develop-it.be) */
 						$tbl_tasks_permissions = Database::get_course_table(TABLE_BLOGS_TASKS_PERMISSIONS);
 
-						$sql = " SELECT id, action FROM " . $tbl_tasks_permissions . "
-							     WHERE c_id = $course_id AND task_id = '" . (int)$task_id."'";
+						$sql = " SELECT id, action FROM ".$tbl_tasks_permissions."
+							     WHERE c_id = $course_id AND task_id = '".(int) $task_id."'";
 						$result = Database::query($sql);
 
 						$arrPermissions = array();
@@ -1636,22 +1636,22 @@ 
 							$arrPermissions[] = $row['action'];
 
 						    echo '<tr>';
-							echo '<td style="text-align:right; vertical-align:top;">' . get_lang('TaskManager') . ':&nbsp;&nbsp;</td>';
+							echo '<td style="text-align:right; vertical-align:top;">'.get_lang('TaskManager').':&nbsp;&nbsp;</td>';
 							echo '<td>';
 								echo '<table  class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
 									echo '<tr>';
-										echo '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>';
-										echo '<th width:223px;>' . get_lang('CommentManager') . '</th>';
+										echo '<th colspan="2" style="width:223px;">'.get_lang('ArticleManager').'</th>';
+										echo '<th width:223px;>'.get_lang('CommentManager').'</th>';
 									echo '</tr>';
 									echo '<tr>';
-										echo '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>';
-										echo '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>';
-										echo '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>';
+										echo '<th style="width:111px;"><label for="articleDelete">'.get_lang('Delete').'</label></th>';
+										echo '<th style="width:112px;"><label for="articleEdit">'.get_lang('Edit').'</label></th>';
+										echo '<th style="width:223px;"><label for="commentsDelete">'.get_lang('Delete').'</label></th>';
 									echo '</tr>';
 									echo '<tr>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_delete', $arrPermissions)) ? 'checked ' : '') . 'id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_edit', $arrPermissions)) ? 'checked ' : '') . 'id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>';
-										echo '<td style="text-align:center;"><input ' . ((in_array('article_comments_delete', $arrPermissions)) ? 'checked ' : '') . 'id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>';
+										echo '<td style="text-align:center;"><input '.((in_array('article_delete', $arrPermissions)) ? 'checked ' : '').'id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>';
+										echo '<td style="text-align:center;"><input '.((in_array('article_edit', $arrPermissions)) ? 'checked ' : '').'id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>';
+										echo '<td style="text-align:center;"><input '.((in_array('article_comments_delete', $arrPermissions)) ? 'checked ' : '').'id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>';
 									echo '</tr>';
 								echo '</table>';
 							echo '</td>';
@@ -1659,13 +1659,13 @@ 
 						/* end of edit */
 
 						echo '<tr>
-					   <td align="right">' . get_lang('Color') . ':&nbsp;&nbsp;</td>
+					   <td align="right">' . get_lang('Color').':&nbsp;&nbsp;</td>
 					   <td>
-					   	<select name="task_color" id="color" style="width: 150px; background-color: #' . $task['color'] . '" onchange="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value" onkeypress="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value">';
+					   	<select name="task_color" id="color" style="width: 150px; background-color: #' . $task['color'].'" onchange="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value" onkeypress="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value">';
                             foreach ($colors as $color) {
                                 $selected = ($color == $task['color']) ? ' selected' : '';
-                                $style = 'style="background-color: #' . $color . '"';
-                                echo '<option value="' . $color . '" ' . $style . ' ' . $selected . ' >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
+                                $style = 'style="background-color: #'.$color.'"';
+                                echo '<option value="'.$color.'" '.$style.' '.$selected.' >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
                             }
 		echo '			   </select>
 						  </td>
@@ -1674,9 +1674,9 @@ 
 							<td align="right">&nbsp;</td>
 							<td><br /><input type="hidden" name="action" value="" />
 							<input type="hidden" name="edit_task_submit" value="true" />
-							<input type="hidden" name="task_id" value="' . $task['task_id'] . '" />
-							<input type="hidden" name="blog_id" value="' . $task['blog_id'] . '" />
-							<button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button></td>
+							<input type="hidden" name="task_id" value="' . $task['task_id'].'" />
+							<input type="hidden" name="blog_id" value="' . $task['blog_id'].'" />
+							<button class="save" type="submit" name="Submit">' . get_lang('Save').'</button></td>
 						</tr>
 					</table>
 				</form>';
@@ -1698,7 +1698,7 @@ 
 				FROM $tbl_users user
 				INNER JOIN $tbl_blogs_rel_user blogs_rel_user
 				ON user.user_id = blogs_rel_user.user_id
-				WHERE blogs_rel_user.c_id = $course_id AND blogs_rel_user.blog_id = '".(int)$blog_id."'";
+				WHERE blogs_rel_user.c_id = $course_id AND blogs_rel_user.blog_id = '".(int) $blog_id."'";
 		$result = Database::query($sql);
 
 		$options = array();
@@ -1717,7 +1717,7 @@ 
 				color,
 				system_task
 			FROM $tbl_blogs_tasks
-			WHERE c_id = $course_id AND blog_id = " . (int)$blog_id . "
+			WHERE c_id = $course_id AND blog_id = ".(int) $blog_id."
 			ORDER BY system_task, title";
 		$result = Database::query($sql);
 
@@ -1765,7 +1765,7 @@ 
 	 */
 	public static function display_edit_assigned_task_form($blog_id, $task_id, $user_id)
 	{
-		$tbl_blogs_tasks_rel_user 	= Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
+		$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
 
 		$course_id = api_get_course_int_id();
 
@@ -1774,9 +1774,9 @@ 
 			SELECT target_date
 			FROM $tbl_blogs_tasks_rel_user
 			WHERE c_id = $course_id AND
-			      blog_id = '".(int)$blog_id."' AND
-			      user_id = '".(int)$user_id."' AND
-			      task_id = '".(int)$task_id."'";
+			      blog_id = '".(int) $blog_id."' AND
+			      user_id = '".(int) $user_id."' AND
+			      task_id = '".(int) $task_id."'";
 		$result = Database::query($sql);
 		$row = Database::fetch_assoc($result);
 
@@ -1811,11 +1811,11 @@ 
 
 		$sql = "
 			SELECT COUNT(*) as 'number'
-			FROM " . $tbl_blogs_tasks_rel_user . "
+			FROM " . $tbl_blogs_tasks_rel_user."
 			WHERE c_id = $course_id AND
-			blog_id = " . (int)$blog_id . "
-			AND	user_id = " . (int)$user_id . "
-			AND	task_id = " . (int)$task_id . "
+			blog_id = ".(int) $blog_id."
+			AND	user_id = " . (int) $user_id."
+			AND	task_id = " . (int) $task_id."
 		";
 
 		$result = Database::query($sql);
@@ -1823,18 +1823,18 @@ 
 
 		if ($row['number'] == 0) {
 			$sql = "
-				INSERT INTO " . $tbl_blogs_tasks_rel_user . " (
+				INSERT INTO " . $tbl_blogs_tasks_rel_user." (
 					c_id,
 					blog_id,
 					user_id,
 					task_id,
 					target_date
 				) VALUES (
-					'" . (int)$course_id . "',
-					'" . (int)$blog_id . "',
-					'" . (int)$user_id . "',
-					'" . (int)$task_id . "',
-					'" . Database::escape_string($target_date) . "'
+					'" . (int) $course_id."',
+					'" . (int) $blog_id."',
+					'" . (int) $user_id."',
+					'" . (int) $task_id."',
+					'" . Database::escape_string($target_date)."'
 				)";
 
 			Database::query($sql);
@@ -1864,12 +1864,12 @@ 
 		$course_id = api_get_course_int_id();
 
 		$sql = "SELECT COUNT(*) as 'number'
-                FROM " . $tbl_blogs_tasks_rel_user . "
+                FROM " . $tbl_blogs_tasks_rel_user."
                 WHERE
                     c_id = $course_id AND
-                    blog_id = " . (int)$blog_id . " AND
-                    user_id = " . (int)$user_id . " AND
-                    task_id = " . (int)$task_id . "
+                    blog_id = ".(int) $blog_id." AND
+                    user_id = " . (int) $user_id." AND
+                    task_id = " . (int) $task_id."
             ";
 
 		$result = Database::query($sql);
@@ -1877,17 +1877,17 @@ 
 
 		if ($row['number'] == 0 || ($row['number'] != 0 && $task_id == $old_task_id && $user_id == $old_user_id)) {
 			$sql = "
-				UPDATE " . $tbl_blogs_tasks_rel_user . "
+				UPDATE " . $tbl_blogs_tasks_rel_user."
 				SET
-					user_id = " . (int)$user_id . ",
-					task_id = " . (int)$task_id . ",
-					target_date = '" . Database::escape_string($target_date) . "'
+					user_id = " . (int) $user_id.",
+					task_id = " . (int) $task_id.",
+					target_date = '" . Database::escape_string($target_date)."'
 				WHERE
 					c_id = $course_id AND
-					blog_id = " . (int)$blog_id . " AND
-					user_id = " . (int)$old_user_id . " AND
-					task_id = " . (int)$old_task_id . " AND
-					target_date = '" . Database::escape_string($old_target_date) . "'
+					blog_id = ".(int) $blog_id." AND
+					user_id = " . (int) $old_user_id." AND
+					task_id = " . (int) $old_task_id." AND
+					target_date = '" . Database::escape_string($old_target_date)."'
 			";
 			Database::query($sql);
 		}
@@ -1908,7 +1908,7 @@ 
 
 
 		$sql = "SELECT title, description FROM $tbl_blogs_tasks
-				WHERE task_id = '".(int)$task_id."'
+				WHERE task_id = '".(int) $task_id."'
 				AND c_id = $course_id";
 		$result = Database::query($sql);
 		$row = Database::fetch_assoc($result);
@@ -1916,19 +1916,19 @@ 
 		$sql = "SELECT post.*, user.lastname, user.firstname, user.username
 				FROM $tbl_blogs_posts post
 				INNER JOIN $tbl_users user ON post.author_id = user.user_id
-				WHERE post.blog_id = '".(int)$blog_id."' AND post.c_id = $course_id
+				WHERE post.blog_id = '".(int) $blog_id."' AND post.c_id = $course_id
 				ORDER BY post_id DESC
 				LIMIT 0, 100";
 		$result = Database::query($sql);
 
 		// Display
-		echo '<span class="blogpost_title">' . get_lang('SelectTaskArticle') . ' "' . stripslashes($row['title']) . '"</span>';
-		echo '<span style="font-style: italic;"">'.stripslashes($row['description']) . '</span><br><br>';
+		echo '<span class="blogpost_title">'.get_lang('SelectTaskArticle').' "'.stripslashes($row['title']).'"</span>';
+		echo '<span style="font-style: italic;"">'.stripslashes($row['description']).'</span><br><br>';
 
 		if (Database::num_rows($result) > 0) {
-			while($blog_post = Database::fetch_array($result)) {
+			while ($blog_post = Database::fetch_array($result)) {
 			    $username = api_htmlentities(sprintf(get_lang('LoginX'), $blog_post['username']), ENT_QUOTES);
-				echo '<a href="blog.php?action=execute_task&blog_id=' . $blog_id . '&task_id=' . $task_id . '&post_id=' . $blog_post['post_id'] . '#add_comment">'.stripslashes($blog_post['title']) . '</a>, ' . get_lang('WrittenBy') . ' ' . stripslashes(Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username))) . '<br />';
+				echo '<a href="blog.php?action=execute_task&blog_id='.$blog_id.'&task_id='.$task_id.'&post_id='.$blog_post['post_id'].'#add_comment">'.stripslashes($blog_post['title']).'</a>, '.get_lang('WrittenBy').' '.stripslashes(Display::tag('span', api_get_person_name($blog_post['firstname'], $blog_post['lastname']), array('title'=>$username))).'<br />';
 			}
         } else {
             echo get_lang('NoArticles');
@@ -1952,12 +1952,12 @@ 
 
 		// Subscribe the user
 		$sql = "INSERT INTO $tbl_blogs_rel_user (c_id, blog_id, user_id )
-		        VALUES ($course_id, '".(int)$blog_id."', '".(int)$user_id."');";
+		        VALUES ($course_id, '".(int) $blog_id."', '".(int) $user_id."');";
 		Database::query($sql);
 
 		// Give this user basic rights
 		$sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
-		        VALUES ($course_id, '".(int)$user_id."','BLOG_" . (int)$blog_id."','article_add')";
+		        VALUES ($course_id, '".(int) $user_id."','BLOG_".(int) $blog_id."','article_add')";
 		Database::query($sql);
 
         $id = Database::insert_id();
@@ -1967,7 +1967,7 @@ 
         }
 
 		$sql = "INSERT INTO $tbl_user_permissions (c_id, user_id,tool,action)
-		        VALUES ($course_id, '".(int)$user_id."','BLOG_" . (int)$blog_id."','article_comments_add')";
+		        VALUES ($course_id, '".(int) $user_id."','BLOG_".(int) $blog_id."','article_comments_add')";
 		Database::query($sql);
 
         $id = Database::insert_id();
@@ -1993,12 +1993,12 @@ 
 
 		// Unsubscribe the user
 		$sql = "DELETE FROM $tbl_blogs_rel_user
-		        WHERE blog_id = '".(int)$blog_id."' AND user_id = '".(int)$user_id."'";
+		        WHERE blog_id = '".(int) $blog_id."' AND user_id = '".(int) $user_id."'";
 		Database::query($sql);
 
 		// Remove this user's permissions.
 		$sql = "DELETE FROM $tbl_user_permissions
-		        WHERE user_id = '".(int)$user_id."'";
+		        WHERE user_id = '".(int) $user_id."'";
 		Database::query($sql);
 	}
 
@@ -2019,7 +2019,7 @@ 
 		$course_id = $_course['real_id'];
 
 		$currentCourse = $_course['code'];
-		$tbl_users 			= Database::get_main_table(TABLE_MAIN_USER);
+		$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
 		$tbl_blogs_rel_user = Database::get_course_table(TABLE_BLOGS_REL_USER);
 
 		echo '<legend>'.get_lang('SubscribeMembers').'</legend>';
@@ -2034,12 +2034,12 @@ 
 		$result = Database::query($sql);
 
 		$blog_member_ids = array();
-		while($user = Database::fetch_array($result)) {
+		while ($user = Database::fetch_array($result)) {
 			$blog_member_ids[] = $user['user_id'];
 		}
 
 		// Set table headers
-		$column_header[] = array ('', false, '');
+		$column_header[] = array('', false, '');
 		if ($is_western_name_order) {
 			$column_header[] = array(get_lang('FirstName'), true, '');
 			$column_header[] = array(get_lang('LastName'), true, '');
@@ -2059,13 +2059,13 @@ 
 
 		// Add users that are not in this blog to the list.
 		foreach ($student_list as $key=>$user) {
-			if(isset($user['id_user'])) {
+			if (isset($user['id_user'])) {
 				$user['user_id'] = $user['id_user'];
 			}
-			if(!in_array($user['user_id'],$blog_member_ids)) {
+			if (!in_array($user['user_id'], $blog_member_ids)) {
 				$a_infosUser = api_get_user_info($user['user_id']);
-				$row = array ();
-				$row[] = '<input type="checkbox" name="user[]" value="' . $a_infosUser['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "subscribe") ? ' checked="checked" ' : '') . '/>';
+				$row = array();
+				$row[] = '<input type="checkbox" name="user[]" value="'.$a_infosUser['user_id'].'" '.((isset($_GET['selectall']) && $_GET['selectall'] == "subscribe") ? ' checked="checked" ' : '').'/>';
 				$username = api_htmlentities(sprintf(get_lang('LoginX'), $a_infosUser["username"]), ENT_QUOTES);
 				if ($is_western_name_order) {
 					$row[] = $a_infosUser["firstname"];
@@ -2077,8 +2077,8 @@ 
 				$row[] = Display::icon_mailto_link($a_infosUser["email"]);
 
 				//Link to register users
-				if ($a_infosUser["user_id"] != $_SESSION['_user']['user_id']){
-					$row[] = "<a class=\"btn btn-primary \" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&register=yes&user_id=" . $a_infosUser["user_id"]."\">" . get_lang('Register')."</a>";
+				if ($a_infosUser["user_id"] != $_SESSION['_user']['user_id']) {
+					$row[] = "<a class=\"btn btn-primary \" href=\"".api_get_self()."?action=manage_members&blog_id=$blog_id&register=yes&user_id=".$a_infosUser["user_id"]."\">".get_lang('Register')."</a>";
 				} else {
 					$row[] = '';
 				}
@@ -2089,20 +2089,20 @@ 
 		// Display
 		$query_vars['action'] = 'manage_members';
 		$query_vars['blog_id'] = $blog_id;
-		echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
-			Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
+		echo '<form method="post" action="blog.php?action=manage_members&blog_id='.$blog_id.'">';
+			Display::display_sortable_table($column_header, $user_data, null, null, $query_vars);
 			$link = '';
-			$link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']) . '&' : '';
+			$link .= isset ($_GET['action']) ? 'action='.Security::remove_XSS($_GET['action']).'&' : '';
 			$link .= "blog_id=$blog_id&";
 
-			echo '<a href="blog.php?' . $link . 'selectall=subscribe">' . get_lang('SelectAll') . '</a> - ';
-			echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
-			echo get_lang('WithSelected') . ' : ';
+			echo '<a href="blog.php?'.$link.'selectall=subscribe">'.get_lang('SelectAll').'</a> - ';
+			echo '<a href="blog.php?'.$link.'">'.get_lang('UnSelectAll').'</a> ';
+			echo get_lang('WithSelected').' : ';
 			echo '<select name="action">';
-			echo '<option value="select_subscribe">' . get_lang('Register') . '</option>';
+			echo '<option value="select_subscribe">'.get_lang('Register').'</option>';
 			echo '</select>';
 			echo '<input type="hidden" name="register" value="true" />';
-			echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
+			echo '<button class="save" type="submit">'.get_lang('Ok').'</button>';
 		echo '</form>';
 	}
 
@@ -2115,7 +2115,7 @@ 
 	 *
 	 * @return Html Form with sortable table with users to unsubcribe from a blog.
 	 */
-	public static function display_form_user_unsubscribe ($blog_id)
+	public static function display_form_user_unsubscribe($blog_id)
 	{
 		$_user = api_get_user_info();
 		$is_western_name_order = api_is_western_name_order();
@@ -2128,34 +2128,34 @@ 
 
 		$properties["width"] = "100%";
 		//table column titles
-		$column_header[] = array ('', false, '');
+		$column_header[] = array('', false, '');
 		if ($is_western_name_order) {
-			$column_header[] = array (get_lang('FirstName'), true, '');
-			$column_header[] = array (get_lang('LastName'), true, '');
+			$column_header[] = array(get_lang('FirstName'), true, '');
+			$column_header[] = array(get_lang('LastName'), true, '');
 		} else {
-			$column_header[] = array (get_lang('LastName'), true, '');
-			$column_header[] = array (get_lang('FirstName'), true, '');
+			$column_header[] = array(get_lang('LastName'), true, '');
+			$column_header[] = array(get_lang('FirstName'), true, '');
 		}
-		$column_header[] = array (get_lang('Email'), false, '');
-		$column_header[] = array (get_lang('TaskManager'), true, '');
-		$column_header[] = array (get_lang('UnRegister'), false, '');
+		$column_header[] = array(get_lang('Email'), false, '');
+		$column_header[] = array(get_lang('TaskManager'), true, '');
+		$column_header[] = array(get_lang('UnRegister'), false, '');
 
 		$course_id = api_get_course_int_id();
 
 		$sql = "SELECT user.user_id, user.lastname, user.firstname, user.email, user.username
                 FROM $tbl_users user INNER JOIN $tbl_blogs_rel_user blogs_rel_user
                 ON user.user_id = blogs_rel_user.user_id
-                WHERE blogs_rel_user.c_id = $course_id AND  blogs_rel_user.blog_id = '".(int)$blog_id."'";
+                WHERE blogs_rel_user.c_id = $course_id AND  blogs_rel_user.blog_id = '".(int) $blog_id."'";
 
 		if (!($sql_result = Database::query($sql))) {
 			return false;
 		}
 
-		$user_data = array ();
+		$user_data = array();
 
 		while ($myrow = Database::fetch_array($sql_result)) {
-			$row = array ();
-			$row[] = '<input type="checkbox" name="user[]" value="' . $myrow['user_id'] . '" '.((isset($_GET['selectall']) && $_GET['selectall'] == "unsubscribe") ? ' checked="checked" ' : '') . '/>';
+			$row = array();
+			$row[] = '<input type="checkbox" name="user[]" value="'.$myrow['user_id'].'" '.((isset($_GET['selectall']) && $_GET['selectall'] == "unsubscribe") ? ' checked="checked" ' : '').'/>';
 			$username = api_htmlentities(sprintf(get_lang('LoginX'), $myrow["username"]), ENT_QUOTES);
 			if ($is_western_name_order) {
 				$row[] = $myrow["firstname"];
@@ -2167,19 +2167,19 @@ 
 			$row[] = Display::icon_mailto_link($myrow["email"]);
 
 			$sql = "SELECT bt.title task
-					FROM " . Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER) . " btu
-					INNER JOIN " . Database::get_course_table(TABLE_BLOGS_TASKS) . " bt
+					FROM " . Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER)." btu
+					INNER JOIN " . Database::get_course_table(TABLE_BLOGS_TASKS)." bt
 					ON btu.task_id = bt.task_id
 					WHERE 	btu.c_id 	= $course_id  AND
 							bt.c_id 	= $course_id  AND
 							btu.blog_id = $blog_id AND
-							btu.user_id = " . $myrow['user_id'];
+							btu.user_id = ".$myrow['user_id'];
 			$sql_res = Database::query($sql);
 
 			$task = '';
 
-			while($r = Database::fetch_array($sql_res)) {
-				$task .= stripslashes($r['task']) . ', ';
+			while ($r = Database::fetch_array($sql_res)) {
+				$task .= stripslashes($r['task']).', ';
 			}
 			//echo $task;
 			$task = (api_strlen(trim($task)) != 0) ? api_substr($task, 0, api_strlen($task) - 2) : get_lang('Reader');
@@ -2187,7 +2187,7 @@ 
 			//Link to register users
 
 			if ($myrow["user_id"] != $_user['user_id']) {
-				$row[] = "<a class=\"btn btn-primary\" href=\"" .api_get_self()."?action=manage_members&blog_id=$blog_id&unregister=yes&user_id=" . $myrow['user_id']."\">" . get_lang('UnRegister')."</a>";
+				$row[] = "<a class=\"btn btn-primary\" href=\"".api_get_self()."?action=manage_members&blog_id=$blog_id&unregister=yes&user_id=".$myrow['user_id']."\">".get_lang('UnRegister')."</a>";
 			} else {
 				$row[] = '';
 			}
@@ -2197,20 +2197,20 @@ 
 
 		$query_vars['action'] = 'manage_members';
 		$query_vars['blog_id'] = $blog_id;
-		echo '<form method="post" action="blog.php?action=manage_members&blog_id=' . $blog_id . '">';
-		Display::display_sortable_table($column_header, $user_data,null,null,$query_vars);
+		echo '<form method="post" action="blog.php?action=manage_members&blog_id='.$blog_id.'">';
+		Display::display_sortable_table($column_header, $user_data, null, null, $query_vars);
 		$link = '';
-		$link .= isset ($_GET['action']) ? 'action=' . Security::remove_XSS($_GET['action']). '&' : '';
+		$link .= isset ($_GET['action']) ? 'action='.Security::remove_XSS($_GET['action']).'&' : '';
 		$link .= "blog_id=$blog_id&";
 
-		echo '<a href="blog.php?' . $link . 'selectall=unsubscribe">' . get_lang('SelectAll') . '</a> - ';
-		echo '<a href="blog.php?' . $link . '">' . get_lang('UnSelectAll') . '</a> ';
-		echo get_lang('WithSelected') . ' : ';
+		echo '<a href="blog.php?'.$link.'selectall=unsubscribe">'.get_lang('SelectAll').'</a> - ';
+		echo '<a href="blog.php?'.$link.'">'.get_lang('UnSelectAll').'</a> ';
+		echo get_lang('WithSelected').' : ';
 		echo '<select name="action">';
-		echo '<option value="select_unsubscribe">' . get_lang('UnRegister') . '</option>';
+		echo '<option value="select_unsubscribe">'.get_lang('UnRegister').'</option>';
 		echo '</select>';
 		echo '<input type="hidden" name="unregister" value="true" />';
-		echo '<button class="save" type="submit">' . get_lang('Ok') . '</button>';
+		echo '<button class="save" type="submit">'.get_lang('Ok').'</button>';
 		echo '</form>';
 	}
 
@@ -2220,7 +2220,7 @@ 
 	 *
 	 * @param Integer $blog_id
 	 */
-	public static function display_form_user_rights ($blog_id)
+	public static function display_form_user_rights($blog_id)
     {
 		echo '<legend>'.get_lang('RightsManager').'</legend>';
 		echo '<br />';
@@ -2240,7 +2240,7 @@ 
 		$form = new FormValidator(
 			'add_post',
 			'post',
-			api_get_path(WEB_CODE_PATH)."blog/blog.php?action=view_post&blog_id=" . intval($blog_id)  . "&post_id=".intval($post_id)."&".api_get_cidreq(),
+			api_get_path(WEB_CODE_PATH)."blog/blog.php?action=view_post&blog_id=".intval($blog_id)."&post_id=".intval($post_id)."&".api_get_cidreq(),
 			null,
 			array('enctype' => 'multipart/form-data')
 		);
@@ -2308,21 +2308,21 @@ 
 		$course_id = api_get_course_int_id();
 
 		//Handle leap year
-		$numberofdays = array (0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
+		$numberofdays = array(0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
 
-		if(($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
+		if (($year % 400 == 0) or ($year % 4 == 0 and $year % 100 <> 0))
 			$numberofdays[2] = 29;
 
 		//Get the first day of the month
 		$dayone = getdate(mktime(0, 0, 0, $month, 1, $year));
-		$monthName = $MonthsLong[$month-1];
+		$monthName = $MonthsLong[$month - 1];
 
 		//Start the week on monday
 		$startdayofweek = $dayone['wday'] <> 0 ? ($dayone['wday'] - 1) : 6;
 		$blogId = isset($_GET['blog_id']) ? intval($_GET['blog_id']) : null;
 		$filter = isset($_GET['filter']) ? Security::remove_XSS($_GET['filter']) : null;
-		$backwardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 1 ? 12 : $month -1)."&year=". ($month == 1 ? $year -1 : $year);
-		$forewardsURL = api_get_self()."?blog_id=" . $blogId."&filter=" . $filter."&month=". ($month == 12 ? 1 : $month +1)."&year=". ($month == 12 ? $year +1 : $year);
+		$backwardsURL = api_get_self()."?blog_id=".$blogId."&filter=".$filter."&month=".($month == 1 ? 12 : $month - 1)."&year=".($month == 1 ? $year - 1 : $year);
+		$forewardsURL = api_get_self()."?blog_id=".$blogId."&filter=".$filter."&month=".($month == 12 ? 1 : $month + 1)."&year=".($month == 12 ? $year + 1 : $year);
 
 		// Get posts for this month
 		$sql = "SELECT post.*, DAYOFMONTH(date_creation) as post_day, user.lastname, user.firstname
@@ -2331,15 +2331,15 @@ 
 				ON post.author_id = user.user_id
 				WHERE
 					post.c_id = $course_id AND
-					post.blog_id = '".(int)$blog_id."' AND
-					MONTH(date_creation) = '".(int)$month."' AND
-					YEAR(date_creation) = '".(int)$year."'
+					post.blog_id = '".(int) $blog_id."' AND
+					MONTH(date_creation) = '".(int) $month."' AND
+					YEAR(date_creation) = '".(int) $year."'
 				ORDER BY date_creation";
 		$result = Database::query($sql);
 
 		// We will create an array of days on which there are posts.
-		if( Database::num_rows($result) > 0) {
-			while($blog_post = Database::fetch_array($result)) {
+		if (Database::num_rows($result) > 0) {
+			while ($blog_post = Database::fetch_array($result)) {
 				// If the day of this post is not yet in the array, add it.
 				if (!in_array($blog_post['post_day'], $posts))
 					$posts[] = $blog_post['post_day'];
@@ -2356,9 +2356,9 @@ 
 					task_rel_user.c_id = $course_id AND
 					task.c_id = $course_id AND
 					blog.c_id = $course_id AND
-					task_rel_user.user_id = '".(int)$_user['user_id']."' AND
-					MONTH(target_date) = '".(int)$month."' AND
-					YEAR(target_date) = '".(int)$year."'
+					task_rel_user.user_id = '".(int) $_user['user_id']."' AND
+					MONTH(target_date) = '".(int) $month."' AND
+					YEAR(target_date) = '".(int) $year."'
 				ORDER BY target_date ASC";
 			$result = Database::query($sql);
 
@@ -2381,7 +2381,7 @@ 
 
 		echo "<tr>\n";
 
-		for($ii = 1; $ii < 8; $ii ++)
+		for ($ii = 1; $ii < 8; $ii++)
 			echo "<td class=\"weekdays\">", $DaysShort[$ii % 7], "</td>";
 
 		echo "</tr>";
@@ -2391,24 +2391,24 @@ 
 
 		while ($curday <= $numberofdays[$month]) {
 			echo "<tr>";
-			for ($ii = 0; $ii < 7; $ii ++) {
+			for ($ii = 0; $ii < 7; $ii++) {
 				if (($curday == -1) && ($ii == $startdayofweek))
 					$curday = 1;
 
 			 	if (($curday > 0) && ($curday <= $numberofdays[$month])) {
-					$bgcolor = $ii < 5 ? $class="class=\"days_week\"" : $class="class=\"days_weekend\"";
+					$bgcolor = $ii < 5 ? $class = "class=\"days_week\"" : $class = "class=\"days_weekend\"";
 					$dayheader = "$curday";
 
-					if(($curday == $today['mday']) && ($year == $today['year']) && ($month == $today['mon'])) {
+					if (($curday == $today['mday']) && ($year == $today['year']) && ($month == $today['mon'])) {
 						$dayheader = "$curday";
 						$class = "class=\"days_today\"";
 					}
 
-					echo "<td " . $class.">";
+					echo "<td ".$class.">";
 
 					// If there are posts on this day, create a filter link.
-					if(in_array($curday, $posts))
-						echo '<a href="blog.php?blog_id=' . $blog_id . '&filter=' . $year . '-' . $month . '-' . $curday . '&month=' . $month . '&year=' . $year . '" title="' . get_lang('ViewPostsOfThisDay') . '">' . $curday . '</a>';
+					if (in_array($curday, $posts))
+						echo '<a href="blog.php?blog_id='.$blog_id.'&filter='.$year.'-'.$month.'-'.$curday.'&month='.$month.'&year='.$year.'" title="'.get_lang('ViewPostsOfThisDay').'">'.$curday.'</a>';
 					else
 						echo $dayheader;
 
@@ -2416,14 +2416,14 @@ 
 						if (isset($tasks[$curday]) && is_array($tasks[$curday])) {
 							// Add tasks to calendar
 							foreach ($tasks[$curday] as $task) {
-								echo '<a href="blog.php?action=execute_task&blog_id=' . $task['blog_id'] . '&task_id='.stripslashes($task['task_id']) . '" title="' . $task['title'] . ' : ' . get_lang('InBlog') . ' : ' . $task['blog_name'] . ' - ' . get_lang('ExecuteThisTask') . '">
-								<img src="../img/blog_task.gif" alt="Task" title="' . get_lang('ExecuteThisTask') . '" /></a>';
+								echo '<a href="blog.php?action=execute_task&blog_id='.$task['blog_id'].'&task_id='.stripslashes($task['task_id']).'" title="'.$task['title'].' : '.get_lang('InBlog').' : '.$task['blog_name'].' - '.get_lang('ExecuteThisTask').'">
+								<img src="../img/blog_task.gif" alt="Task" title="' . get_lang('ExecuteThisTask').'" /></a>';
 							}
 						}
 					}
 
 					echo "</td>";
-					$curday ++;
+					$curday++;
 				} else
 					echo "<td>&nbsp;</td>";
 			}
@@ -2461,7 +2461,7 @@ 
 	public static function display_edit_blog_form($blog_id)
 	{
 	    $course_id = api_get_course_int_id();
-		$blog_id= intval($blog_id);
+		$blog_id = intval($blog_id);
 		$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
 
 		$sql = "SELECT blog_id, blog_name, blog_subtitle
@@ -2476,7 +2476,7 @@ 
 			$blog['blog_subtitle'] = Security::remove_XSS($_POST['blog_subtitle']);
 		}
 
-        $form = new FormValidator('edit_blog', 'post','blog_admin.php?action=edit&blog_id='.intval($_GET['blog_id']));
+        $form = new FormValidator('edit_blog', 'post', 'blog_admin.php?action=edit&blog_id='.intval($_GET['blog_id']));
         $form->addElement('header', get_lang('EditBlog'));
         $form->addElement('text', 'blog_name', get_lang('Title'));
         $form->addElement('textarea', 'blog_subtitle', get_lang('SubTitle'));
@@ -2513,8 +2513,8 @@ 
 		$result = Database::query($sql);
 		$list_info = array();
 		if (Database::num_rows($result)) {
-			while ($row_project=Database::fetch_row($result)) {
-				$list_info[]=$row_project;
+			while ($row_project = Database::fetch_row($result)) {
+				$list_info[] = $row_project;
 			}
 		}
 
@@ -2526,39 +2526,39 @@ 
 				// Validation when belongs to a session
 				$session_img = api_get_session_image($info_log[4], $_user['status']);
 
-				$url_start_blog = 'blog.php' ."?". "blog_id=".$info_log[3]. "&".api_get_cidreq();
+				$url_start_blog = 'blog.php'."?"."blog_id=".$info_log[3]."&".api_get_cidreq();
 				$title = $info_log[0];
                         $image = Display::return_icon('blog.png', $title);
-    			$list_name = '<div style="float: left; width: 35px; height: 22px;"><a href="'.$url_start_blog.'">' . $image . '</a></div><a href="'.$url_start_blog.'">' .$title. '</a>' . $session_img;
+    			$list_name = '<div style="float: left; width: 35px; height: 22px;"><a href="'.$url_start_blog.'">'.$image.'</a></div><a href="'.$url_start_blog.'">'.$title.'</a>'.$session_img;
 
 				$list_body_blog[] = $list_name;
 				$list_body_blog[] = $info_log[1];
 
-				$visibility_icon=($info_log[2]==0) ? 'invisible' : 'visible';
-				$visibility_info=($info_log[2]==0) ? 'Visible' : 'Invisible';
-			 	$my_image = '<a href="' .api_get_self(). '?action=edit&blog_id=' . $info_log[3] . '">';
-                                $my_image.= Display::return_icon('edit.png', get_lang('EditBlog'));
+				$visibility_icon = ($info_log[2] == 0) ? 'invisible' : 'visible';
+				$visibility_info = ($info_log[2] == 0) ? 'Visible' : 'Invisible';
+			 	$my_image = '<a href="'.api_get_self().'?action=edit&blog_id='.$info_log[3].'">';
+                                $my_image .= Display::return_icon('edit.png', get_lang('EditBlog'));
 
-				$my_image.= "</a>\n";
-				$my_image.= '<a href="' .api_get_self(). '?action=delete&blog_id=' . $info_log[3] . '" ';
-				$my_image.= 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;" >';
-                                $my_image.= Display::return_icon('delete.png', get_lang('DeleteBlog'));
+				$my_image .= "</a>\n";
+				$my_image .= '<a href="'.api_get_self().'?action=delete&blog_id='.$info_log[3].'" ';
+				$my_image .= 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)).'\')) return false;" >';
+                                $my_image .= Display::return_icon('delete.png', get_lang('DeleteBlog'));
 
-				$my_image.= "</a>\n";
-				$my_image.= '<a href="' .api_get_self(). '?action=visibility&blog_id=' . $info_log[3] . '">';
-                                $my_image.= Display::return_icon($visibility_icon . '.gif', get_lang($visibility_info));
+				$my_image .= "</a>\n";
+				$my_image .= '<a href="'.api_get_self().'?action=visibility&blog_id='.$info_log[3].'">';
+                                $my_image .= Display::return_icon($visibility_icon.'.gif', get_lang($visibility_info));
 
-				$my_image.= "</a>\n";
+				$my_image .= "</a>\n";
 
-				$list_body_blog[]=$my_image;
+				$list_body_blog[] = $my_image;
 
-				$list_content_blog[]=$list_body_blog;
+				$list_content_blog[] = $list_body_blog;
 				$list_body_blog = array();
 
 			}
-			$parameters='';
+			$parameters = '';
 			//$parameters=array('action'=>Security::remove_XSS($_GET['action']));
-			$table = new SortableTableFromArrayConfig($list_content_blog, 1,20,'project');
+			$table = new SortableTableFromArrayConfig($list_content_blog, 1, 20, 'project');
 			//$table->set_additional_parameters($parameters);
 			$table->set_header(0, get_lang('Title'));
 			$table->set_header(1, get_lang('SubTitle'));
@@ -2583,34 +2583,34 @@ 
  * @author Julio Montoya Dokeos
  * @version avril 2008, dokeos 1.8.5
  */
-function get_blog_attachment($blog_id, $post_id=null,$comment_id=null)
+function get_blog_attachment($blog_id, $post_id = null, $comment_id = null)
 {
 	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
 
 	$blog_id = intval($blog_id);
 	$comment_id = intval($comment_id);
 	$post_id = intval($post_id);
-	$row=array();
-	$where='';
+	$row = array();
+	$where = '';
 	if (!empty ($post_id) && is_numeric($post_id)) {
-		$where.=' AND post_id ="'.$post_id.'" ';
+		$where .= ' AND post_id ="'.$post_id.'" ';
 	}
 
 	if (!empty ($comment_id) && is_numeric($comment_id)) {
 		if (!empty ($post_id)) {
-			$where.= ' AND ';
+			$where .= ' AND ';
 		}
-		$where.=' comment_id ="'.$comment_id.'" ';
+		$where .= ' comment_id ="'.$comment_id.'" ';
 	}
 
     $course_id = api_get_course_int_id();
 
-	$sql = 'SELECT path, filename, comment FROM '. $blog_table_attachment.'
+	$sql = 'SELECT path, filename, comment FROM '.$blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
 
-	$result=Database::query($sql);
-	if (Database::num_rows($result)!=0) {
-		$row=Database::fetch_array($result);
+	$result = Database::query($sql);
+	if (Database::num_rows($result) != 0) {
+		$row = Database::fetch_array($result);
 	}
 	return $row;
 }
@@ -2624,7 +2624,7 @@ 
  * @version avril 2008, dokeos 1.8.5
  */
 
-function delete_all_blog_attachment($blog_id,$post_id=null,$comment_id=null)
+function delete_all_blog_attachment($blog_id, $post_id = null, $comment_id = null)
 {
 	$_course = api_get_course_info();
 	$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
@@ -2648,22 +2648,22 @@ 
     }
 
 	// delete all files in directory
-	$courseDir   = $_course['path'].'/upload/blog';
+	$courseDir = $_course['path'].'/upload/blog';
 	$sys_course_path = api_get_path(SYS_COURSE_PATH);
 	$updir = $sys_course_path.$courseDir;
 
 	$sql = 'SELECT path FROM '.$blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND blog_id ="'.intval($blog_id).'"  '.$where;
-	$result=Database::query($sql);
+	$result = Database::query($sql);
 
-	while ($row=Database::fetch_row($result)) {
-		$file=$updir.'/'.$row[0];
-		if (Security::check_abs_path($file,$updir) )
+	while ($row = Database::fetch_row($result)) {
+		$file = $updir.'/'.$row[0];
+		if (Security::check_abs_path($file, $updir))
 		{
 			@ unlink($file);
 		}
 	}
-	$sql = 'DELETE FROM '. $blog_table_attachment.'
+	$sql = 'DELETE FROM '.$blog_table_attachment.'
 	        WHERE c_id = '.$course_id.' AND  blog_id ="'.intval($blog_id).'"  '.$where;
 	Database::query($sql);
 }
@@ -2676,8 +2676,8 @@ 
 function get_blog_post_from_user($course_code, $user_id)
 {
 	$tbl_blogs 		= Database::get_course_table(TABLE_BLOGS);
-	$tbl_blog_post 	= Database::get_course_table(TABLE_BLOGS_POSTS);
-	$course_info 	= api_get_course_info($course_code);
+	$tbl_blog_post = Database::get_course_table(TABLE_BLOGS_POSTS);
+	$course_info = api_get_course_info($course_code);
 	$course_id 		= $course_info['real_id'];
 
 	$sql = "SELECT DISTINCT blog.blog_id, post_id, title, full_text, post.date_creation
@@ -2692,13 +2692,13 @@ 
 	$result = Database::query($sql);
 	$return_data = '';
 
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png',get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
-			$return_data.= $row['full_text'];
-			$return_data.= '<br /><br />';
+	if (Database::num_rows($result) != 0) {
+		while ($row = Database::fetch_array($result)) {
+			$return_data .= '<div class="clear"></div><br />';
+			$return_data .= '<div class="actions" style="margin-left:5px;margin-right:5px;">'.Display::return_icon('blog_article.png', get_lang('BlogPosts')).' '.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.$my_course_id.' " >'.get_lang('SeeBlog').'</a></div></div>';
+			$return_data .= '<br / >';
+			$return_data .= $row['full_text'];
+			$return_data .= '<br /><br />';
 		}
 	}
 	return $return_data;
@@ -2728,14 +2728,14 @@ 
 			ORDER BY blog_name";
 	$result = Database::query($sql);
 	$return_data = '';
-	if (Database::num_rows($result)!=0) {
-		while ($row=Database::fetch_array($result)) {
-			$return_data.=  '<div class="clear"></div><br />';
-			$return_data.=  '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
-			$return_data.=  '<br / >';
+	if (Database::num_rows($result) != 0) {
+		while ($row = Database::fetch_array($result)) {
+			$return_data .= '<div class="clear"></div><br />';
+			$return_data .= '<div class="actions" style="margin-left:5px;margin-right:5px;">'.$row['title'].'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<div style="float:right;margin-top:-18px"><a href="../blog/blog.php?blog_id='.$row['blog_id'].'&gidReq=&cidReq='.Security::remove_XSS($course_code).' " >'.get_lang('SeeBlog').'</a></div></div>';
+			$return_data .= '<br / >';
 			//$return_data.=  '<strong>'.$row['title'].'</strong>'; echo '<br>';*/
-			$return_data.=  $row['comment'];
-			$return_data.=  '<br />';
+			$return_data .= $row['comment'];
+			$return_data .= '<br />';
 		}
 	}
 	return $return_data;

main/inc/lib/plugin.class.php

Spacing +8 added lines, -8 removed lines

@@ -60,7 +60,7 @@ 
         $this->fields = $settings;
 
         global $language_files;
-        $language_files[] = 'plugin_' . $this->get_name();
+        $language_files[] = 'plugin_'.$this->get_name();
     }
 
     /**
@@ -266,7 +266,7 @@ 
     {
         $settings = $this->get_settings();
         foreach ($settings as $setting) {
-            if ($setting['variable'] == ($this->get_name() . '_' . $name)) {
+            if ($setting['variable'] == ($this->get_name().'_'.$name)) {
                 return $setting['selected_value'];
             }
         }
@@ -321,7 +321,7 @@ 
 
             $interfaceLanguageId = api_get_language_id($language_interface);
             $interfaceLanguageInfo = api_get_language_info($interfaceLanguageId);
-            $languageParentId = (!empty($interfaceLanguageInfo['parent_id'])?intval($interfaceLanguageInfo['parent_id']):0);
+            $languageParentId = (!empty($interfaceLanguageInfo['parent_id']) ? intval($interfaceLanguageInfo['parent_id']) : 0);
 
             //1. Loading english if exists
             $english_path = $root.$plugin_name."/lang/english.php";
@@ -399,7 +399,7 @@ 
         if (!empty($this->course_settings)) {
             foreach ($this->course_settings as $setting) {
                 $variable = $setting['name'];
-                $value ='';
+                $value = '';
                 if (isset($setting['init_value'])) {
                     $value = ($setting['init_value']);
                 }
@@ -611,7 +611,7 @@ 
 
         //Avoid Tab Name Spaces
         $tabNameNoSpaces = preg_replace('/\s+/', '', $tabName);
-        $subkeytext = "Tabs" . $tabNameNoSpaces;
+        $subkeytext = "Tabs".$tabNameNoSpaces;
 
         //Check if it is already added
         $checkCondition = array(
@@ -627,7 +627,7 @@ 
             return false;
         }
         //End Check
-        $subkey = 'custom_tab_' . $tabNum;
+        $subkey = 'custom_tab_'.$tabNum;
         $attributes = array(
             'variable' => 'show_tabs',
             'subkey' => $subkey,
@@ -645,7 +645,7 @@ 
 
         //Save the id
         $settings = $this->get_settings();
-        $setData = array (
+        $setData = array(
             'comment' => $subkey
         );
         $whereCondition = array(
@@ -686,7 +686,7 @@ 
                 $i = 1;
                 foreach ($tabs as $row) {
                     $attributes = array(
-                        'subkey' => 'custom_tab_' . $i
+                        'subkey' => 'custom_tab_'.$i
                     );
                     $this->updateTab($row['subkey'], $attributes);
                     $i++;

main/inc/lib/events.lib.php

Spacing +10 added lines, -12 removed lines

@@ -78,9 +78,7 @@ 
         Database::query($sql);
 
         // Auto subscribe
-        $user_status = $userInfo['status']  == SESSIONADMIN ? 'sessionadmin' :
-            $userInfo['status'] == COURSEMANAGER ? 'teacher' :
-                $userInfo['status'] == DRH ? 'DRH' : 'student';
+        $user_status = $userInfo['status'] == SESSIONADMIN ? 'sessionadmin' : $userInfo['status'] == COURSEMANAGER ? 'teacher' : $userInfo['status'] == DRH ? 'DRH' : 'student';
         $autoSubscribe = api_get_setting($user_status.'_autosubscribe');
         if ($autoSubscribe) {
             $autoSubscribe = explode('|', $autoSubscribe);
@@ -334,7 +332,7 @@ 
         global $debug;
 
         if ($debug) error_log('Called to update_event_exercice');
-        if ($debug) error_log('duration:' . $duration);
+        if ($debug) error_log('duration:'.$duration);
 
         if ($exeid != '') {
             /*
@@ -382,7 +380,7 @@ 
         		   status = '".$status."',
         		   questions_to_check = '".$remind_list."',
         		   data_tracking = '".implode(',', $question_list)."',
-                   user_ip = '" . Database::escape_string(api_get_real_ip()) . "'
+                   user_ip = '" . Database::escape_string(api_get_real_ip())."'
         		 WHERE exe_id = '".Database::escape_string($exeid)."'";
             $res = Database::query($sql);
 
@@ -1036,15 +1034,15 @@ 
 
         if (!empty($exe_list) && is_array($exe_list) && count($exe_list) > 0) {
             $sql = "DELETE FROM $track_e_exercises
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
 
             $sql = "DELETE FROM $track_attempts
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
 
             $sql = "DELETE FROM $recording_table
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
         }
 
@@ -1086,7 +1084,7 @@ 
             Event::addEvent(
                 LOG_EXERCISE_RESULT_DELETE,
                 LOG_EXERCISE_AND_USER_ID,
-                $exercise_id . '-' . $user_id,
+                $exercise_id.'-'.$user_id,
                 null,
                 null,
                 $course_id,
@@ -1458,7 +1456,7 @@ 
         $res = Database::query($sql);
         $list = array();
         while ($row = Database::fetch_array($res, 'ASSOC')) {
-            $list[$row['exe_id']] = $row;  /*
+            $list[$row['exe_id']] = $row; /*
               $sql = "SELECT * FROM $table_track_attempt WHERE exe_id = {$row['exe_id']}";
               $res_question = Database::query($sql);
               while($row_q = Database::fetch_array($res_question,'ASSOC')) {
@@ -1684,7 +1682,7 @@ 
         Event::addEvent(
             LOG_QUESTION_RESULT_DELETE,
             LOG_EXERCISE_ATTEMPT_QUESTION_ID,
-            $exe_id . '-' . $question_id,
+            $exe_id.'-'.$question_id,
             null,
             null,
             $courseId,
@@ -1720,7 +1718,7 @@ 
         Event::addEvent(
             LOG_QUESTION_RESULT_DELETE,
             LOG_EXERCISE_ATTEMPT_QUESTION_ID,
-            $exe_id . '-' . $question_id,
+            $exe_id.'-'.$question_id,
             null,
             null,
             $courseId,