Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
cfc78d44
Commit
cfc78d44
authored
12 years ago
by
Tom Needham
Browse files
Options
Downloads
Patches
Plain Diff
Return correct json response, fix syntax
parent
c7a4075a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/migrate.php
+4
-15
4 additions, 15 deletions
lib/migrate.php
with
4 additions
and
15 deletions
lib/migrate.php
+
4
−
15
View file @
cfc78d44
...
...
@@ -278,7 +278,7 @@ class OC_Migrate{
return json_encode( array( 'success' => false ) );
}
// Done
return json_encode( 'success' => true );
return json_encode(
array(
'success' => true
)
);
*/
break
;
}
...
...
@@ -443,21 +443,10 @@ class OC_Migrate{
'ocversion'
=>
OC_Util
::
getVersion
(),
'exporttime'
=>
time
(),
'exportedby'
=>
OC_User
::
getUser
(),
'exporttype'
=>
self
::
$exporttype
'exporttype'
=>
self
::
$exporttype
,
'exporteduser'
=>
self
::
$uid
);
// Add hash if user export
if
(
self
::
$exporttype
==
'user'
){
$query
=
OC_DB
::
prepare
(
"SELECT password FROM *PREFIX*users WHERE uid = ?"
);
$result
=
$query
->
execute
(
array
(
self
::
$uid
)
);
$row
=
$result
->
fetchRow
();
$hash
=
$row
?
$row
[
'password'
]
:
false
;
if
(
!
$hash
){
OC_Log
::
write
(
'migration'
,
'Failed to get the users password hash'
,
OC_log
::
ERROR
);
return
false
;
}
$info
[
'hash'
]
=
$hash
;
$info
[
'exporteduser'
]
=
self
::
$uid
;
}
if
(
!
is_array
(
$array
)
){
OC_Log
::
write
(
'migration'
,
'Supplied $array was not an array in getExportInfo()'
,
OC_Log
::
ERROR
);
}
...
...
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