"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/action/login.php" between
wacko.6.1.18.zip and wacko.6.1.19.zip

About: WackoWiki is a multilingual Wiki-engine that supports WYTIWYG-editing, page rights (ACLs), design themes (skins), file upload, email notification and much more.

login.php  (wacko.6.1.18):login.php  (wacko.6.1.19)
skipping to change at line 103 skipping to change at line 103
$user_name = Ut::strip_spaces(($_POST['user_name'] ?? '')); $user_name = Ut::strip_spaces(($_POST['user_name'] ?? ''));
$password = (string) ($_POST['password'] ?? ''); $password = (string) ($_POST['password'] ?? '');
$email = (string) ($_POST['email'] ?? null); $email = (string) ($_POST['email'] ?? null);
$persistent = (bool) ($_POST['persistent'] ?? false); $persistent = (bool) ($_POST['persistent'] ?? false);
if ($this->sess->login_captcha && !$this->validate_captcha()) if ($this->sess->login_captcha && !$this->validate_captcha())
{ {
$error = $this->_t('CaptchaFailed'); $error = $this->_t('CaptchaFailed');
} }
else if (!preg_match('/^(' . $this->lang['USER_NAME'] . ')$/u', $ user_name)) else if (!preg_match('/^(' . self::PATTERN['USER_NAME'] . ')$/u', $user_name))
{ {
$error = $this->_t('InvalidUserName'); $error = $this->_t('InvalidUserName');
} }
else else
{ {
// let's begin pessimistically ;) // let's begin pessimistically ;)
$error = $this->_t('LoginIncorrect'); $error = $this->_t('LoginIncorrect');
// if user name already exists, check password // if user name already exists, check password
// check email dummy field in search for bots // check email dummy field in search for bots
skipping to change at line 171 skipping to change at line 171
&& ($cap = $this->show_captcha())) && ($cap = $this->show_captcha()))
{ {
$tpl->l_toomuch = true; $tpl->l_toomuch = true;
$tpl->l_show_captcha = $cap; $tpl->l_show_captcha = $cap;
$this->sess->login_captcha = 1; $this->sess->login_captcha = 1;
} }
} }
$tpl->l_href = $this->href(); $tpl->l_href = $this->href();
$tpl->l_pattern = $this->lang['USER_NAME']; $tpl->l_pattern = self::PATTERN['USER_NAME'];
$tpl->l_only = $tpl->l_only =
Ut::perc_replace($this->_t($this->db->disable_wikiname? 'NameAlph anumOnly' : 'NameCamelCaseOnly'), Ut::perc_replace($this->_t($this->db->disable_wikiname? 'NameAlph anumOnly' : 'NameCamelCaseOnly'),
$this->db->username_chars_min, $this->db->username_chars_min,
$this->db->username_chars_max); $this->db->username_chars_max);
$tpl->l_pwhref = $this->href('', $this->db->password_page); $tpl->l_pwhref = $this->href('', $this->db->password_page);
$tpl->l_username = @$this->sess->login_username; $tpl->l_username = @$this->sess->login_username;
if ($this->db->allow_registration) if ($this->db->allow_registration)
{ {
$tpl->l_welcome = true; $tpl->l_welcome = true;
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)