Merge branch 'master' into share_api

Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php

2 files changed, 1 insertions, 47 deletions

diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index 84e0710c74a..bf749be3e30 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -7,6 +7,7 @@
 
 require_once ("../../lib/base.php");
 OC_Util::checkAdminUser();
+OCP\JSON::callCheck();
 
 $action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
 $result=false;
diff --git a/core/ajax/grouplist.php b/core/ajax/grouplist.php
deleted file mode 100644
index e3e92fcfa16..00000000000
--- a/core/ajax/grouplist.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
-* ownCloud - ajax group list
-*
-* @author Hans Bakker
-* @copyright 2011 hansmbakker+kde@gmail.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-$RUNTIME_NOAPPS = TRUE; //no apps, yet
-require_once('../../lib/base.php');
-
-if(!OC_User::isLoggedIn()){
-	if(!isset($_SERVER['PHP_AUTH_USER'])){
-		header('WWW-Authenticate: Basic realm="ownCloud Server"');
-		header('HTTP/1.0 401 Unauthorized');
-		echo 'Valid credentials must be supplied';
-		exit();
-	} else {
-		if(!OC_User::checkPassword($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])){
-			exit();
-		}
-	}
-}
-
-$groups = array();
-
-foreach( OC_Group::getGroups() as $i ){
-       	// Do some more work here soon
-        $groups[] = array( "groupname" => $i );
-}
-
-OC_JSON::encodedPrint($groups);