X-Git-Url: http://git.roojs.org/?p=Pman.Base;a=blobdiff_plain;f=Pman%2FLogin.php;h=d18cdd5dedd40b90148cc697fa5cab418e8b9760;hp=157f97e8b0a9afc46ceca1bcce233f3cc98d0fbf;hb=HEAD;hpb=86a7cdcdde58af05183ff3f88e5d496f10d35a20 diff --git a/Pman/Login.php b/Pman/Login.php index 157f97e..d1d1c8e 100644 --- a/Pman/Login.php +++ b/Pman/Login.php @@ -29,6 +29,13 @@ class Pman_Login extends Pman var $event_suffix = ''; + // for forgot password email + var $authFrom; + var $authKey; + var $person; + var $bcc; + var $rcpts; + function getAuth() // everyone allowed in here.. { @@ -450,12 +457,12 @@ class Pman_Login extends Pman // bcc.. $g = DB_DAtaObject::factory('core_group'); - if (!$g->get('name', 'bcc-email')) { - $this->jerr("no group 'bcc-email' exists in the system"); + if (!$cm->bcc_group_id || !$g->get($cm->bcc_group_id)) { + $this->jerr("BCC for ADMIN_PASSWORD_RESET email has not been set"); } $bcc = $g->members('email'); if (!count($bcc)) { - $this->jerr( "'bcc-email' group does not have any members"); + $this->jerr( "'BCC group for ADMIN_PASSWORD_RESET does not have any members"); } @@ -613,7 +620,7 @@ class Pman_Login extends Pman } if($core_ip_access->status == -2 && strtotime($core_ip_access->expire_dt) < strtotime('NOW')){ - $this->jerrpr('BLOCKED-IP-ADDRESS', "Your IP is blocked", array('ip' => $ip)); + $this->jerror('BLOCKED-IP-ADDRESS', "Your IP is blocked", array('ip' => $ip)); return; }