Index: branches/5.0.x/core/units/users/users_event_handler.php =================================================================== diff -u -r12299 -r12346 --- branches/5.0.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 12299) +++ branches/5.0.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 12346) @@ -1,6 +1,6 @@ Application->ConfigValue('User_SubscriberGroup'); - $sql = 'INSERT INTO '.TABLE_PREFIX.'UserGroup(PortalUserId,GroupId,PrimaryGroup) VALUES (%s,%s,'.$is_primary.')'; + $sql = 'INSERT INTO ' . TABLE_PREFIX . 'UserGroup + (PortalUserId, GroupId, PrimaryGroup) VALUES (%s, %s, ' . $is_primary . ')'; $this->Conn->Query( sprintf($sql, $user_id, $group_id) ); + $this->Application->EmailEventAdmin('USER.SUBSCRIBE', $user_id); $this->Application->EmailEventUser('USER.SUBSCRIBE', $user_id); - } - function RemoveSubscriberGroup($user_id){ - + function RemoveSubscriberGroup($user_id) + { $group_id = $this->Application->ConfigValue('User_SubscriberGroup'); - $sql = 'DELETE FROM '.TABLE_PREFIX.'UserGroup WHERE PortalUserId='.$user_id.' AND GroupId='.$this->Application->ConfigValue('User_SubscriberGroup'); + $sql = 'DELETE FROM ' . TABLE_PREFIX . 'UserGroup + WHERE PortalUserId = ' . $user_id . ' + AND GroupId = ' . $this->Application->ConfigValue('User_SubscriberGroup'); $this->Conn->Query($sql); + $this->Application->EmailEventAdmin('USER.UNSUBSCRIBE', $user_id); $this->Application->EmailEventUser('USER.UNSUBSCRIBE', $user_id); - } /** @@ -952,9 +955,9 @@ */ function GetGroupInfo($user_id) { - $sql = 'SELECT * - FROM '.TABLE_PREFIX.'UserGroup - WHERE (PortalUserId = '.$user_id.') AND (GroupId = '.$this->Application->ConfigValue('User_SubscriberGroup').')'; + $sql = 'SELECT * FROM ' . TABLE_PREFIX . 'UserGroup + WHERE (PortalUserId = ' . $user_id . ') + AND (GroupId = ' . $this->Application->ConfigValue('User_SubscriberGroup') . ')'; return $this->Conn->GetRow($sql); }