wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change verifyUser so that external json files can call it

Browse source
This commit is contained in:
Lukas Reschke 2012-10-15 16:30:53 +02:00 committed by Daniel Molkentin
parent 842d6dad47
commit 1c865f702c
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/json.php
View file

@ -58,7 +58,8 @@ class OC_JSON{
*/
public static function checkAdminUser() {
self::checkLoggedIn();
if( !OC_Group::inGroup( OC_User::getUser(), 'admin' ) || self::verifyUser() === false) {
self::verifyUser();
if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
$l = OC_L10N::get('lib');
self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
@ -70,7 +71,8 @@ class OC_JSON{
*/
public static function checkSubAdminUser() {
self::checkLoggedIn();
if(!OC_Group::inGroup(OC_User::getUser(),'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser()) || self::verifyUser() === false) {
self::verifyUser();
if(!OC_Group::inGroup(OC_User::getUser(),'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
$l = OC_L10N::get('lib');
self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
@ -84,9 +86,9 @@ class OC_JSON{
public static function verifyUser() {
// Check if the user verified his password in the last 15 minutes
if($_SESSION['verifiedLogin'] < time() OR !isset($_SESSION['verifiedLogin'])) {
return false;
self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
}
return true;
}
/**