Browse Source

Merge pull request #71 from lostlian/master

Set $definition as an optional parameter in create_group and fix depreciated valid_email function
develop v2.4.1
Emre Akay 10 years ago
parent
commit
50d7a4d3ae
  1. 9
      application/libraries/Aauth.php

9
application/libraries/Aauth.php

@ -713,7 +713,8 @@ class Aauth {
$this->error($this->CI->lang->line('aauth_error_email_exists')); $this->error($this->CI->lang->line('aauth_error_email_exists'));
$valid = FALSE; $valid = FALSE;
} }
if (!valid_email($email)){ $valid_email = (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
if (!$valid_email){
$this->error($this->CI->lang->line('aauth_error_email_invalid')); $this->error($this->CI->lang->line('aauth_error_email_invalid'));
$valid = FALSE; $valid = FALSE;
} }
@ -789,7 +790,8 @@ class Aauth {
$this->error($this->CI->lang->line('aauth_error_update_email_exists')); $this->error($this->CI->lang->line('aauth_error_update_email_exists'));
$valid = FALSE; $valid = FALSE;
} }
if (!valid_email($email)){ $valid_email = (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
if (!$valid_email){
$this->error($this->CI->lang->line('aauth_error_email_invalid')); $this->error($this->CI->lang->line('aauth_error_email_invalid'));
$valid = FALSE; $valid = FALSE;
} }
@ -1157,9 +1159,10 @@ class Aauth {
* Create group * Create group
* Creates a new group * Creates a new group
* @param string $group_name New group name * @param string $group_name New group name
* @param string $definition Description of the group
* @return int|bool Group id or FALSE on fail * @return int|bool Group id or FALSE on fail
*/ */
public function create_group($group_name, $definition) { public function create_group($group_name, $definition = '') {
$query = $this->aauth_db->get_where($this->config_vars['groups'], array('name' => $group_name)); $query = $this->aauth_db->get_where($this->config_vars['groups'], array('name' => $group_name));

Loading…
Cancel
Save