Fixed admin login + emails

renlok · May 20, 2016 · 6ba8828 · 6ba8828
1 parent 2d1f170
commit 6ba8828
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/admin/login.php b/admin/login.php
@@ -105,7 +105,7 @@
 $template->assign_vars(array(
  'ERROR' => (isset($ERR)) ? $ERR : '',
  'SITEURL' => $system->SETTINGS['siteurl'],
- 'THEME' => $system->SETTINGS['theme'],
+ 'THEME' => $system->SETTINGS['admin_theme'],
  'L_COPY_YEAR' => date("Y"),
  'PAGE' => ($db->numrows() == 0) ? 1 : 2
  ));

diff --git a/includes/class_email_handler.php b/includes/class_email_handler.php
@@ -440,10 +440,15 @@ function sendmail()
  else
  $sent = mail($this->to, $this->subject, $this->message, $this->headers);
  }
+ if ($sent)
+ return false;
+ else
+ return true;
  break;
  }
 
- if (is_array($this->to)) {
+ if (is_array($this->to))
+ {
  for ($i = 0; $i < count($this->to); $i++)
  {
  try {
@@ -501,7 +506,7 @@ function sendmail()
  $this->add_error($e->getMessage());
  }
  }
- return implode('<br/>',$this->errors);
+ return implode('<br/>', $this->errors);
  }
 
  function email_basic($subject, $to, $message, $from = '')