Merge lp:~vierbergenlars/remotecp-panel/edit-database-details into lp:remotecp-panel/1.x

[Lars Vierbergen]

Implements https://blueprints.launchpad.net/remotecp-panel/+spec/edit-database-details

[Lars Vierbergen (vierbergenlars)]

review: Approve

[Lars Vierbergen (vierbergenlars)]

The module throws a notice about Notice: Undefined index: function in G:\Apache\xampp\htdocs\dev\remotecp-panel_edit-database-details\system\database.php on line 78

review: Needs Fixing

[Lars Vierbergen (vierbergenlars)]

Is ok now. (Changed function order)

review: Approve

[lp:~vierbergenlars/remotecp-panel/edit-database-details]

67. By Lars Vierbergen on 2011-02-01

Undefined index notice fixed (changed order)

68. By Lars Vierbergen on 2011-02-02

Remove a left-behind var_dump

Unmerged revisions

=== modified file 'inc/remote_session/session.php'
--- inc/remote_session/session.php	2011-01-31 16:01:17 +0000
+++ inc/remote_session/session.php	2011-02-01 19:36:30 +0000
@@ -1,4 +1,5 @@
 <?php //@./inc/remote_session/session.php ?>
+<<<<<<< TREE
 <?php
 class remote_session {
 	private $database;
@@ -33,4 +34,39 @@
 	}
 }
 
+=======
+<?php
+class remote_session {
+	private $database;
+	public $userlevel;
+	public $dbkey=substr($_SERVER['PATH_INFO'],1,32); //Set the database key
+	private $username;
+	private $authenticated
+	
+	function __construct() {
+		global $local_connection,$session;
+		$this->database=$local_connection;
+		$this->username=$session->username;
+		if($this->init()) $this->authenticated=true;
+		else $this->authenticated=false;
+	}
+	private function init() {
+		$q0=$this->database->query('SELECT * FROM `remote_databases_assignments` WHERE `key`='$\''.$this->dbkey.'\' AND `username`=\''.$this->username.'\'');
+		if($q0->num_rows!=1) return false;
+		$r0=$q0->fetch_assoc();
+		$this->userlevel=$r0['level'];
+		return true;
+	}
+	function isAdmin() {
+		return ($this->userlevel==9);
+	}
+	function isSiteCreator() {
+		return ($this->userlevel>=2);
+	}
+	function authenticated() {
+		return $this->authenticated;
+	}
+}
+
+>>>>>>> MERGE-SOURCE
 $remote_session=new remote_session;
\ No newline at end of file

=== modified file 'system/database.php'
--- system/database.php	2011-01-31 16:29:47 +0000
+++ system/database.php	2011-02-01 19:36:30 +0000
@@ -111,6 +111,7 @@
 	}
 
 }
+<<<<<<< TREE
 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.'"') ?>
@@ -150,4 +151,45 @@
 			echo "false";
 		}
 	}
+=======
+else if(RDB&&$_GET['control']=='admin'&&$remote_session->isAdmin()) {
+	if(!isset($_GET['function'])) {
+		$q=$remote_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['userlevel'] ?></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($remote_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($remote_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($remote_connection->query('INSERT INTO `remote_databases_assignments` VALUES(\''.$remote_session->dbkey.'\',\''.$_POST['username'].'\',1)')) {
+			echo "true";
+		}
+		else {
+			echo "false";
+		}
+	}
+>>>>>>> MERGE-SOURCE
 }
\ No newline at end of file