mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1598 from owncloud/fixing-1424-master 

Fixing 1424 master
This commit is contained in:
Thomas Müller 2013-02-13 12:59:30 -08:00
parent 6d7e324f4b 9d6f74c65e
commit e1e77fe3be
10 changed files with 108 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/user_ldap/user_ldap.php
View File

@ -261,4 +261,10 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
return (bool)((OC_USER_BACKEND_CHECK_PASSWORD | OC_USER_BACKEND_GET_HOME) & $actions);
}
/**
* @return bool
*/
public function hasUserListings() {
return true;
}
}

8
apps/user_ldap/user_proxy.php
View File

@ -183,4 +183,12 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
public function deleteUser($uid) {
return false;
}
/**
* @return bool
*/
public function hasUserListings() {
return $this->refBackend->hasUserListings();
}
}

12
apps/user_webdavauth/user_webdavauth.php
View File

@ -28,12 +28,6 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
$this->webdavauth_url = OC_Config::getValue( "user_webdavauth_url" );
}
public function createUser() {
// Can't create user
OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend', 3);
return false;
}
public function deleteUser($uid) {
// Can't delete user
OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend', 3);
@ -71,6 +65,12 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
return true;
}
/**
* @return bool
*/
public function hasUserListings() {
return false;
}
/*
* we don´t know the users so all we can do it return an empty array here

15
lib/user.php
View File

@ -172,7 +172,7 @@ class OC_User {
}
// Check if user already exists
if( self::userExists($uid) ) {
if( self::userExistsForCreation($uid) ) {
throw new Exception('The username is already being used');
}
@ -553,6 +553,19 @@ class OC_User {
return false;
}
public static function userExistsForCreation($uid) {
foreach(self::$_usedBackends as $backend) {
if(!$backend->hasUserListings())
continue;
$result=$backend->userExists($uid);
if($result===true) {
return true;
}
}
return false;
}
/**
* disables a user
* @param string $userid the user to disable

24
lib/user/backend.php
View File

@ -134,18 +134,26 @@ abstract class OC_User_Backend implements OC_User_Interface {
return $uid;
}
/**
* @brief Get a list of all display names
* @returns array with all displayNames (value) and the correspondig uids (key)
*
* Get a list of all display names and user ids.
*/
public function getDisplayNames($search = '', $limit = null, $offset = null) {
/**
* @brief Get a list of all display names
* @returns array with all displayNames (value) and the corresponding uids (key)
*
* Get a list of all display names and user ids.
*/
public function getDisplayNames($search = '', $limit = null, $offset = null) {
$displayNames = array();
$users = $this->getUsers($search, $limit, $offset);
foreach ( $users as $user) {
$displayNames[$user] = $user;
}
return $displayNames;
return $displayNames;
}
/**
* @brief Check if a user list is available or not
* @return boolean if users can be listed or not
*/
public function hasUserListings() {
return false;
}
}

82
lib/user/database.php
View File

@ -111,30 +111,30 @@ class OC_User_Database extends OC_User_Backend {
}
}
/**
* @brief Set display name
* @param $uid The username
* @param $displayName The new display name
* @returns true/false
*
* Change the display name of a user
/**
* @brief Set display name
* @param $uid The username
* @param $displayName The new display name
* @returns true/false
*
* Change the display name of a user
*/
public function setDisplayName( $uid, $displayName ) {
if( $this->userExists($uid) ) {
$query = OC_DB::prepare( 'UPDATE `*PREFIX*users` SET `displayname` = ? WHERE `uid` = ?' );
$query->execute( array( $displayName, $uid ));
return true;
}else{
return false;
}
if( $this->userExists($uid) ) {
$query = OC_DB::prepare( 'UPDATE `*PREFIX*users` SET `displayname` = ? WHERE `uid` = ?' );
$query->execute( array( $displayName, $uid ));
return true;
}else{
return false;
}
}
/**
* @brief get display name of the user
* @param $uid user ID of the user
* @return display name
*/
public function getDisplayName($uid) {
/**
* @brief get display name of the user
* @param $uid user ID of the user
* @return display name
*/
public function getDisplayName($uid) {
if( $this->userExists($uid) ) {
$query = OC_DB::prepare( 'SELECT displayname FROM `*PREFIX*users` WHERE `uid` = ?' );
$result = $query->execute( array( $uid ))->fetchAll();
@ -144,36 +144,36 @@ class OC_User_Database extends OC_User_Backend {
} else {
return $uid;
}
}
}
}
/**
* @brief Get a list of all display names
* @returns array with all displayNames (value) and the correspondig uids (key)
*
* Get a list of all display names and user ids.
*/
/**
* @brief Get a list of all display names
* @returns array with all displayNames (value) and the correspondig uids (key)
*
* Get a list of all display names and user ids.
*/
public function getDisplayNames($search = '', $limit = null, $offset = null) {
$displayNames = array();
$query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`displayname`) LIKE LOWER(?)', $limit, $offset);
$query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`displayname`) LIKE LOWER(?)', $limit, $offset);
$result = $query->execute(array($search.'%'));
$users = array();
while ($row = $result->fetchRow()) {
$displayNames[$row['uid']] = $row['displayname'];
$users = array();
while ($row = $result->fetchRow()) {
$displayNames[$row['uid']] = $row['displayname'];
}
// let's see if we can also find some users who don't have a display name yet
$query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset);
$query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset);
$result = $query->execute(array($search.'%'));
while ($row = $result->fetchRow()) {
while ($row = $result->fetchRow()) {
$displayName = trim($row['displayname'], ' ');
if ( empty($displayName) ) {
if ( empty($displayName) ) {
$displayNames[$row['uid']] = $row['uid'];
}
}
}
return $displayNames;
return $displayNames;
}
/**
@ -256,4 +256,12 @@ class OC_User_Database extends OC_User_Backend {
return false;
}
}
/**
* @return bool
*/
public function hasUserListings() {
return true;
}
}

7
lib/user/dummy.php
View File

@ -112,4 +112,11 @@ class OC_User_Dummy extends OC_User_Backend {
public function userExists($uid) {
return isset($this->users[$uid]);
}
/**
* @return bool
*/
public function hasUserListings() {
return true;
}
}

7
lib/user/interface.php
View File

@ -66,10 +66,15 @@ interface OC_User_Interface {
/**
* @brief Get a list of all display names
* @returns array with all displayNames (value) and the correspondig uids (key)
* @returns array with all displayNames (value) and the corresponding uids (key)
*
* Get a list of all display names and user ids.
*/
public function getDisplayNames($search = '', $limit = null, $offset = null);
/**
* @brief Check if a user list is available or not
* @return boolean if users can be listed or not
*/
public function hasUserListings();
}

6
settings/ajax/createuser.php
View File

@ -26,12 +26,6 @@ if(OC_User::isAdminUser(OC_User::getUser())) {
$username = $_POST["username"];
$password = $_POST["password"];
// Does the group exist?
if(OC_User::userExists($username)) {
OC_JSON::error(array("data" => array( "message" => "User already exists" )));
exit();
}
// Return Success story
try {
if (!OC_User::createUser($username, $password)) {

6
settings/js/users.js
View File

@ -346,12 +346,6 @@ $(document).ready(function () {
event.preventDefault();
var username = $('#newusername').val();
var password = $('#newuserpassword').val();
if ($('#content table tbody tr').filterAttr('data-uid', username).length > 0) {
OC.dialogs.alert(
t('settings', 'The username is already being used'),
t('settings', 'Error creating user'));
return;
}
if ($.trim(username) == '') {
OC.dialogs.alert(
t('settings', 'A valid username must be provided'),