Skip to content

Commit

Permalink
cs
Browse files Browse the repository at this point in the history
  • Loading branch information
wojsmol committed May 14, 2016
1 parent 98ac974 commit 5fccbd4
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions plugins/user/joomla/joomla.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ public function onUserAfterSave($user, $isnew, $success, $msg)

// Compute the mail body.
$body_template = 'PLG_USER_JOOMLA_NEW_USER_EMAIL_BODY';

if ($this->params->get('include_password_in_mail_to_user', 1))
{
$emailBody =
JText::sprintf(
$emailBody = JText::sprintf(
$body_template,
$user['name'],
$this->app->get('sitename'),
Expand All @@ -134,11 +134,10 @@ public function onUserAfterSave($user, $isnew, $success, $msg)
$user['password_clear']
);
}
else
else
{
$body_template .= "_NOPW";
$emailBody =
JText::sprintf(
$emailBody = JText::sprintf(
$body_template,
$user['name'],
$this->app->get('sitename'),
Expand Down Expand Up @@ -239,6 +238,7 @@ public function onUserLogin($user, $options = array())
->set($this->db->quoteName('username') . ' = ' . $this->db->quote($instance->username))
->set($this->db->quoteName('userid') . ' = ' . (int) $instance->id)
->where($this->db->quoteName('session_id') . ' = ' . $this->db->quote($session->getId()));

try
{
$this->db->setQuery($query)->execute();
Expand Down Expand Up @@ -304,6 +304,7 @@ public function onUserLogout($user, $options = array())
->delete($this->db->quoteName('#__session'))
->where($this->db->quoteName('userid') . ' = ' . (int) $user['id'])
->where($this->db->quoteName('client_id') . ' = ' . (int) $options['clientid']);

try
{
$this->db->setQuery($query)->execute();
Expand Down

0 comments on commit 5fccbd4

Please sign in to comment.