Merge lp:~vierbergenlars/remotecp-panel/add-database-user into lp:remotecp-panel/1.x

[Lars Vierbergen]

[Lars Vierbergen (vierbergenlars)]

review: Approve

[Lars Vierbergen (vierbergenlars)]

Errors in parent branch.

review: Needs Fixing

[Lars Vierbergen (vierbergenlars)]

In this branch, there are also some errors. All $remote_connection should be $local_connection!!!

review: Needs Fixing

[lp:~vierbergenlars/remotecp-panel/add-database-user]

66. By Lars Vierbergen on 2011-01-31

Bug fixes in the database adminstration page

[Lars Vierbergen (vierbergenlars)]

All fixed right now.

review: Approve

=== modified file 'system/database.php'
--- system/database.php	2011-01-30 17:23:45 +0000
+++ system/database.php	2011-01-31 16:32:58 +0000
@@ -14,11 +14,8 @@
 }
 if(!RDB&&!isset($_GET['function'])) //We are not in a remote database
 	$_GET['function']='create';
-if(RDB&&!isset($_GET['function'])) { //We are in a remote database
-	if($_GET['control']=='admin') $_GET['function']='admin'; //Control admin
-}
 
-if($_GET['function']=='create') {
+if(!RDB&&$_GET['function']=='create') {
 	if(!isset($_POST['conn_host'])) {
 	echo "
 	<form method='POST' onsubmit='db.create.send(this); return false'>
@@ -78,7 +75,7 @@
 		}
 	}
 }
-else if($_GET['function']=="help") {
+else if(!RDB&&$_GET['function']=="help") {
 	$name=$_GET['name'];
 	switch($_GET['name']) {
 		case 'conn_type':
@@ -114,8 +111,43 @@
 	}
 
 }
-else if($_GET['function']=='admin') {
-	?>
-
-	<?php
+else if(RDB&&$_GET['control']=='admin'&&$remote_session->isAdmin()) {
+	if(!isset($_GET['function'])) {
+		$q=$local_connection->query('SELECT * FROM `remote_databases_assignments` WHERE `key`="'.$remote_session->dbkey.'"') ?>
+		<table><tr><th><?php echo $t->_('User'); ?></th><th><?php echo $t->_('Lv.'); ?></th><th><?php echo $t->_('Delete'); ?></th></tr>
+		<?php while($users=$q->fetch_assoc()) { ?>
+			<tr><td><img src="<?php echo URL_IMG; ?>/Silk/user.png"> <?php echo $users['username']; ?></td><td<?php if($users['username']!=$session->username) {?> ondblclick='db.admin.user.editlvl.expand("<?php echo $users['username']; ?>",this)'<?php } ?>><?php echo $users['level'] ?></td><td><?php if($users['username']!=$session->username) {?><a onclick='db.admin.user.delete("<?php echo $users['username']; ?>")'><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Revoke user privileges'); ?>"></a><?php } ?></td></tr>
+		<?php } ?>
+		<tr><td colspan='3'><img src="<?php echo URL_IMG; ?>/Silk/user_add.png" alt="+" title="<?php echo $t->_('Add user'); ?>"> <input type='text' onclick='openusers(this)'></td><td><a onclick='db.admin.user.add(this);'><img src="<?php echo URL_IMG; ?>/Silk/add.png" alt="<?php echo $t->_('Add'); ?>" title="<?php echo $t->_('Add new user'); ?>"></a></td></tr>
+		</table>
+		<?php
+}
+	else if($_GET['function']=='editlvl') {
+		if($local_connection->query('UPDATE `remote_databases_assignments` SET `level`='.$_GET['lvl'].' WHERE `username`=\''.$_GET['user'].'\' AND `key`=\''.$remote_session->dbkey.'\'')) {
+			echo "true";
+		}
+		else {
+			echo "false";
+		}
+	}
+	else if($_GET['function']=='deleteuser') {
+		if($local_connection->query('DELETE FROM `remote_databases_assignments` WHERE `username`=\''.$_POST['username'].'\' AND `key`=\''.$remote_session->dbkey.'\'')) {
+			echo "true";
+		}
+		else {
+			echo "false";
+		}
+	}
+	else if($_GET['function']=="adduser") {
+		if(!$database->usernameTaken($_POST['username'])) { 
+			echo "false";
+			exit;	
+		}
+		if($local_connection->query('INSERT INTO `remote_databases_assignments` VALUES(\''.$remote_session->dbkey.'\',\''.$_POST['username'].'\',1)')) {
+			echo "true";
+		}
+		else {
+			echo "false";
+		}
+	}
 }
\ No newline at end of file