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

Merge branch 'refactoring' of git.kde.org:owncloud into refactoring

This commit is contained in:
Frank Karlitschek 2011-04-17 01:13:07 +02:00
parent 0820cb8f17 d314c33715
commit 85a6097c03
14 changed files with 181 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/ajax/creategroup.php
View File

@ -12,23 +12,14 @@ if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin'
exit();
}
$groups = array();
if( isset( $_POST["groups"] )){
$groups = $_POST["groups"];
}
$username = $_POST["username"];
$password = $_POST["password"];
foreach( $groups as $i ){
OC_GROUP::addToGroup( $username, $i );
}
$name = $_POST["groupname"];
// Return Success story
if( OC_USER::createUser( $username, $password )){
echo json_encode( array( "status" => "success", "data" => array( "username" => $username, "groups" => implode( ", ", $groups ))));
if( OC_GROUP::createGroup( $name )){
echo json_encode( array( "status" => "success", "data" => array( "groupname" => $name )));
}
else{
echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to add user" )));
echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to add group" )));
}
?>

5
admin/ajax/createuser.php
View File

@ -19,12 +19,11 @@ if( isset( $_POST["groups"] )){
$username = $_POST["username"];
$password = $_POST["password"];
// Return Success story
if( OC_USER::createUser( $username, $password )){
foreach( $groups as $i ){
OC_GROUP::addToGroup( $username, $i );
}
// Return Success story
if( OC_USER::createUser( $username, $password )){
echo json_encode( array( "status" => "success", "data" => array( "username" => $username, "groups" => implode( ", ", $groups ))));
}
else{

25
admin/ajax/removegroup.php Normal file
View File

@ -0,0 +1,25 @@
<?php
// Init owncloud
require_once('../../lib/base.php');
// We send json data
header( "Content-Type: application/jsonrequest" );
// Check if we are a user
if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' )){
echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
exit();
}
$name = $_POST["groupname"];
// Return Success story
if( OC_GROUP::deleteGroup( $name )){
echo json_encode( array( "status" => "success", "data" => array( "groupname" => $name )));
}
else{
echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to delete group" )));
}
?>

25
admin/ajax/removeuser.php Normal file
View File

@ -0,0 +1,25 @@
<?php
// Init owncloud
require_once('../../lib/base.php');
// We send json data
header( "Content-Type: application/jsonrequest" );
// Check if we are a user
if( !OC_USER::isLoggedIn() || !OC_GROUP::inGroup( $_SESSION['user_id'], 'admin' )){
echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" )));
exit();
}
$name = $_POST["username"];
// Return Success story
if( OC_USER::deleteUser( $name )){
echo json_encode( array( "status" => "success", "data" => array( "username" => $name )));
}
else{
echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to delete user" )));
}
?>

47
admin/js/users.js
View File

@ -12,10 +12,15 @@ $(document).ready(function(){
"Create an account": function() {
var post = $( "#createuserdata" ).serialize();
$.post( 'ajax/createuser.php', post, function(data){
if( data.status == "success" ){
var newrow = '<tr><td>' + data.data.username + '</td>';
newrow = newrow + '<td>' + data.data.groups + '</td>';
newrow = newrow + '<td><a href="" class="edituser-button">edit</a> | <a class="removeuser-button" href="">remove</a></td></tr>';
$("#userstable").append( newrow );
}
else{
alert( "Bug By Jakob (c)" );
}
});
$( this ).dialog( "close" );
},
@ -61,7 +66,7 @@ $(document).ready(function(){
return false;
});
// Dialog for adding users
// Removing users
$( "#removeuser-form" ).dialog({
autoOpen: false,
height: 300,
@ -69,6 +74,15 @@ $(document).ready(function(){
modal: true,
buttons: {
"Remove user": function() {
var post = $( "#removeuserdata" ).serialize();
$.post( 'ajax/removeuser.php', post, function(data){
if( data.status == "success" ){
$( "a[x-uid='"+uid+"']" ).parent().remove();
}
else{
alert( "Bug By Jakob (c)" );
}
});
$( this ).dialog( "close" );
},
Cancel: function() {
@ -76,7 +90,7 @@ $(document).ready(function(){
}
},
close: function() {
allFields.val( "" ).removeClass( "ui-state-error" );
true;
}
});
@ -84,10 +98,28 @@ $(document).ready(function(){
.click(function() {
uid = $( this ).parent().attr( 'x-uid' );
$("#deleteuserusername").html(uid);
$("#deleteusernamefield").val(uid);
$( "#removeuser-form" ).dialog( "open" );
return false;
});
// Add a group
$( "#creategroupbutton" )
.click(function(){
var post = $( "#creategroupdata" ).serialize();
$.post( 'ajax/creategroup.php', post, function(data){
if( data.status == "success" ){
var newrow = '<tr><td>' + data.data.groupname + '</td>';
newrow = newrow + '<td><a class="removegroup-button" href="">remove</a></td></tr>';
$("#groupstable").append( newrow );
}
else{
alert( "something went wrong! sorry!" );
}
});
return false;
});
// Dialog for adding users
$( "#removegroup-form" ).dialog({
autoOpen: false,
@ -96,9 +128,14 @@ $(document).ready(function(){
modal: true,
buttons: {
"Remove group": function(){
var post = $( "#deletegroupdata" ).serialize();
$.post( 'ajax/deletegroup.php', post, function(data){
var post = $( "#removegroupdata" ).serialize();
$.post( 'ajax/removegroup.php', post, function(data){
if( data.status == "success" ){
$( "a[x-gid='"+gid+"']" ).parent().remove();
}
else{
alert( "Bug By Jakob (c)" );
}
});
$( this ).dialog( "close" );
},
@ -107,7 +144,7 @@ $(document).ready(function(){
}
},
close: function(){
allFields.val( "" ).removeClass( "ui-state-error" );
true;
}
});

21
admin/templates/users.php
View File

@ -28,7 +28,7 @@
<a id="adduser-button" href="">New user</a>
<h2>Groups</h2>
<form>
<form id="creategroupdata">
<table id="groupstable">
<thead>
<tr>
@ -36,6 +36,12 @@
<th></th>
</tr>
</thead>
<tfoot>
<tr>
<td><input type="text" name="groupname" id="creategroupname" /></td>
<td><button id="creategroupbutton">Create group</button></td>
</tr>
</tfoot>
<tbody>
<?php foreach($_["groups"] as $group): ?>
<tr>
@ -43,17 +49,10 @@
<td x-gid="<?php echo $group["name"]; ?>"><a class="removegroup-button" href="">remove</a></td>
</tr>
<?php endforeach; ?>
<tr>
<td><input type="text" name="name" /></td>
<td><input type="submit" /></td>
</tr>
</tbody>
</table>
</form>
<a id="addgroup-button" href="">Add group</a>
<div id="adduser-form" title="Add user">
<form id="createuserdata">
<fieldset>
@ -82,13 +81,13 @@
<div id="removeuser-form" title="Remove user">
<form id="removeuserdata">
Do you really want to delete user <span id="deleteuserusername">$user</span>?
<input type="hidden" name="username" value="">
<input id="deleteusernamefield" type="hidden" name="username" value="">
</form>
</div>
<div id="removegroup-form" title="Remove Group">
<form id="removeuserdata">
<form id="removegroupdata">
Do you really want to delete group <span id="deletegroupgroupname">$group</span>?
<input id="deletegroupnamefield" type="hidden" name="username" value="">
<input id="deletegroupnamefield" type="hidden" name="groupname" value="">
</form>
</div>

7
lib/Group/backend.php
View File

@ -35,6 +35,13 @@ abstract class OC_GROUP_BACKEND {
*/
public static function createGroup($groupName){}
/**
* Try to delete Group
*
* @param string $groupName The name of the group to delete
*/
public static function deleteGroup($groupName){}
/**
* Check if a user belongs to a group
*

12
lib/Group/database.php
View File

@ -66,6 +66,18 @@ class OC_GROUP_DATABASE extends OC_GROUP_BACKEND {
}
}
/**
* Try to delete a group
*
* @param string $groupName The name of the group to delete
*/
public static function deleteGroup( $gid ){
$query = OC_DB::prepare( "DELETE FROM `*PREFIX*groups` WHERE `gid` = ?" );
$result = $query->execute( array( $gid ));
return true;
}
/**
* Check if a user belongs to a group
*

6
lib/User/backend.php
View File

@ -37,6 +37,12 @@ abstract class OC_USER_BACKEND {
*/
public static function createUser($username, $password){}
/**
* @brief Delete a new user
* @param $username The username of the user to delete
*/
public static function deleteUser( $username ){}
/**
* Try to login a user
*

12
lib/User/database.php
View File

@ -64,6 +64,18 @@ class OC_USER_DATABASE extends OC_USER_BACKEND {
}
}
/**
* Try to delete a user
*
* @param string $username The username of the user to delete
*/
public static function deleteUser( $uid ){
$query = OC_DB::prepare( "DELETE FROM `*PREFIX*users` WHERE `uid` = ?" );
$result = $query->execute( array( $uid ));
return true;
}
/**
* Try to login a user
*

4
lib/app.php
View File

@ -318,7 +318,6 @@ class OC_APP{
* -# unzipping it
* -# including appinfo/installer.php
* -# executing "oc_app_install()"
* -# renaming appinfo/app.sample.php to appinfo/app.php
*
* It is the task of oc_app_install to create the tables and do whatever is
* needed to get the app working.
@ -346,8 +345,6 @@ class OC_APP{
* - pretend: boolean, if set true the system won't do anything
* - noupgrade: boolean, if true the function oc_app_upgrade will be
* skipped
* - keepappinfo: boolean. If set true, the folder appinfo will not be
* deleted, appinfo/app.php will not be replaced by a new version
*
* This function works as follows
* -# fetching the file
@ -355,7 +352,6 @@ class OC_APP{
* -# unzipping new file
* -# including appinfo/installer.php
* -# executing "oc_app_upgrade( $options )"
* -# renaming appinfo/app.sample.php to appinfo/app.php
*/
public static function upgradeApp( $data = array()){
// TODO: write function

1
lib/filestorage.php
View File

@ -378,6 +378,7 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
}
public function fromTmpFile($tmpFile,$path){
die( "oh nooo!" );
$fileStats = stat($tmpFile);
if(rename($tmpFile,$this->datadir.$path)){
touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);

27
lib/group.php
View File

@ -78,6 +78,24 @@ class OC_GROUP {
}
}
/**
* Try to create a new group
*
* @param string $groupName The name of the group to create
*/
public static function createGroup($gid) {
return self::$_backend->createGroup($gid);
}
/**
* Try to delete Group
*
* @param string $groupName The name of the group to delete
*/
public static function deleteGroup($gid) {
return self::$_backend->deleteGroup($gid);
}
/**
* Check if a user belongs to a group
*
@ -124,13 +142,4 @@ class OC_GROUP {
public static function getGroups() {
return self::$_backend->getGroups();
}
/**
* create a new group
*
* @param string $name Name of the group
*/
public static function createGroup($name) {
return self::$_backend->createGroup($name);
}
}

8
lib/user.php
View File

@ -95,6 +95,14 @@ class OC_USER {
return self::$_backend->createUser( $username, $password );
}
/**
* @brief Delete a new user
* @param $username The username of the user to delete
*/
public static function deleteUser( $username ){
return self::$_backend->deleteUser( $username );
}
/**
* @brief try to login a user
* @param $username The username of the user to log in