Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
f5131ea9
Commit
f5131ea9
authored
10 years ago
by
Alex ORLUC
Browse files
Options
Downloads
Patches
Plain Diff
FEAT
#1693
reactivate user without sensistive case
parent
08bc7956
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/trunk/core/class/ObjectControlerAbstract.php
+3
-3
3 additions, 3 deletions
core/trunk/core/class/ObjectControlerAbstract.php
core/trunk/core/class/users_controler.php
+7
-2
7 additions, 2 deletions
core/trunk/core/class/users_controler.php
with
10 additions
and
5 deletions
core/trunk/core/class/ObjectControlerAbstract.php
+
3
−
3
View file @
f5131ea9
...
@@ -439,10 +439,10 @@ abstract class ObjectControler
...
@@ -439,10 +439,10 @@ abstract class ObjectControler
self
::
$db
=
new
dbquery
();
self
::
$db
=
new
dbquery
();
self
::
$db
->
connect
();
self
::
$db
->
connect
();
if
(
in_array
(
$table_id
,
self
::
$foolish_ids
)
){
if
(
in_array
(
$table_id
,
self
::
$foolish_ids
)
){
$query
=
"update
$table_name
set status = 'OK' where
$table_id
=
'"
$query
=
"update
$table_name
set status = 'OK' where
lower(
$table_id
)=lower(
'"
.
$object
->
$table_id
.
"'"
;
.
$object
->
$table_id
.
"'
)
"
;
}
else
{
}
else
{
$query
=
"update
$table_name
set status = 'OK' where
$table_id
=
"
.
$object
->
$table_id
;
$query
=
"update
$table_name
set status = 'OK' where
lower(
$table_id
)=lower(
"
.
$object
->
$table_id
.
")"
;
}
}
try
{
try
{
if
(
_DEBUG
){
if
(
_DEBUG
){
...
...
This diff is collapsed.
Click to expand it.
core/trunk/core/class/users_controler.php
+
7
−
2
View file @
f5131ea9
...
@@ -837,8 +837,8 @@ class users_controler extends ObjectControler implements ObjectControlerIF
...
@@ -837,8 +837,8 @@ class users_controler extends ObjectControler implements ObjectControlerIF
self
::
$db
=
new
dbquery
();
self
::
$db
=
new
dbquery
();
self
::
$db
->
connect
();
self
::
$db
->
connect
();
$func
=
new
functions
();
$func
=
new
functions
();
$query
=
'select user_id from '
.
USERS_TABLE
.
" where user_id = '"
$query
=
'select user_id from '
.
USERS_TABLE
.
" where
lower(
user_id
)
=
lower(
'"
.
$func
->
protect_string_db
(
$userId
)
.
"' and status = 'DEL'"
;
.
$func
->
protect_string_db
(
$userId
)
.
"'
)
and status = 'DEL'"
;
try
{
try
{
self
::
$db
->
query
(
$query
);
self
::
$db
->
query
(
$query
);
...
@@ -867,6 +867,11 @@ class users_controler extends ObjectControler implements ObjectControlerIF
...
@@ -867,6 +867,11 @@ class users_controler extends ObjectControler implements ObjectControlerIF
self
::
set_specific_id
(
'user_id'
);
self
::
set_specific_id
(
'user_id'
);
if
(
self
::
advanced_reactivate
(
$user
)){
if
(
self
::
advanced_reactivate
(
$user
)){
self
::
$db
=
new
dbquery
();
self
::
$db
->
connect
();
$query
=
"update users set user_id = '"
.
$user
->
user_id
.
"' where lower(user_id)=lower('"
.
$user
->
user_id
.
"')"
;
self
::
$db
->
query
(
$query
);
return
true
;
return
true
;
}
else
{
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment