projects
/
living-lab-site.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
registration requires CAPTCHA
[living-lab-site.git]
/
application
/
controllers
/
user.php
diff --git
a/application/controllers/user.php
b/application/controllers/user.php
index
810069d
..
fad3ddf
100644
(file)
--- a/
application/controllers/user.php
+++ b/
application/controllers/user.php
@@
-26,7
+26,7
@@
class User extends CI_Controller {
public function test($user_id = 1)
{
public function test($user_id = 1)
{
-
// echo ($this->users_model->get_userdata('calin.burloiu') ? 'd' : 'n')
;
+
echo extension_loaded('gd') ? 'gd' : 'nu'
;
}
// DEBUG
}
// DEBUG
@@
-45,6
+45,13
@@
class User extends CI_Controller {
$this->session->sess_destroy();
}
$this->session->sess_destroy();
}
+
+ public function ajax_get_captcha()
+ {
+ $this->load->library('captcha');
+ $captcha = $this->captcha->get_captcha();
+ echo $captcha['image'];
+ }
/**
* Login a user and then redirect it to the last page which must be encoded
/**
* Login a user and then redirect it to the last page which must be encoded
@@
-215,6
+222,7
@@
class User extends CI_Controller {
if (! $b_validation)
{
// Edit account data if logged in, otherwise register.
if (! $b_validation)
{
// Edit account data if logged in, otherwise register.
+ // ** ACCOUNT
if ($user_id)
{
$userdata = $this->users_model->get_userdata(intval($user_id));
if ($user_id)
{
$userdata = $this->users_model->get_userdata(intval($user_id));
@@
-222,11
+230,18
@@
class User extends CI_Controller {
$userdata['autogen_username'] =
substr($userdata['username'], 8);
$selected_menu = 'account';
$userdata['autogen_username'] =
substr($userdata['username'], 8);
$selected_menu = 'account';
+ $captcha = FALSE;
}
}
+ // ** REGISTER
else
{
$userdata = FALSE;
$selected_menu = 'register';
else
{
$userdata = FALSE;
$selected_menu = 'register';
+
+ // CAPTCHA
+ $this->load->library('captcha');
+ $captcha = $this->captcha->get_captcha();
+ $captcha = $captcha['image'];
}
$params = array('title' =>
}
$params = array('title' =>
@@
-246,7
+261,7
@@
class User extends CI_Controller {
$main_params['content'] = $this->load->view('user/register_view',
array('userdata'=> $userdata, 'redirect'=> $redirect,
$main_params['content'] = $this->load->view('user/register_view',
array('userdata'=> $userdata, 'redirect'=> $redirect,
- 'error_upload'=> $error_upload),
+ 'error_upload'=> $error_upload
, 'captcha'=> $captcha
),
TRUE);
$main_params['side'] = $this->load->view('side_default', NULL, TRUE);
$this->load->view('main', $main_params);
TRUE);
$main_params['side'] = $this->load->view('side_default', NULL, TRUE);
$this->load->view('main', $main_params);
@@
-712,6
+727,13
@@
class User extends CI_Controller {
return TRUE;
}
return TRUE;
}
+ public function _check_captcha($word)
+ {
+ $this->load->library('captcha');
+
+ return $this->captcha->check_captcha($word);
+ }
+
public function _internal_account($username)
{
$userdata = $this->users_model->get_userdata($username, 'auth_src');
public function _internal_account($username)
{
$userdata = $this->users_model->get_userdata($username, 'auth_src');