Merge lp:~vierbergenlars/remotecp-panel/two-panels into lp:remotecp-panel/2.x

[Lars Vierbergen]

Splits the panel in two pieces, one for local actions, one for remote databases
Implements blueprint https://blueprints.launchpad.net/remotecp-panel/+spec/two-panels

[Lars Vierbergen (vierbergenlars)]

review: Approve

=== modified file 'frame.php'
--- frame.php	2011-03-25 19:28:58 +0000
+++ frame.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php
+<?php //@./frame.php ?><?php
 require('inc/controllers.php');
 ?>
 <!DOCTYPE>

=== modified file 'inc/accountlevels.php'
--- inc/accountlevels.php	2011-01-30 17:23:45 +0000
+++ inc/accountlevels.php	2011-03-30 16:10:37 +0000
@@ -14,9 +14,9 @@
 }
 $site=addslashes($site);
 define('SITE',$site);
+unset($site);
 
 function getLevel($user,$ref) {
-	if(!RDB) return 0;
 	global $remote_connection;
 	$sql="SELECT `userlevel` FROM `sites` WHERE `username`='".$user."' AND `ref`='".$ref."'";
 	$res=$remote_connection->query($sql);
@@ -25,8 +25,8 @@
 	return $userlevel;
 }
 
-if($site!='') {
-	$userlevel=getLevel($session->username,$site);
+if(SITE!='') {
+	$userlevel=getLevel($session->username,SITE);
 }
 else {
 	$userlevel=null;
@@ -46,9 +46,8 @@
 else {return false;}
 }
 function hasSiteAddonLevel() {
-	if(!RDB) return false;
-	global $userlevel,$remote_connection,$site,$local_connection;
-	$q=$remote_connection->query('SELECT * FROM `'.$site.'_addons` WHERE `reference`="'.$local_connection->real_escape_string($_GET['aref']).'"');
+	global $userlevel,$remote_connection,$local_connection;
+	$q=$remote_connection->query('SELECT * FROM `'.SITE.'_addons` WHERE `reference`="'.$local_connection->real_escape_string($_GET['aref']).'"');
 	$data=$q->fetch_assoc();
 	if($userlevel>=$data['ulevel']) {
 		return true;

=== modified file 'inc/controllers.php'
--- inc/controllers.php	2011-03-11 18:12:09 +0000
+++ inc/controllers.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php
+<?php //@./inc/controllers.php ?><?php
 if (get_magic_quotes_gpc()) { //Disable & remove magic quotes ! (http://www.php.net/manual/en/security.magicquotes.disabling.php: example 2)
     $process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
     while (list($key, $val) = each($process)) {
@@ -30,5 +30,3 @@
 // End sqlsess
 require_once('inc/sitemgmt/session.php'); 
 require_once('trans/trans.php');
-require_once('inc/remotedbauth.php');
-require_once('inc/accountlevels.php');
\ No newline at end of file

=== modified file 'inc/languageCodes.php'
--- inc/languageCodes.php	2011-03-14 20:13:50 +0000
+++ inc/languageCodes.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php
+<?php //@./inc/languageCodes.php ?><?php
 $languageCodes = array(
  "aa" => "Afar",
  "ab" => "Abkhazian",

=== added directory 'inc/rdb'
=== added file 'inc/rdb/auth.php'
--- inc/rdb/auth.php	1970-01-01 00:00:00 +0000
+++ inc/rdb/auth.php	2011-03-30 16:10:37 +0000
@@ -0,0 +1,45 @@
+<?php //@./inc/rdb/auth.php ?><?php
+/**
+ * Class for remote database authentication
+ */
+class rdb_auth {
+	private $dbid=0; //The database id number
+	public  $logged_in=false;
+	public  $level=0;
+	public  $exists=false;
+	function __construct() {
+		global $local_connection;
+		$this->dbid=substr($_SERVER['PATH_INFO'],1,32);
+		$dblookup=$local_connection->query('SELECT * FROM `remote_databases` WHERE `key`=\''.substr($_SERVER['PATH_INFO'],1,32).'\'');
+		if($dblookup->num_rows==1)
+			$this->exists=true;
+		else 
+			return;
+		if(($chkauth=$this->checkauth())!==false) {
+			$this->logged_in=true;
+			$this->level=$chkauth;
+		}
+	}
+	private function checkauth() {
+		global $local_connection,$session;
+		$dbaccess=$local_connection->query('SELECT * FROM `remote_databases_assignments` WHERE `key`=\''.$this->dbid.'\' AND `username`=\''.$session->username.'\'');
+		if($dbaccess->num_rows==1) {
+			return $dbaccess->fetch_object()->level;
+		}
+	}
+	function connect() {
+		if($this->checkauth()===false||$this->exists===false) return NULL;
+		global $local_connection;
+		$dblookup=$local_connection->query('SELECT * FROM `remote_databases` WHERE `key`=\''.$this->dbid.'\'');
+		$rdbauth=$dblookup->fetch_assoc();
+		if($rdbauth['accesstype']==1) {
+			require_once('inc/httpmysql/httpmysql.php');
+			$remote_connection=new HTTPMySQL("http://$rdbauth[user]:$rdbauth[password]@$rdbauth[host]/$rdbauth[database]/query.php"); //HTTPMySQL remote connection
+		}
+		else {
+			$remote_connection=new MySQLi($rdbauth['host'],$rdbauth['user'],$rdbauth['password'],$rdbauth['database']);
+		}
+		return $remote_connection;
+	}
+}
+$rdb_auth=new rdb_auth;
\ No newline at end of file

=== renamed file 'inc/remotedbauth.php' => 'inc/rdb/rdb.php'
--- inc/remotedbauth.php	2011-01-30 17:23:45 +0000
+++ inc/rdb/rdb.php	2011-03-30 16:10:37 +0000
@@ -1,31 +1,39 @@
-<?php //@./inc/remotedbauth.php ?>
+<?php //@./inc/rdb/rdb.php ?>
 <?php
 /**
 * Lookup and authentication of the remote database
 */
-if(isset($_SERVER['PATH_INFO'])) { 
-	$dblookup=$local_connection->query('SELECT * FROM `remote_databases` WHERE `key`=\''.substr($_SERVER['PATH_INFO'],1,32).'\'');
-	if($dblookup->num_rows!=1) trigger_error('RemoteCP: Remote database key not found',E_USER_ERROR); //Database unknown
-	$dbaccess=$local_connection->query('SELECT * FROM `remote_databases_assignments` WHERE `key`=\''.substr($_SERVER['PATH_INFO'],1,32).'\' AND `username`=\''.$session->username.'\'');
-	if($dbaccess->num_rows!=1) {
-		trigger_error('RemoteCP: Remote database access not allowed',E_USER_ERROR);
-	}
-	$rdbaccess=$dbaccess->fetch_assoc();
-	define("RDB_AUTH",$rdbaccess['level']);
-	$rdbauth=$dblookup->fetch_assoc();
-	if($rdbauth['accesstype']) {
-		require_once('inc/httpmysql/httpmysql.php');
-		$remote_connection=new HTTPMySQL("http://$rdbauth[user]:$rdbauth[password]@$rdbauth[host]/$rdbauth[database]/query.php"); //HTTPMySQL remote connection
-	}
-	else {
-		$remote_connection=new MySQLi($rdbauth['host'],$rdbauth['user'],$rdbauth['password'],$rdbauth['database']);
-	}
-	define("RDB",true);
+require_once('inc/rdb/auth.php');
+if(!$rdb_auth->exists) {
+	die('Remote database does not exist');
 }
 else {
-	$remote_connection=NULL;
-	define("RDB",false);
+	$remote_connection=$rdb_auth->connect();
 }
 
-if(RDB) require_once('inc/remote_session/session.php'); //Load the remote session handler
+// if(isset($_SERVER['PATH_INFO'])) { 
+	// $dblookup=$local_connection->query('SELECT * FROM `remote_databases` WHERE `key`=\''.substr($_SERVER['PATH_INFO'],1,32).'\'');
+	// if($dblookup->num_rows!=1) trigger_error('RemoteCP: Remote database key not found',E_USER_ERROR); //Database unknown
+	// $dbaccess=$local_connection->query('SELECT * FROM `remote_databases_assignments` WHERE `key`=\''.substr($_SERVER['PATH_INFO'],1,32).'\' AND `username`=\''.$session->username.'\'');
+	// if($dbaccess->num_rows!=1) {
+		// trigger_error('RemoteCP: Remote database access not allowed',E_USER_ERROR);
+	// }
+	// $rdbaccess=$dbaccess->fetch_assoc();
+	// define("RDB_AUTH",$rdbaccess['level']);
+	// $rdbauth=$dblookup->fetch_assoc();
+	// if($rdbauth['accesstype']) {
+		// require_once('inc/httpmysql/httpmysql.php');
+		// $remote_connection=new HTTPMySQL("http://$rdbauth[user]:$rdbauth[password]@$rdbauth[host]/$rdbauth[database]/query.php"); //HTTPMySQL remote connection
+	// }
+	// else {
+		// $remote_connection=new MySQLi($rdbauth['host'],$rdbauth['user'],$rdbauth['password'],$rdbauth['database']);
+	// }
+	// define("RDB",true);
+// }
+// else {
+	// $remote_connection=NULL;
+	// define("RDB",false);
+// }
+
+// if(RDB) require_once('inc/rdb/session.php'); //Load the remote session handler
 ?>
\ No newline at end of file

=== renamed file 'inc/remote_session/session.php' => 'inc/rdb/session.php'
--- inc/remote_session/session.php	2011-01-31 16:01:17 +0000
+++ inc/rdb/session.php	2011-03-30 16:10:37 +0000
@@ -1,36 +1,33 @@
-<?php //@./inc/remote_session/session.php ?>
+<?php //@./inc/rdb/session.php ?>
 <?php
-class remote_session {
-	private $database;
-	public $userlevel;
-	public $dbkey=NULL; //Set the database key
-	private $username;
-	private $authenticated;
-	
-	function __construct() {
-		global $local_connection,$session;
-		$this->dbkey=substr($_SERVER['PATH_INFO'],1,32);
-		$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;
-	}
-}
-
-$remote_session=new remote_session;
\ No newline at end of file
+// class remote_session {
+	// public bool $logged_in=false;
+	// public int $userlevel=0;
+
+	// function __construct() {
+		// global $rdbauth,$session;
+		// $this->dbkey=substr($_SERVER['PATH_INFO'],1,32);
+		// $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;
+	// }
+// }
+
+// $remote_session=new remote_session;
\ No newline at end of file

=== removed directory 'inc/remote_session'
=== modified file 'panel.php'
--- panel.php	2011-03-14 17:11:00 +0000
+++ panel.php	2011-03-30 16:10:37 +0000
@@ -180,59 +180,44 @@
 <!-- AJAX_START -->
 <?php
 	if($_GET['control']=="userinfo"||$_GET['control']=="useredit") {
-		//Load system/user_props.php
-		require_once('system/user_props.php');
+		//Load system_local/user_props.php
+		require_once('system_local/user_props.php');
 	}
 	else if($_GET['control']=="logs") { 
-		//Load system/logs.php
-		require_once('system/logs.php');
+		//Load system_local/logs.php
+		require_once('system_local/logs.php');
 	}
 	else if($_GET['control']=="desktop") { 
-		//Load system/desktop.php
-		require_once('system/desktop.php');
+		//Load system_local/desktop.php
+		require_once('system_local/desktop.php');
 	}
 	else if($_GET['control']=="mail") {
-		//Load system/mail.php
-		require_once('system/mail.php');
+		//Load system_local/mail.php
+		require_once('system_local/mail.php');
 	}
 	else if($_GET['control']=="getsysusers") {
-		//Load system/get_sys_users.php
-		require_once('system/get_sys_users.php');
-	}
-	else if($_GET['control']=="cms") {
-		//Load system/cms.php
-		require_once('system/cms.php');
-	}
-	else if($_GET['control']=="addons") {
-		require_once('system/plugins/init.php'); //Load APIs
-		if(!isset($_GET['aref'])) $_GET['aref']='';
-		//Load system/plugins/?????.php
-		if(!require_once('system/plugins/'.$_GET['aref'].'/default.php')) { exit; }
+		//Load system_local/get_sys_users.php
+		require_once('system_local/get_sys_users.php');
 	}
 	else if($_GET['control']=="login") {
 		//Load login module
-		require_once('system/auth/login.php');
+		require_once('system_local/auth/login.php');
 	}
 	else if($_GET['control']=="logoff") {
 		//Load logoff module
-		require_once('system/auth/logoff.php');
+		require_once('system_local/auth/logoff.php');
 	}
 	else if($_GET['control']=="register") {
 		//Load register module
-		require_once('system/register.php');
+		require_once('system_local/register.php');
 	}
 	else if($_GET['control']=="admin") {
 		//Load admin module
-		if(!RDB) require_once('system/admin-admin.php');
-		else require_once('system/database.php');
-	}
-	else if($_GET['control']=="create_site") {
-		//Load site creation module
-		require_once('system/create_site.php');
+		require_once('system_local/admin-admin.php');
 	}
 	else if($_GET['control']=="database") {
-		//Load external database module
-		require_once('system/database.php');
+		//Load add database module
+		require_once('system_local/database.php');
 	}
 }?>
 <!-- AJAX_STOP --></body></html>

=== added file 'remote_panel.php'
--- remote_panel.php	1970-01-01 00:00:00 +0000
+++ remote_panel.php	2011-03-30 16:10:37 +0000
@@ -0,0 +1,220 @@
+<?php //@./remote_panel.php ?>
+<?php
+define('__DEBUG__',true);
+/**
+ * remote_panel.php - Main script
+ * This file is called from the webbrowser when using RemoteCP to connect to a remote database.
+ */ 
+require('inc/controllers.php');
+require_once('inc/rdb/rdb.php');
+require_once('inc/accountlevels.php');
+$t->addFile(__FILE__);
+//Basic HTML start
+?>
+<!DOCTYPE html>
+<html><head>
+<title>Remote CP</title>
+<style type="text/css">
+html {width: 100%; height: 100%; left:0; right: 0; top:0; bottom:0;}
+body {font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; font-size: 14px;}
+</style>
+<link type="text/css" href="<?php echo URL_JQUERY; ?>/css/jquery-ui.css" rel="stylesheet">
+<script language='JavaScript' src='<?php echo DOMAIN; ?>/scripts.js'></script>
+<script language="JavaScript" type="application/javascript">
+var URL_SCRIPTS="<?php echo URL_SCRIPTS; ?>"; //PHP Constant URL_SCRIPTS
+</script>
+<script>
+	function openusers(element) {
+		element.id='uid_'+Math.random();
+		selectuser=open('?control=getsysusers&id='+element.id,'userselect','resizable=no,width=200,height=400'); selectuser.opener=self;
+	}
+</script>
+<?php
+
+
+if(!isset($_GET['control'])) { ?>
+	<style type="text/css">
+	body{ font: 62.5% "Trebuchet MS", sans-serif; margin: 0 50px;}
+	#tabs li .ui-icon-close { float: left; margin: 0.4em 0.2em 0 0; cursor: pointer; }
+	#tabs div a {cursor: pointer; text-decoration: underline; color: blue;}
+	.ui-progressbar-value { background-image: url(<?php echo URL_JQUERY; ?>/images/pbar-ani.gif); }
+	.ui-sortable { list-style: none; padding: 1 em;}
+	</style>
+	<script language="JavaScript">
+	window.onerror=function(msg, url, line) {$('#dlg_js-e').dialog('open'); $('#dlg_js-e').append('<div class="ui-state-highlight ui-corner-all" style="margin-top: 20px; padding: 0 .7em;"><p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>Fout beschrijving: <tt>!JS['+url+':'+line+'::'+msg+']!</tt></p></div>')}
+	var loaded_scripts=new Array();
+	loaded_scripts.push('NULL');
+	</script>
+
+	<script language="JavaScript">
+	var open_tabs=new Array();
+	var tab_loc=new Array();
+	tab_loc['tabs-desktop']='?control=desktop';
+	open_tabs[0]='tabs-desktop';
+	var $tabs;
+	var logged_in = false;
+
+	$(function(){
+			// GUI classes
+				$('.gui-dlg').dialog({
+					autoOpen: false,
+					width: 600,
+					show: 'puff',
+					hide: 'fold'
+				});
+
+				$('.gui-dlg-alert').dialog({
+					resizable: false,
+					draggable: false,
+					buttons: {
+						"Ok": function() { 
+							$(this).dialog("close"); 
+						}
+					}
+				});
+				$('.gui-dlg-fs').dialog({ modal: true});
+				$('.gui-dlg-noresize').dialog({ resizable: false});
+						
+				$('.gui-button').button();
+			
+		
+
+			// Tab templates... DO NOT EDIT
+				$tabs = $('#tabs').tabs({
+				tabTemplate: '<li><a href="#{href}" >#{label}</a> <span class="ui-icon ui-icon-close">Remove Tab</span></li>',
+				add: function(event, ui) {
+				$(ui.panel).append('');
+				$tabs.tabs('select', '#' + ui.panel.id);
+				}
+				});
+
+				// close icon: removing the tab on click
+				// note: closable tabs gonna be an option in the future - see http://dev.jqueryui.com/ticket/3924
+				$('#tabs span.ui-icon-close').live('click', function() {
+				var index = $('li',$tabs).index($(this).parent());
+				var href=document.getElementById('tabs').getElementsByTagName('a')[index].href;
+				open_tabs.key_unset(href.substring(href.indexOf('#')+1));
+				tab_loc[href.substring(href.indexOf('#')+1)]="";
+				$tabs.tabs('remove', index);
+				//open_tabs.key_unset(index);
+				});
+				$('.gui-progress').progressbar({value: 100});
+				
+	});
+	//addTab function.
+	/**********************
+	Spec:
+	*title: Tab title
+	*content: Tab content. [Can be ajax request]
+	*                         ->e.g.: *addTab('title',ajax.get(url));* OR *addTab('title'),ajax.post(url,post_parameters));*
+	***********************/
+	function addTab(title, content, ref) {
+		if(!open_tabs.in_array(ref)){
+			$tabs.tabs('add', '#'+ref, title);
+			open_tabs.push(ref);
+			document.getElementById(ref).innerHTML=content;
+		}
+		$tabs.tabs('select','#'+ref);
+	}
+	function openLoc(title,url,tab) {
+		tab_loc[tab]=url;
+		addTab(title,'<div class="gui-progress"><'+'/div>',tab);
+		$('.gui-progress').progressbar({value: 100});
+		//$.getScript(url+'&getscript');
+		document.getElementById(tab).innerHTML=ajax.get(url);
+	}
+	function refreshLoc() {
+		for (i=0;i<open_tabs.length;i++) {
+			document.getElementById(open_tabs[i]).innerHTML=ajax.get(tab_loc[open_tabs[i]]);
+		}
+	}
+	function refreshCurrentTab(){
+		tid=document.getElementById('tabs').children[$tabs.tabs('option','selected')+1].id
+		document.getElementById(tid).innerHTML=ajax.get(tab_loc[tid]);
+	}
+	function closeCurrentTab(){
+		var index=$tabs.tabs('option','selected');
+		var href=document.getElementById('tabs').getElementsByTagName('a')[index].href;
+		open_tabs.key_unset(href.substring(href.indexOf('#')+1));
+		tab_loc[href.substring(href.indexOf('#')+1)]="";
+		$tabs.tabs('remove', index);
+	}
+	
+	</script>
+
+	</head>
+	<body>
+	<div id="tabs">
+		<ul>
+
+			<li><a href="#tabs-desktop"><?php echo $t->_('Desktop'); ?></a></li>
+		</ul>
+		<div id="tabs-desktop">
+		<div class='gui-progress'></div>
+		</div>
+	</div>
+	<div id="dlg_js-e" title="JavaScript ERROR" class="gui-dlg gui-dlg-fs gui-dlg-alert">
+	<div class="ui-state-error ui-corner-all" style="padding: 0 .7em;"><p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span><?php echo $t->_('An error occured in your browser\'s JavaScript interpreter.</p><p>Probably the page doesn\'t work anymore.'); ?></p></div>
+	</div>
+	<script language="JavaScript">
+	//Initialize desktop
+	document.getElementById('tabs-desktop').innerHTML=ajax.get('?control=desktop');
+	</script>
+	</body>
+	</html>
+<?php } 
+else {
+	if(!$session->logged_in&&!($_GET['control']=="login"||$_GET['control']=="register")) { //Not logged in & not registering & not logging in
+?>
+<!-- AJAX_START --><!-- HEADERS >
+<AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
+<AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
+< HEADERS -->
+<div class="ui-state-highlight ui-corner-all" style="padding: 0 .7em;"><p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
+<?php echo $t->_('<strong>Authentication expired</strong> You were too long inactive. Your session has expired.'); ?></p><p><span aria-disabled="false" role="button" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" onclick="parent.$('#dlg_log-in').dialog('open');"><span class="ui-button-text"><?php echo $t->_('Relogin'); ?></span></span>
+</p></div>
+<!-- AJAX_STOP --><?php
+	exit;
+	}
+	elseif(!$rdb_auth->logged_in) { //Not authenticated to access the database
+?>
+<!-- AJAX_START --><!-- HEADERS >
+<AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
+<AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
+< HEADERS -->
+<div class="ui-state-highlight ui-corner-all" style="padding: 0 .7em;"><p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
+<?php echo $t->_('<strong>Access denied</strong> You are not allowed to access this database.'); ?></p>
+</p></div>
+<!-- AJAX_STOP --><?php
+	exit;
+	}
+?>
+</head><body>
+<!-- AJAX_START -->
+<?php
+	if($_GET['control']=="desktop") { 
+		//Load system_remote/desktop.php
+		require_once('system_remote/desktop.php');
+	}
+	else if($_GET['control']=="addons") {
+		require_once('system_remote/plugins/init.php'); //Load APIs
+		if(!isset($_GET['aref'])) $_GET['aref']='';
+		//Load system_remote/plugins/?????.php
+		if(!require_once('system_remote/plugins/'.$_GET['aref'].'/default.php')) { exit; }
+	}
+	else if($_GET['control']=="admin") {
+		require_once('system_remote/database.php');
+	}
+	else if($_GET['control']=="create_site") {
+		//Load site creation module
+		require_once('system_remote/create_site.php');
+	}
+}?>
+<!-- AJAX_STOP --></body></html>
+<?php
+//Save sqlsess
+$sess->save_session($_SESSION);
+
+ //PAGE END
+?>
+<!-- ==notification== page parsed by PHP (php.net) -->
\ No newline at end of file

=== modified file 'scripts/parse_js.php'
--- scripts/parse_js.php	2011-03-12 12:53:09 +0000
+++ scripts/parse_js.php	2011-03-30 16:10:37 +0000
@@ -16,7 +16,7 @@
 else {
 	if(!file_exists($_GET['u'].'.js.php')) {
 		if(substr($_GET['u'],0,2)=='a_') {
-			chdir('../system/plugins');
+			chdir('../system_remote/plugins');
 			$parts=explode('_',$_GET['u']);
 			if($parts[1]!='') $parts[1].='/';
 			if(file_exists($parts[1].'scripts.php')) {

=== modified file 'scripts/permanent/ajax.js'
--- scripts/permanent/ajax.js	2011-03-14 20:07:21 +0000
+++ scripts/permanent/ajax.js	2011-03-30 16:10:37 +0000
@@ -21,7 +21,8 @@
 			return resp;
 		}
 		else if(page.status==500) {
-			console.error(resp);
+			console.error('AJAX returned 500');
+			console.debug(page.responseText);
 			return 'false|PHP error';
 		}
 		else if(resp=='') {
@@ -46,7 +47,8 @@
 			return resp;
 		}
 		else if(page.status==500) {
-			console.error(resp);
+			console.error('AJAX returned 500');
+			console.debug(page.responseText);
 			return 'false|PHP error';
 		}
 		else if(resp=='') {

=== renamed directory 'system' => 'system_local'
=== modified file 'system_local/admin-admin.php'
--- system/admin-admin.php	2011-03-05 13:03:30 +0000
+++ system_local/admin-admin.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/admin-admin.php ?>
+<?php //@./system_local/admin-admin.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>admin_scripts.js</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>

=== modified file 'system_local/auth/login.php'
--- system/auth/login.php	2011-01-30 17:23:45 +0000
+++ system_local/auth/login.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/auth/login.php ?>
+<?php //@./system_local/auth/login.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>

=== modified file 'system_local/auth/logoff.php'
--- system/auth/logoff.php	2011-01-30 17:23:45 +0000
+++ system_local/auth/logoff.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/auth/logoff.php ?>
+<?php //@./system_local/auth/logoff.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>

=== modified file 'system_local/create_site.php'
--- system/create_site.php	2011-03-12 20:51:51 +0000
+++ system_local/create_site.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/create_site.php ?>
+<?php //@./system_local/create_site.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>create_site_scripts.js</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>

=== modified file 'system_local/database.php'
--- system/database.php	2011-02-02 19:15:56 +0000
+++ system_local/database.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/database.php ?>
+<?php //@./system_local/database.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>db_scripts.js</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
@@ -6,16 +6,15 @@
 /**
  * database.php - Administrate a  database
  * This file is used to add a new database to RemoteCP
- * and to administer this.
  */
 function help($iname) {
 	global $t;
 	return "<a onclick='db.create.question(\"$iname\");'><img src='".URL_IMG."/Silk/help.png' alt='?' title='".$t->_('Help')."'></a>";
 }
-if(!RDB&&!isset($_GET['function'])) //We are not in a remote database
+if(!isset($_GET['function']))
 	$_GET['function']='create';
 
-if(!RDB&&$_GET['function']=='create') {
+if($_GET['function']=='create') {
 	if(!isset($_POST['conn_host'])) {
 	echo "
 	<form method='POST' onsubmit='db.create.send(this); return false'>
@@ -75,108 +74,6 @@
 		}
 	}
 }
-else if(RDB&&$_GET['control']=='admin'&&$remote_session->isAdmin()) {
-	if(!isset($_GET['function'])) {
-		$settingsq=$local_connection->query('SELECT * FROM `remote_databases` WHERE `key`="'.$remote_session->dbkey.'"');
-		$settings=$settingsq->fetch_assoc();
-	?>
-	<fieldset>
-		<legend><?php echo $t->_('Settings'); ?></legend>
-	<form method='POST' onsubmit='db.admin.settings.send(this); return false'>
-		<fieldset>
-			<legend><?php echo $t->_('Connection'); ?></legend>
-			<label><input name='conn_type' type='radio' value='0' onclick='$(this.parentNode.parentNode.getElementsByTagName("fieldset")[0]).show("slow");$(this.parentNode.parentNode.getElementsByTagName("fieldset")[1]).hide("slow")' <?php echo ($settings['accesstype']==0)?'checked':''; ?>><?php echo $t->_('Normal'); ?></label> <label><input name='conn_type' type='radio' value='1' onclick='$(this.parentNode.parentNode.getElementsByTagName("fieldset")[1]).show("slow");$(this.parentNode.parentNode.getElementsByTagName("fieldset")[0]).hide("slow")' <?php echo ($settings['accesstype']==1)?'checked':''; ?>><?php echo $t->_('HTTPMySQL'); ?></label> <?php echo help('conn_type'); ?><br>
-			<fieldset style='<?php echo ($settings['accesstype']==1)?'display: none':''; ?>'>
-				<legend><?php echo $t->_('MySQL'); ?></legend>
-				<label><?php echo $t->_('MySQL host'); ?>: <input name='conn_0_host' type='text' value='<?php echo $settings['host']; ?>'></label> <?php echo help('conn_0_host'); ?><br>
-				<label><?php echo $t->_('MySQL username'); ?>: <input name='conn_0_user' type='text' value='<?php echo $settings['user']; ?>'></label><br>
-				<label><?php echo $t->_('MySQL password'); ?>: <input name='conn_0_pass' type='password' value='<?php echo $settings['password']; ?>'></label><br>
-				<label><?php echo $t->_('MySQL database'); ?>: <input name='conn_0_db' type='text' value='<?php echo $settings['database']; ?>'></label>
-			</fieldset>
-			<fieldset style='<?php echo ($settings['accesstype']==0)?'display: none':''; ?>'>
-				<legend><?php echo $t->_('HTTPMySQL'); ?></legend>
-				<label><?php echo $t->_('Domain'); ?>: <input name='conn_1_host' type='text'  value='<?php echo $settings['host']; ?>'></label> <?php echo help('conn_1_host'); ?><br>
-				<label><?php echo $t->_('Path to query.php'); ?>: <input name='conn_1_db' type='text' value='<?php echo $settings['database']; ?>'></label>/query.php <?php echo help('conn_1_db'); ?><br>
-				<label><?php echo $t->_('Username'); ?>: <input name='conn_1_user' type='text'  value='<?php echo $settings['user']; ?>'></label> <?php echo help('conn_1_user'); ?><br>
-				<label><?php echo $t->_('Password'); ?>: <input name='conn_1_pass' type='password'  value='<?php echo $settings['password']; ?>'></label> <?php echo help('conn_1_pass'); ?><br>
-			</fieldset>
-		</fieldset>
-
-		<input type='submit' value='<?php echo $t->_('Update settings'); ?>'>
-	</form>
-	</fieldset>
-	<fieldset>
-		<legend><?php echo $t->_('Users'); ?></legend>
-		<?php $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>
-	</fieldset>
-	<fieldset>
-		<legend><?php echo $t->_('Delete database'); ?></legend>
-		<a onclick='db.admin.delete()'><img src="<?php echo URL_IMG; ?>/Silk/database_delete.png" alt=''><?php echo $t->_('Delete database from the system'); ?></a>
-		<?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";
-		}
-	}
-	else if($_GET['function']=='update_settings') {
-		$_ERRORS=array();
-		if($_POST['conn_type']==0) {
-			$db_test=@mysql_connect($_POST['conn_host'],$_POST['conn_user'],$_POST['conn_pass']);
-			if(!@mysql_select_db($_POST['conn_db'],$db_test)) $_ERRORS[]=$t->_('MySQL connection error');
-		}
-		else {
-			include('inc/httpmysql/httpmysql_silent.php');
-			$db_test=@new HTTPMySQL("http://{$_POST['conn_user']}:{$_POST['conn_pass']}@{$_POST['conn_host']}/{$_POST['conn_db']}/query.php");
-			if(!$db_test->ping())$_ERRORS[]=$t->_('HTTPMySQL connection error');
-		}
-		if(count($_ERRORS)!=0) {
-			echo "false|";
-			foreach($_ERRORS as $e) {
-				echo "$e:";
-			}
-		}
-		else {
-			$local_connection->query('UPDATE `remote_databases` SET `host`="'.$_POST['conn_host'].'", `accesstype`='.$_POST['conn_type'].', `user`="'.$_POST['conn_user'].'", `password`="'.$_POST['conn_pass'].'" WHERE `key`="'.$remote_session->dbkey.'"');
-			echo "true";
-		}
-	}
-	else if($_GET['function']=='delete') {
-		$local_connection->query('DELETE FROM `remote_databases` WHERE `key`="'.$remote_session->dbkey.'"');
-		$local_connection->query('DELETE FROM `remote_databases_assignments` WHERE `key`="'.$remote_session->dbkey.'"');
-		echo "true";
-	}
-}
 else if($_GET['function']=="help") {
 	$name=$_GET['name'];
 	switch($_GET['name']) {

=== modified file 'system_local/desktop.php'
--- system/desktop.php	2011-03-05 12:56:10 +0000
+++ system_local/desktop.php	2011-03-30 16:10:37 +0000
@@ -1,9 +1,8 @@
-<?php //@./system/desktop.php ?>
+<?php //@./system_local/desktop.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
 < HEADERS -->
-<?php if(!RDB) { ?>
 <p>
 | <a onclick="openLoc('<?php echo $t->_('Account'); ?>','?control=userinfo&user=<?php echo $session->username; ?>','account')"><?php echo $t->_('Account'); ?></a> |<?php 
 if($session->isAdmin()) {?>| <a onclick="openLoc('<?php echo $t->_('Logs'); ?>','?control=logs','logs');"><?php echo $t->_('Logbooks'); ?></a> |<?php }
@@ -14,19 +13,8 @@
 <?php
 	$q=$local_connection->query("SELECT * FROM `remote_databases_assignments` WHERE `username`='$session->username'");
 	while($databases=$q->fetch_assoc()) {
-		$db=$local_connection->query("SELECT * FROM `remote_databases` WHERE `key`='$databases[key]'"); $dbinfo=$db->fetch_assoc();	?>| <a onclick="parent.frames.addFrame('panel.php/<?php echo $databases['key']; ?>/');"><?php echo $dbinfo['user'].'@'.$dbinfo['host'].'/'.$dbinfo['database']; ?></a> |<?php
+		$db=$local_connection->query("SELECT * FROM `remote_databases` WHERE `key`='$databases[key]'"); $dbinfo=$db->fetch_assoc();	?>| <a onclick="parent.frames.addFrame('remote_panel.php/<?php echo $databases['key']; ?>/');"><?php echo $dbinfo['user'].'@'.$dbinfo['host'].'/'.$dbinfo['database']; ?></a> |<?php
 	}
 	echo '| <a onclick="openLoc(\''.$t->_('Add database').'\',\'?control=database\',\'add_db\');">'.$t->_('Add database').'</a> |';
-}
-else { ?>
-<?php if(RDB_AUTH==9) {
-	?>| <a onclick="openLoc('<?php echo $t->_('Administration'); ?>','?control=admin','admin');"><?php echo $t->_('Administration'); ?></a> |
-<?php
-}
 ?>
-<hr><?php
-	$q=$remote_connection->query('SELECT * FROM sites WHERE username="'.$session->username.'"');
-	while($sites=$q->fetch_assoc()) { ?>| <a onclick="openLoc('<?php echo getSiteInfo($sites['ref'],'SITE_TITLE'); ?>','?control=addons&site=<?php echo $sites['ref']; ?>','<?php echo $sites['ref']; ?>_ctrls_main');"><?php echo getSiteInfo($sites['ref'],'SITE_TITLE'); ?></a> |<?php }
-		echo "| <a onclick=\"openLoc('".$t->_('New site')."','?control=create_site','new_site');\">".$t->_('New site')."</a> |";
-} ?>
 </p>
\ No newline at end of file

=== modified file 'system_local/get_sys_users.php'
--- system/get_sys_users.php	2011-01-30 17:23:45 +0000
+++ system_local/get_sys_users.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/get_sys_users.php ?>
+<?php //@./system_local/get_sys_users.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>

=== modified file 'system_local/login.php'
--- system/login.php	2011-01-30 17:23:45 +0000
+++ system_local/login.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/login.php ?>
+<?php //@./system_local/login.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>

=== modified file 'system_local/logs.php'
--- system/logs.php	2011-01-30 17:23:45 +0000
+++ system_local/logs.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/logs.php ?>
+<?php //@./system_local/logs.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>

=== modified file 'system_local/mail.php'
--- system/mail.php	2011-01-30 17:23:45 +0000
+++ system_local/mail.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/mail.php ?>
+<?php //@./system_local/mail.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>

=== modified file 'system_local/register.php'
--- system/register.php	2011-01-30 17:23:45 +0000
+++ system_local/register.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/register.php ?>
+<?php //@./system_local/register.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>

=== modified file 'system_local/user_props.php'
--- system/user_props.php	2011-03-14 20:13:50 +0000
+++ system_local/user_props.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/user_props.php ?>
+<?php //@./system_local/user_props.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>account_scripts.js</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>setTimeout('$("#user_edit_language").sortable().removeClass("ui-state-disabled");',1)</AJAX_SCRIPTEVAL>

=== added directory 'system_remote'
=== added file 'system_remote/database.php'
--- system_remote/database.php	1970-01-01 00:00:00 +0000
+++ system_remote/database.php	2011-03-30 16:10:37 +0000
@@ -0,0 +1,152 @@
+<?php //@./system_remote/database.php ?>
+<!-- HEADERS >
+<AJAX_SCRIPTLOC>db_scripts.js</AJAX_SCRIPTLOC>
+<AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
+< HEADERS --><?php
+/**
+ * database.php - Administrate a  database
+ * This file is used to administer a remote database
+ */
+function help($iname) {
+	global $t;
+	return "<a onclick='db.create.question(\"$iname\");'><img src='".URL_IMG."/Silk/help.png' alt='?' title='".$t->_('Help')."'></a>";
+}
+
+if($rdb_auth->level==9) {
+	if(!isset($_GET['function'])) {
+		$settingsq=$local_connection->query('SELECT * FROM `remote_databases` WHERE `key`="'.$remote_session->dbkey.'"');
+		$settings=$settingsq->fetch_assoc();
+	?>
+	<fieldset>
+		<legend><?php echo $t->_('Settings'); ?></legend>
+	<form method='POST' onsubmit='db.admin.settings.send(this); return false'>
+		<fieldset>
+			<legend><?php echo $t->_('Connection'); ?></legend>
+			<label><input name='conn_type' type='radio' value='0' onclick='$(this.parentNode.parentNode.getElementsByTagName("fieldset")[0]).show("slow");$(this.parentNode.parentNode.getElementsByTagName("fieldset")[1]).hide("slow")' <?php echo ($settings['accesstype']==0)?'checked':''; ?>><?php echo $t->_('Normal'); ?></label> <label><input name='conn_type' type='radio' value='1' onclick='$(this.parentNode.parentNode.getElementsByTagName("fieldset")[1]).show("slow");$(this.parentNode.parentNode.getElementsByTagName("fieldset")[0]).hide("slow")' <?php echo ($settings['accesstype']==1)?'checked':''; ?>><?php echo $t->_('HTTPMySQL'); ?></label> <?php echo help('conn_type'); ?><br>
+			<fieldset style='<?php echo ($settings['accesstype']==1)?'display: none':''; ?>'>
+				<legend><?php echo $t->_('MySQL'); ?></legend>
+				<label><?php echo $t->_('MySQL host'); ?>: <input name='conn_0_host' type='text' value='<?php echo $settings['host']; ?>'></label> <?php echo help('conn_0_host'); ?><br>
+				<label><?php echo $t->_('MySQL username'); ?>: <input name='conn_0_user' type='text' value='<?php echo $settings['user']; ?>'></label><br>
+				<label><?php echo $t->_('MySQL password'); ?>: <input name='conn_0_pass' type='password' value='<?php echo $settings['password']; ?>'></label><br>
+				<label><?php echo $t->_('MySQL database'); ?>: <input name='conn_0_db' type='text' value='<?php echo $settings['database']; ?>'></label>
+			</fieldset>
+			<fieldset style='<?php echo ($settings['accesstype']==0)?'display: none':''; ?>'>
+				<legend><?php echo $t->_('HTTPMySQL'); ?></legend>
+				<label><?php echo $t->_('Domain'); ?>: <input name='conn_1_host' type='text'  value='<?php echo $settings['host']; ?>'></label> <?php echo help('conn_1_host'); ?><br>
+				<label><?php echo $t->_('Path to query.php'); ?>: <input name='conn_1_db' type='text' value='<?php echo $settings['database']; ?>'></label>/query.php <?php echo help('conn_1_db'); ?><br>
+				<label><?php echo $t->_('Username'); ?>: <input name='conn_1_user' type='text'  value='<?php echo $settings['user']; ?>'></label> <?php echo help('conn_1_user'); ?><br>
+				<label><?php echo $t->_('Password'); ?>: <input name='conn_1_pass' type='password'  value='<?php echo $settings['password']; ?>'></label> <?php echo help('conn_1_pass'); ?><br>
+			</fieldset>
+		</fieldset>
+
+		<input type='submit' value='<?php echo $t->_('Update settings'); ?>'>
+	</form>
+	</fieldset>
+	<fieldset>
+		<legend><?php echo $t->_('Users'); ?></legend>
+		<?php $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>
+	</fieldset>
+	<fieldset>
+		<legend><?php echo $t->_('Delete database'); ?></legend>
+		<a onclick='db.admin.delete()'><img src="<?php echo URL_IMG; ?>/Silk/database_delete.png" alt=''><?php echo $t->_('Delete database from the system'); ?></a>
+		<?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";
+		}
+	}
+	else if($_GET['function']=='update_settings') {
+		$_ERRORS=array();
+		if($_POST['conn_type']==0) {
+			$db_test=@mysql_connect($_POST['conn_host'],$_POST['conn_user'],$_POST['conn_pass']);
+			if(!@mysql_select_db($_POST['conn_db'],$db_test)) $_ERRORS[]=$t->_('MySQL connection error');
+		}
+		else {
+			include('inc/httpmysql/httpmysql_silent.php');
+			$db_test=@new HTTPMySQL("http://{$_POST['conn_user']}:{$_POST['conn_pass']}@{$_POST['conn_host']}/{$_POST['conn_db']}/query.php");
+			if(!$db_test->ping())$_ERRORS[]=$t->_('HTTPMySQL connection error');
+		}
+		if(count($_ERRORS)!=0) {
+			echo "false|";
+			foreach($_ERRORS as $e) {
+				echo "$e:";
+			}
+		}
+		else {
+			$local_connection->query('UPDATE `remote_databases` SET `host`="'.$_POST['conn_host'].'", `accesstype`='.$_POST['conn_type'].', `user`="'.$_POST['conn_user'].'", `password`="'.$_POST['conn_pass'].'" WHERE `key`="'.$remote_session->dbkey.'"');
+			echo "true";
+		}
+	}
+	else if($_GET['function']=='delete') {
+		$local_connection->query('DELETE FROM `remote_databases` WHERE `key`="'.$remote_session->dbkey.'"');
+		$local_connection->query('DELETE FROM `remote_databases_assignments` WHERE `key`="'.$remote_session->dbkey.'"');
+		echo "true";
+	}
+}
+else if($_GET['function']=="help") {
+	$name=$_GET['name'];
+	switch($_GET['name']) {
+		case 'conn_type':
+			echo "<h1>".$t->_('Connection')."</h1>";
+			echo $t->_('<p>How should RemoteCP connect to your database?</p><p>Normal mode is preferred, but you have to be able to allow remote hosts to connect to your MySQL server. (Probably named \'Remote MySQL\' or \'Remote database access\' )</p><p>When it is not possible to choose sites who are allowed to connect to your database, you have to choose \'HTTPMySQL\'. However, this is a bit slower and requires more processing power on your server.</p>');
+		break;
+		case 'conn_0_host':
+			echo "<script>var db ={ create: {question: function(formname) { window.open('?control=database&function=help&name='+formname,'database_help','resizable=no,width=800,height=200')}}}</script>";
+			echo "<h1>".$t->_('MySQL host')."</h1>";
+			echo sprintf($t->_('<p>The machine that runs the MySQL server</p><p>If this is \'localhost\' or \'127.0.0.1\' according to your documentation, you should enter your domainname %s here.'),help('conn_1_host'));
+		break;
+		case 'conn_1_host': 
+			echo "<h1>".$t->_('Domain')."</h1>";
+			echo $t->_('<p>Your domain is what you type to visit your website</p><p>It is placed behind http:// and before the first slash. (E.g.: <tt>http://<u>remotecp.co.cc</u>/1-Home/</tt>, <tt>remotecp.co.cc</tt> is the domain).</p>');
+		break;
+		case 'conn_1_db':
+			echo "<script>var db ={ create: {question: function(formname) { window.open('?control=database&function=help&name='+formname,'database_help','resizable=no,width=800,height=200')}}}</script>";
+			echo "<h1>".$t->_('Path to query.php')."</h1>";
+			echo sprintf($t->_('<p>The path to the file query.php on your server.</p><p>The path is the part after the domain %s. For your convenience, whe have already appended \'/query.php\'. So, you must also omit that from the path.</p>'),help('conn_1_host'));
+		break;
+		case 'conn_1_user':
+			echo "<h1>".$t->_('Username')."</h1>";
+			echo $t->_('<p>What username is required to access \'query.php\'?</p><p>You should secure query.php with an username and password combination to avoid unallowed changes to your websites. What username did you use for that purpose?</p>');
+		break;
+		case 'conn_1_pass':
+			echo "<h1>".$t->_('Password')."</h1>";
+			echo $t->_('<p>What password is required to access \'query.php\'?</p><p>You should secure query.php with an username and password combination to avoid unallowed changes to your websites. What password did you use for that purpose?</p>');
+		break;
+		case 'api_ip':
+			echo "<script>var db ={ create: {question: function(formname) { window.open('?control=database&function=help&name='+formname,'database_help','resizable=no,width=800,height=200')}}}</script>";
+			echo "<h1>".$t->_('IP-address')."</h1>";
+			echo sprintf($t->_('<p>What is the IP-address belonging to your server?</p><p>An IP address is a unique identifier of 4 times a number from 0 to 255, separated by a point. (E.g.:<tt><u>69.175.113.125</u></tt>)</p><p>To find the IP address of your server open a Command Prompt window (Folder Accessories) and type <tt>ping &lt;domain %s &gt; </tt>. The first rule is roughly <tt> Pinging remotecp.co.cc  [<u>199.27.134.101</u>] with 32 bytes of data: </tt>. The underlined part is the IP address of your server. </p>'),help('conn_1_host'));
+	}
+
+}
\ No newline at end of file

=== added file 'system_remote/desktop.php'
--- system_remote/desktop.php	1970-01-01 00:00:00 +0000
+++ system_remote/desktop.php	2011-03-30 16:10:37 +0000
@@ -0,0 +1,16 @@
+<?php //@./system_remote/desktop.php ?>
+<!-- HEADERS >
+<AJAX_SCRIPTLOC>NULL</AJAX_SCRIPTLOC>
+<AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
+< HEADERS -->
+<?php if($rdb_auth->level==9) {
+	?>| <a onclick="openLoc('<?php echo $t->_('Administration'); ?>','?control=admin','admin');"><?php echo $t->_('Administration'); ?></a> |
+<?php
+}
+?>
+<hr><?php
+	$q=$remote_connection->query('SELECT * FROM sites WHERE username="'.$session->username.'"');
+	while($sites=$q->fetch_assoc()) { ?>| <a onclick="openLoc('<?php echo getSiteInfo($sites['ref'],'SITE_TITLE'); ?>','?control=addons&site=<?php echo $sites['ref']; ?>','<?php echo $sites['ref']; ?>_ctrls_main');"><?php echo getSiteInfo($sites['ref'],'SITE_TITLE'); ?></a> |<?php }
+		echo "| <a onclick=\"openLoc('".$t->_('New site')."','?control=create_site','new_site');\">".$t->_('New site')."</a> |";
+ ?>
+</p>
\ No newline at end of file

=== renamed directory 'system/plugins' => 'system_remote/plugins'
=== modified file 'system_remote/plugins/api.php'
--- system/plugins/api.php	2011-01-30 17:23:45 +0000
+++ system_remote/plugins/api.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/api.php ?>
+<?php //@./system_remote/plugins/api.php ?>
 <?php
 class addons {
 	static function installed($ref) {
@@ -6,13 +6,13 @@
 		return ($remote_connection->query('SELECT * FROM `'.SITE.'_addons` WHERE `reference`=\''.$ref.'\' AND `status`=1')->num_rows==1);
 	}
 	static function available($ref) {
-		if(!is_dir('system/plugins/'.$ref)) return false;
-		if(!file_exists('system/plugins/'.$ref.'/default.php')) return false;
+		if(!is_dir('system_remote/plugins/'.$ref)) return false;
+		if(!file_exists('system_remote/plugins/'.$ref.'/default.php')) return false;
 		return true;
 	}
 	static function installable($ref) {
-		if(!is_dir('system/plugins/'.$ref)) return false;
-		if(!file_exists('system/plugins/'.$ref.'/install.php')||!file_exists('system/plugins/'.$ref.'/uninstall.php')) return false;
+		if(!is_dir('system_remote/plugins/'.$ref)) return false;
+		if(!file_exists('system_remote/plugins/'.$ref.'/install.php')||!file_exists('system_remote/plugins/'.$ref.'/uninstall.php')) return false;
 		return true;
 	}
 }
\ No newline at end of file

=== modified file 'system_remote/plugins/cms/api.php'
--- system/plugins/cms/api.php	2011-01-30 17:23:45 +0000
+++ system_remote/plugins/cms/api.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/cms/api.php ?>
+<?php //@./system_remote/plugins/cms/api.php ?>
 <?php
 class cms {
 	static function get_pages() {

=== modified file 'system_remote/plugins/cms/default.php'
--- system/plugins/cms/default.php	2011-03-14 18:28:28 +0000
+++ system_remote/plugins/cms/default.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/cms/default.php ?>
+<?php //@./system_remote/plugins/cms/default.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>a_cms_scripts.js</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
@@ -11,30 +11,30 @@
     * COPYRIGHT 2010 remotecp.co.cc
     */
 
- if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.$site.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
+ if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.SITE.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
 if(!isset($_GET['function'])) { $_GET['function']="list"; }
 if($_GET['function']=="list") {
  $pagesq = cms::get_pages();?>
 	<table><tr><th></th><th colspan="2"><?php echo $t->_('Title'); ?></th><th title="<?php $t->_("Link path"); ?>"><?php $t->_("Link"); ?></th><th><?php $t->_("Actions"); ?></th></tr>
 <?php foreach($pagesq as $pages) { ?>
-	<tr><td <?php if($pages['type']=='0'||$pages['type']=='2') { ?> ondblclick="cms.page.edit_rights.expand('<?php echo $site; ?>','<?php echo $pages['id']; ?>',this,'<?php echo $pages['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($pages['access']==0) { ?>green<?php } else if($pages['access']==1) { ?>orange<?php } else if($pages['access']==2) { ?>red<?php } ?>.png"><?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/link.png"><?php } ?></td><td colspan="2" ondblclick="cms.page.edit_title.expand('<?php echo $site; ?>','<?php echo $pages['id']; ?>',this)"><?php echo $pages['page_title']; ?></td><td<?php if($pages['type']=='0'||$pages['type']=='2') { ?>>/<?php echo $pages['id'].'-'.preg_replace('/[^a-zA-Z0-9]/','_',$pages['page_title']); } else { ?> ondblclick="cms.page.edit_link.expand('<?php echo $site; ?>','<?php echo $pages['id']; ?>',this)"><?php echo $pages['link'];  }?></td><td><?php if($pages['type']=='0'||$pages['type']=='1') { ?><a onclick="cms.page.delete('<?php echo $site; ?>','<?php echo $pages['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete page'); ?>"></a> <?php } ?><a onclick="cms.page.edit_order.down('<?php echo $site; ?>','<?php echo $pages['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move the page down'); ?>"></a> <a onclick="cms.page.edit_order.up('<?php echo $site; ?>','<?php echo $pages['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move the page up'); ?>"></a> <a onclick="cms.page.visiblity.<?php if($pages['visible']){ echo "off";} else { echo "on";} ?>('<?php echo $site; ?>','<?php echo $pages['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/lightbulb<?php if(!$pages['visible']) { echo "_off";} ?>.png" alt="<?php if($pages['visible']) { echo $t->_('Visible');} else { echo $t->_('Invisible');} ?>" title="<?php if($pages['visible']) { echo $t->_('Make page invisible');} else { echo $t->_('Make page visible');} ?>"></a></td></tr>
+	<tr><td <?php if($pages['type']=='0'||$pages['type']=='2') { ?> ondblclick="cms.page.edit_rights.expand('<?php echo SITE; ?>','<?php echo $pages['id']; ?>',this,'<?php echo $pages['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($pages['access']==0) { ?>green<?php } else if($pages['access']==1) { ?>orange<?php } else if($pages['access']==2) { ?>red<?php } ?>.png"><?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/link.png"><?php } ?></td><td colspan="2" ondblclick="cms.page.edit_title.expand('<?php echo SITE; ?>','<?php echo $pages['id']; ?>',this)"><?php echo $pages['page_title']; ?></td><td<?php if($pages['type']=='0'||$pages['type']=='2') { ?>>/<?php echo $pages['id'].'-'.preg_replace('/[^a-zA-Z0-9]/','_',$pages['page_title']); } else { ?> ondblclick="cms.page.edit_link.expand('<?php echo SITE; ?>','<?php echo $pages['id']; ?>',this)"><?php echo $pages['link'];  }?></td><td><?php if($pages['type']=='0'||$pages['type']=='1') { ?><a onclick="cms.page.delete('<?php echo SITE; ?>','<?php echo $pages['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete page'); ?>"></a> <?php } ?><a onclick="cms.page.edit_order.down('<?php echo SITE; ?>','<?php echo $pages['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move the page down'); ?>"></a> <a onclick="cms.page.edit_order.up('<?php echo SITE; ?>','<?php echo $pages['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move the page up'); ?>"></a> <a onclick="cms.page.visiblity.<?php if($pages['visible']){ echo "off";} else { echo "on";} ?>('<?php echo SITE; ?>','<?php echo $pages['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/lightbulb<?php if(!$pages['visible']) { echo "_off";} ?>.png" alt="<?php if($pages['visible']) { echo $t->_('Visible');} else { echo $t->_('Invisible');} ?>" title="<?php if($pages['visible']) { echo $t->_('Make page invisible');} else { echo $t->_('Make page visible');} ?>"></a></td></tr>
 	<?php if($pages['type']=='0'||$pages['type']=='2') {
 	$sectionsq = cms::get_sections($pages['id']);
 	foreach ($sectionsq as $sections) {?>
-		<tr><td>&nbsp;</td><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png"></td><td ondblclick="cms.section.edit_title.expand('<?php echo $site; ?>','<?php echo $sections['id']; ?>',this)"><?php echo $sections['section_title']; ?></td><td>/<?php echo $pages['id'].'-'.preg_replace('/[^a-zA-Z0-9]/','_',$pages['page_title']).'/#'.preg_replace('/[^a-zA-Z0-9]/','_',$sections['section_title']); ?></td><td><a onclick="cms.section.delete('<?php echo $site; ?>','<?php echo $sections['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete section'); ?>"></a> <a onclick="cms.section.edit_order.down('<?php echo $site; ?>','<?php echo $sections['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move section down'); ?>"></a> <a onclick="cms.section.edit_order.up('<?php echo $site; ?>','<?php echo $sections['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move section up'); ?>"></a> <?php if($sections['plugin-reference']=='') { ?><a onclick="cms.section.open_mce('<?php echo $site; ?>','<?php echo $sections['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit section content'); ?>"></a> <?php } ?><a onclick="cms.section.switch_page.expand('<?php echo $site; ?>','<?php echo $sections['id']; ?>','<?php echo $pages['id']; ?>',this)"><img src="<?php echo URL_IMG; ?>/Silk/arrow_switch.png" alt="<?php echo $t->_('Other page'); ?>" title="<?php echo $t->_('Move this section to another page'); ?>"></a></td></tr>
+		<tr><td>&nbsp;</td><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png"></td><td ondblclick="cms.section.edit_title.expand('<?php echo SITE; ?>','<?php echo $sections['id']; ?>',this)"><?php echo $sections['section_title']; ?></td><td>/<?php echo $pages['id'].'-'.preg_replace('/[^a-zA-Z0-9]/','_',$pages['page_title']).'/#'.preg_replace('/[^a-zA-Z0-9]/','_',$sections['section_title']); ?></td><td><a onclick="cms.section.delete('<?php echo SITE; ?>','<?php echo $sections['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete section'); ?>"></a> <a onclick="cms.section.edit_order.down('<?php echo SITE; ?>','<?php echo $sections['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move section down'); ?>"></a> <a onclick="cms.section.edit_order.up('<?php echo SITE; ?>','<?php echo $sections['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move section up'); ?>"></a> <?php if($sections['plugin-reference']=='') { ?><a onclick="cms.section.open_mce('<?php echo SITE; ?>','<?php echo $sections['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit section content'); ?>"></a> <?php } ?><a onclick="cms.section.switch_page.expand('<?php echo SITE; ?>','<?php echo $sections['id']; ?>','<?php echo $pages['id']; ?>',this)"><img src="<?php echo URL_IMG; ?>/Silk/arrow_switch.png" alt="<?php echo $t->_('Other page'); ?>" title="<?php echo $t->_('Move this section to another page'); ?>"></a></td></tr>
 	<?php } ?>	
-		<tr onclick="cms.section.add('<?php echo $site; ?>',<?php echo $pages['id']; ?>)"><td>&nbsp;</td><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="3"><?php echo $t->_('Add a section to this page'); ?></td></tr>
+		<tr onclick="cms.section.add('<?php echo SITE; ?>',<?php echo $pages['id']; ?>)"><td>&nbsp;</td><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="3"><?php echo $t->_('Add a section to this page'); ?></td></tr>
 <?php } }?>
-	<tr onclick="cms.page.add('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="4"><?php echo $t->_('Add page'); ?></td></tr>
-	<tr onclick="cms.page.add_link('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/link_add.png" alt=""></td><td colspan="4"><?php echo $t->_('Add link'); ?></td></tr>
+	<tr onclick="cms.page.add('<?php echo SITE; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="4"><?php echo $t->_('Add page'); ?></td></tr>
+	<tr onclick="cms.page.add_link('<?php echo SITE; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/link_add.png" alt=""></td><td colspan="4"><?php echo $t->_('Add link'); ?></td></tr>
 	</table>
 	<ul style='display: none';>
 		<?php $pagesq = cms::get_pages(); foreach($pagesq as $pages) { ?>
-		<li class='ui-state-default' id='sort_<?php echo $site; ?>_cms_<?php echo $pages['id']; ?>'><?php echo $pages['page_title']; 
+		<li class='ui-state-default' id='sort_<?php echo SITE; ?>_cms_<?php echo $pages['id']; ?>'><?php echo $pages['page_title']; 
 			if($pages['type']==0||$pages['type']==2) { ?>
-				<ul class='sort_<?php echo $site; ?>_cms_sub sub-sortable'>
+				<ul class='sort_<?php echo SITE; ?>_cms_sub sub-sortable'>
 				<?php $sectionsq=cms::get_sections($pages['id']); foreach($sectionsq as $sections) { ?>
-					<li class='ui-state-default'  id='sort_<?php echo $site; ?>_cms_sub_<?php echo $sections['id']; ?>'><?php echo $sections['section_title']; ?></li>
+					<li class='ui-state-default'  id='sort_<?php echo SITE; ?>_cms_sub_<?php echo $sections['id']; ?>'><?php echo $sections['section_title']; ?></li>
 				<?php } ?>
 				<li class='gui-nosort ui-state-disabled ui-state-default'><?php echo $t->_('Add a section to this page'); ?></li>
 				</ul>
@@ -44,7 +44,7 @@
 		<li class='gui-nosort ui-state-disabled ui-state-default'><?php echo $t->_('Add page'); ?></li>
 		<li class='gui-nosort ui-state-disabled ui-state-default'><?php echo $t->_('Add link'); ?></li>
 	</ul>
-	<input type='button' onclick='$(this).prevAll("table").hide("blind","slow");$(this).prev("ul").show("blind","slow").sortable({items:"li:not(.gui-nosort,li li)"});$(".sort_<?php echo $site; ?>_cms_sub").sortable({items:"li:not(.gui-nosort)",connectWith:".sort_<?php echo $site; ?>_cms_sub"});$(this).next().show("blind","slow");$(this).hide("blind","slow")' value='<?php echo $t->_('Sort'); ?>'> <input type='button' onclick='cms.sort("<?php echo $site; ?>",multiSortableToArray($(this).prevAll("ul")))' value='<?php echo $t->_('Save this order'); ?>' style='display:none'>
+	<input type='button' onclick='$(this).prevAll("table").hide("blind","slow");$(this).prev("ul").show("blind","slow").sortable({items:"li:not(.gui-nosort,li li)"});$(".sort_<?php echo SITE; ?>_cms_sub").sortable({items:"li:not(.gui-nosort)",connectWith:".sort_<?php echo SITE; ?>_cms_sub"});$(this).next().show("blind","slow");$(this).hide("blind","slow")' value='<?php echo $t->_('Sort'); ?>'> <input type='button' onclick='cms.sort("<?php echo SITE; ?>",multiSortableToArray($(this).prevAll("ul")))' value='<?php echo $t->_('Save this order'); ?>' style='display:none'>
 	
 <?php } 
 else if($_GET['function']=="delete") { 
@@ -59,11 +59,11 @@
 }
 else if($_GET['function']=="edit_title") {
 	if($_GET['type']=="page") {
-		$q= $remote_connection->query('UPDATE `'.$site.'_pageindex` SET `page_title`="'.$_GET['title'].'" WHERE `id`='.$_GET['id']);
+		$q= $remote_connection->query('UPDATE `'.SITE.'_pageindex` SET `page_title`="'.$_GET['title'].'" WHERE `id`='.$_GET['id']);
 		if($q) { echo "true"; } else { echo "false"; } 
 	}
 	else if($_GET['type']=="section") {
-		$q= $remote_connection->query('UPDATE `'.$site.'_pages` SET `section_title`="'.$_GET['title'].'" WHERE `id`='.$_GET['id']);
+		$q= $remote_connection->query('UPDATE `'.SITE.'_pages` SET `section_title`="'.$_GET['title'].'" WHERE `id`='.$_GET['id']);
 		if($q) { echo "true"; } else { echo "false"; }
 	}
 } 
@@ -86,12 +86,12 @@
 	else {
 		$page_length=count($_POST['order_main']);
 		for($i=0;$i<$page_length;$i++) {
-			$x[]=$remote_connection->query('UPDATE `'.$site.'_pageindex` SET `page_order`='.$i.' WHERE `id`='.$_POST['order_main'][$i]);
+			$x[]=$remote_connection->query('UPDATE `'.SITE.'_pageindex` SET `page_order`='.$i.' WHERE `id`='.$_POST['order_main'][$i]);
 		}
 		foreach($_POST['order_sub'] as $pageid=>$sections) {
 			$sect_length=count($sections);
 			for($i=0;$i<$sect_length;$i++) {
-				$x[]=$remote_connection->query('UPDATE `'.$site.'_pages` SET `page_id`='.$pageid.', `section_order`='.$i.' WHERE `id`='.$sections[$i]);
+				$x[]=$remote_connection->query('UPDATE `'.SITE.'_pages` SET `page_id`='.$pageid.', `section_order`='.$i.' WHERE `id`='.$sections[$i]);
 			}
 		}
 		if(!in_array(false,$x,true)) echo "true";
@@ -115,7 +115,7 @@
 }
 else if($_GET['function']=="switch_page") {
 	if(isset($_GET['getpages'])) {
-		$query=$remote_connection->query('SELECT * FROM `'.$site.'_pageindex` WHERE `type`=2 OR `type`=0');
+		$query=$remote_connection->query('SELECT * FROM `'.SITE.'_pageindex` WHERE `type`=2 OR `type`=0');
 		while($pages=$query->fetch_assoc()) {
 			if($_GET['currentpage']!=$pages['id']) {
 				echo '<option value="'.$pages['id'].'">'.$pages['page_title'].'</option>';
@@ -126,7 +126,7 @@
 		}
 	}
 	else {
-		$query0=$remote_connection->query('SELECT * FROM `'.$site.'_pages` WHERE `page_id`='.$_GET['newpage'].' ORDER BY `section_order` DESC');
+		$query0=$remote_connection->query('SELECT * FROM `'.SITE.'_pages` WHERE `page_id`='.$_GET['newpage'].' ORDER BY `section_order` DESC');
 		$res0=$query0->fetch_assoc();
 		$order_last=$res0['section_order'];
 		$new_order_last=$order_last+1;
@@ -181,7 +181,7 @@
 
 </script>
 </head><body>
-<form action="?control=addons&site=<?php echo $site; ?>&aref=cms&function=mce&id=<?php echo $_GET['id']; ?>&save=true" method="POST">
+<form action="?control=addons&site=<?php echo SITE; ?>&aref=cms&function=mce&id=<?php echo $_GET['id']; ?>&save=true" method="POST">
 <textarea name="section_main" id="section_main" style="width: 100%; height: 100%"><?php echo $edit_data['section_main']; ?></textarea>
 </form>
 <?php }
\ No newline at end of file

=== modified file 'system_remote/plugins/cms/scripts.php'
--- system/plugins/cms/scripts.php	2011-03-14 17:11:00 +0000
+++ system_remote/plugins/cms/scripts.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/cms/scripts.php ?>
+<?php //@./system_remote/plugins/cms/scripts.php ?>
 var cms={
 	page: {
 		edit_title: {

=== modified file 'system_remote/plugins/col1/api.php'
--- system/plugins/col1/api.php	2011-03-29 18:57:42 +0000
+++ system_remote/plugins/col1/api.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/col1/api.php ?>
+<?php //@./system_remote/plugins/col1/api.php ?>
 <?php
 class col1 implements pluginSingleTable {
 	static function gets() {

=== modified file 'system_remote/plugins/col1/default.php'
--- system/plugins/col1/default.php	2011-03-14 18:28:28 +0000
+++ system_remote/plugins/col1/default.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/col1/default.php ?>
+<?php //@./system_remote/plugins/col1/default.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>a_col1_scripts.js</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
@@ -11,17 +11,17 @@
     * COPYRIGHT 2010 remotecp.co.cc
     */
 
- if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.$site.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
+ if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.SITE.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
 if(!isset($_GET['function'])) {$_GET['function']="list"; }
 if($_GET['function']=="list") {
 	$query = col1::gets(); ?>
 	<table><tr><th></th><th><?php echo $t->_('Title'); ?></th><th><?php echo $t->_('Actions'); ?></th></tr>
 	<?php foreach($query as $section) {?>
-	<tr id='sort_<?php echo $site; ?>_col1_<?php echo $section['id']; ?>'><td<?php if($section['plugin-reference']==NULL) { ?> ondblclick="col1.edit_rights.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this,'<?php echo $section['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($section['access']==0) { ?>green<?php } else if($section['access']==1) { ?>orange<?php } else if($section['access']==2) { ?>red<?php } ?>.png"> <?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png" alt=""><?php } ?></td><td ondblclick="col1.edit_title.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this)"><?php echo $section['title']; ?></td><td><?php if($section['plugin-reference']==NULL) { ?><a onclick="col1.delete('<?php echo $site; ?>','<?php echo $section['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete section'); ?>"></a> <?php } ?><a onclick="col1.edit_order.down('<?php echo $site; ?>','<?php echo $section['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move section down'); ?>"></a> <a onclick="col1.edit_order.up('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move section up'); ?>"></a><?php if($section['plugin-reference']==NULL) { ?> <a onclick="col1.open_mce('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit section content'); ?>"></a><?php } ?></td></tr>
+	<tr id='sort_<?php echo SITE; ?>_col1_<?php echo $section['id']; ?>'><td<?php if($section['plugin-reference']==NULL) { ?> ondblclick="col1.edit_rights.expand('<?php echo SITE; ?>','<?php echo $section['id']; ?>',this,'<?php echo $section['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($section['access']==0) { ?>green<?php } else if($section['access']==1) { ?>orange<?php } else if($section['access']==2) { ?>red<?php } ?>.png"> <?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png" alt=""><?php } ?></td><td ondblclick="col1.edit_title.expand('<?php echo SITE; ?>','<?php echo $section['id']; ?>',this)"><?php echo $section['title']; ?></td><td><?php if($section['plugin-reference']==NULL) { ?><a onclick="col1.delete('<?php echo SITE; ?>','<?php echo $section['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete section'); ?>"></a> <?php } ?><a onclick="col1.edit_order.down('<?php echo SITE; ?>','<?php echo $section['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move section down'); ?>"></a> <a onclick="col1.edit_order.up('<?php echo SITE; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move section up'); ?>"></a><?php if($section['plugin-reference']==NULL) { ?> <a onclick="col1.open_mce('<?php echo SITE; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit section content'); ?>"></a><?php } ?></td></tr>
 	<?php } ?>
-	<tr class='gui-nosort' onclick="col1.add('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="2"><?php echo $t->_('Add section'); ?></td></tr>
+	<tr class='gui-nosort' onclick="col1.add('<?php echo SITE; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="2"><?php echo $t->_('Add section'); ?></td></tr>
 	</table>
-	<input type='button' onclick='tableToSortable($(this).prev("table"),1,{items:"li:not(.gui-nosort)"});$(this).next().show("blind","slow");$(this).hide("blind","slow")' value='<?php echo $t->_('Sort'); ?>'> <input type='button' onclick='col1.sort("<?php echo $site; ?>",$(this).prevAll("ul").sortable("toArray"))' value='<?php echo $t->_('Save this order'); ?>' style='display:none'>
+	<input type='button' onclick='tableToSortable($(this).prev("table"),1,{items:"li:not(.gui-nosort)"});$(this).next().show("blind","slow");$(this).hide("blind","slow")' value='<?php echo $t->_('Sort'); ?>'> <input type='button' onclick='col1.sort("<?php echo SITE; ?>",$(this).prevAll("ul").sortable("toArray"))' value='<?php echo $t->_('Save this order'); ?>' style='display:none'>
 <?php } 
 else if($_GET['function']=="delete") { 
 	if(col1::delete($_GET['id'])) echo "true";
@@ -40,7 +40,7 @@
 	else {
 		$sect_length=count($_POST['order']);
 		for($i=0;$i<$sect_length;$i++) {
-			$x[]=$remote_connection->query('UPDATE `'.$site.'_col1` SET `order`='.$i.' WHERE `id`='.$_POST['order'][$i]);
+			$x[]=$remote_connection->query('UPDATE `'.SITE.'_col1` SET `order`='.$i.' WHERE `id`='.$_POST['order'][$i]);
 		}
 		if(!in_array(false,$x,true)) echo "true";
 		else echo "false";
@@ -52,7 +52,7 @@
 	else echo "false";
 }
 else if($_GET['function']=="edit_rights") {
-	$query=$remote_connection->query('UPDATE `'.$site.'_col1` SET `access`='.$_GET['rights'].' WHERE `id`='.$_GET['id']);
+	$query=$remote_connection->query('UPDATE `'.SITE.'_col1` SET `access`='.$_GET['rights'].' WHERE `id`='.$_GET['id']);
 	if($query) { echo "true"; }
 	else { echo "false"; }
 }
@@ -87,7 +87,7 @@
 
 </script>
 </head><body>
-<form action="?control=addons&site=<?php echo $site; ?>&aref=col1&&function=mce&id=<?php echo $_GET['id']; ?>&save=true" method="POST">
+<form action="?control=addons&site=<?php echo SITE; ?>&aref=col1&&function=mce&id=<?php echo $_GET['id']; ?>&save=true" method="POST">
 <textarea name="section_main" `id`="section_main" style="width: 100%; height: 100%"><?php echo $edit_data['content']; ?></textarea>
 </form>
 <?php }

=== modified file 'system_remote/plugins/col1/scripts.php'
--- system/plugins/col1/scripts.php	2011-03-14 16:08:20 +0000
+++ system_remote/plugins/col1/scripts.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/col1/scripts.php ?>
+<?php //@./system_remote/plugins/col1/scripts.php ?>
 var col1={
 	edit_title: {
 		func: function(site,id,cont){

=== modified file 'system_remote/plugins/col3/api.php'
--- system/plugins/col3/api.php	2011-03-29 18:57:42 +0000
+++ system_remote/plugins/col3/api.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/col3/api.php ?>
+<?php //@./system_remote/plugins/col3/api.php ?>
 <?php
 class col3 implements pluginSingleTable{
 	static function gets() {

=== modified file 'system_remote/plugins/col3/default.php'
--- system/plugins/col3/default.php	2011-03-14 18:28:28 +0000
+++ system_remote/plugins/col3/default.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/col3/default.php ?>
+<?php //@./system_remote/plugins/col3/default.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>a_col3_scripts.js</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
@@ -11,17 +11,17 @@
     * COPYRIGHT 2010 remotecp.co.cc
     */
 
- if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.$site.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
+ if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.SITE.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
 if(!isset($_GET['function'])) {$_GET['function']="list"; }
 if($_GET['function']=="list") {
 	$query = col3::gets(); ?>
 	<table><tr><th></th><th><?php echo $t->_('Title'); ?></th><th><?php echo $t->_('Actions'); ?></th></tr>
 	<?php foreach($query as $section) {?>
-	<tr id='sort_<?php echo $site; ?>_col3_<?php echo $section['id']; ?>'><td<?php if($section['plugin-reference']==NULL) { ?> ondblclick="col3.edit_rights.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this,'<?php echo $section['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($section['access']==0) { ?>green<?php } else if($section['access']==1) { ?>orange<?php } else if($section['access']==2) { ?>red<?php } ?>.png"> <?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png" alt=""><?php } ?></td><td ondblclick="col3.edit_title.expand('<?php echo $site; ?>','<?php echo $section['id']; ?>',this)"><?php echo $section['title']; ?></td><td><?php if($section['plugin-reference']==NULL) { ?><a onclick="col3.delete('<?php echo $site; ?>','<?php echo $section['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete section'); ?>"></a> <?php } ?><a onclick="col3.edit_order.down('<?php echo $site; ?>','<?php echo $section['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move section down'); ?>"></a> <a onclick="col3.edit_order.up('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move section up'); ?>"></a><?php if($section['plugin-reference']==NULL) { ?> <a onclick="col3.open_mce('<?php echo $site; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit section content'); ?>"></a><?php } ?></td></tr>
+	<tr id='sort_<?php echo SITE; ?>_col3_<?php echo $section['id']; ?>'><td<?php if($section['plugin-reference']==NULL) { ?> ondblclick="col3.edit_rights.expand('<?php echo SITE; ?>','<?php echo $section['id']; ?>',this,'<?php echo $section['access']; ?>')"><img src="<?php echo URL_IMG; ?>/Silk/bullet_<?php if($section['access']==0) { ?>green<?php } else if($section['access']==1) { ?>orange<?php } else if($section['access']==2) { ?>red<?php } ?>.png"> <?php } else { ?>><img src="<?php echo URL_IMG; ?>/Silk/bullet_black.png" alt=""><?php } ?></td><td ondblclick="col3.edit_title.expand('<?php echo SITE; ?>','<?php echo $section['id']; ?>',this)"><?php echo $section['title']; ?></td><td><?php if($section['plugin-reference']==NULL) { ?><a onclick="col3.delete('<?php echo SITE; ?>','<?php echo $section['id'] ?>');"><img src="<?php echo URL_IMG; ?>/Silk/delete.png" alt="<?php echo $t->_('Delete'); ?>" title="<?php echo $t->_('Delete section'); ?>"></a> <?php } ?><a onclick="col3.edit_order.down('<?php echo SITE; ?>','<?php echo $section['id'];?>',this);"><img src="<?php echo URL_IMG ?>/Silk/arrow_down.png" alt="<?php echo $t->_('Down'); ?>" title="<?php echo $t->_('Move section down'); ?>"></a> <a onclick="col3.edit_order.up('<?php echo SITE; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/arrow_up.png" alt="<?php echo $t->_('Up'); ?>" title="<?php echo $t->_('Move section up'); ?>"></a><?php if($section['plugin-reference']==NULL) { ?> <a onclick="col3.open_mce('<?php echo SITE; ?>','<?php echo $section['id']; ?>');"><img src="<?php echo URL_IMG; ?>/Silk/pencil.png" alt="<?php echo $t->_('Edit'); ?>" title="<?php echo $t->_('Edit section content'); ?>"></a><?php } ?></td></tr>
 	<?php } ?>
-	<tr class='gui-nosort' onclick="col3.add('<?php echo $site; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="2"><?php echo $t->_('Add section'); ?></td></tr>
+	<tr class='gui-nosort' onclick="col3.add('<?php echo SITE; ?>')"><td><img src="<?php echo URL_IMG; ?>/Silk/bullet_add.png" alt=""></td><td colspan="2"><?php echo $t->_('Add section'); ?></td></tr>
 	</table>
-	<input type='button' onclick='tableToSortable($(this).prev("table"),1,{items:"li:not(.gui-nosort)"});$(this).next().show("blind","slow");$(this).hide("blind","slow")' value='<?php echo $t->_('Sort'); ?>'> <input type='button' onclick='col3.sort("<?php echo $site; ?>",$(this).prevAll("ul").sortable("toArray"))' value='<?php echo $t->_('Save this order'); ?>' style='display:none'>
+	<input type='button' onclick='tableToSortable($(this).prev("table"),1,{items:"li:not(.gui-nosort)"});$(this).next().show("blind","slow");$(this).hide("blind","slow")' value='<?php echo $t->_('Sort'); ?>'> <input type='button' onclick='col3.sort("<?php echo SITE; ?>",$(this).prevAll("ul").sortable("toArray"))' value='<?php echo $t->_('Save this order'); ?>' style='display:none'>
 
 <?php } 
 else if($_GET['function']=="delete") { 
@@ -41,7 +41,7 @@
 	else {
 		$sect_length=count($_POST['order']);
 		for($i=0;$i<$sect_length;$i++) {
-			$x[]=$remote_connection->query('UPDATE `'.$site.'_col3` SET `order`='.$i.' WHERE `id`='.$_POST['order'][$i]);
+			$x[]=$remote_connection->query('UPDATE `'.SITE.'_col3` SET `order`='.$i.' WHERE `id`='.$_POST['order'][$i]);
 		}
 		if(!in_array(false,$x,true)) echo "true";
 		else echo "false";
@@ -53,7 +53,7 @@
 	else echo "false";
 }
 else if($_GET['function']=="edit_rights") {
-	$query=$remote_connection->query('UPDATE `'.$site.'_col3` SET `access`='.$_GET['rights'].' WHERE `id`='.$_GET['id']);
+	$query=$remote_connection->query('UPDATE `'.SITE.'_col3` SET `access`='.$_GET['rights'].' WHERE `id`='.$_GET['id']);
 	if($query) { echo "true"; }
 	else { echo "false"; }
 }
@@ -88,7 +88,7 @@
 
 </script>
 </head><body>
-<form action="?control=addons&site=<?php echo $site; ?>&aref=col3&&function=mce&id=<?php echo $_GET['id']; ?>&save=true" method="POST">
+<form action="?control=addons&site=<?php echo SITE; ?>&aref=col3&&function=mce&id=<?php echo $_GET['id']; ?>&save=true" method="POST">
 <textarea name="section_main" `id`="section_main" style="width: 100%; height: 100%"><?php echo $edit_data['content']; ?></textarea>
 </form>
 <?php }

=== modified file 'system_remote/plugins/col3/scripts.php'
--- system/plugins/col3/scripts.php	2011-03-14 16:08:20 +0000
+++ system_remote/plugins/col3/scripts.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/col3/scripts.php ?>
+<?php //@./system_remote/plugins/col3/scripts.php ?>
 var col3={
 	edit_title: {
 		func: function(site,id,cont){

=== modified file 'system_remote/plugins/default.php'
--- system/plugins/default.php	2011-03-12 20:51:51 +0000
+++ system_remote/plugins/default.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/default.php ?>
+<?php //@./system_remote/plugins/default.php ?>
 <!-- HEADERS >
 <AJAX_SCRIPTLOC>a__scripts.js</AJAX_SCRIPTLOC>
 <AJAX_SCRIPTEVAL>NULL</AJAX_SCRIPTEVAL>
@@ -7,16 +7,16 @@
 	if($_GET['function']=='install') {
 		if(!addons::available($_GET['a'])) echo "false";
 		else {
-			$remote_connection->query('UPDATE `'.$site.'_addons` SET `status`=1 WHERE `reference`="'.$_GET['a'].'"');
-			if(!require_once('system/plugins/'.$_GET['a'].'/install.php')) { echo "false"; 	$remote_connection->query('UPDATE `'.$site.'_addons` SET `status`=0 WHERE `reference`="'.$_GET['install'].'"'); exit;}
+			$remote_connection->query('UPDATE `'.SITE.'_addons` SET `status`=1 WHERE `reference`="'.$_GET['a'].'"');
+			if(!require_once('system_remote/plugins/'.$_GET['a'].'/install.php')) { echo "false"; 	$remote_connection->query('UPDATE `'.SITE.'_addons` SET `status`=0 WHERE `reference`="'.$_GET['install'].'"'); exit;}
 			echo "true";
 		}
 	}
 	else if($_GET['function']=='uninstall') {
 		if(!addons::available($_GET['a'])) echo "false";
 		else {
-			$remote_connection->query('UPDATE `'.$site.'_addons` SET `status`=0 WHERE `reference`="'.$_GET['a'].'"');
-			if(!require_once('system/plugins/'.$_GET['a'].'/uninstall.php')) { echo "false"; 	$remote_connection->query('UPDATE `'.$site.'_addons` SET `status`=1 WHERE `reference`="'.$_GET['uninstall'].'"'); exit;}
+			$remote_connection->query('UPDATE `'.SITE.'_addons` SET `status`=0 WHERE `reference`="'.$_GET['a'].'"');
+			if(!require_once('system_remote/plugins/'.$_GET['a'].'/uninstall.php')) { echo "false"; 	$remote_connection->query('UPDATE `'.SITE.'_addons` SET `status`=1 WHERE `reference`="'.$_GET['uninstall'].'"'); exit;}
 			echo "true";
 		}
 	}
@@ -38,7 +38,7 @@
 		}
 	}
 	else if($_GET['function']=='editlvl') {
-		if($remote_connection->query('UPDATE `sites` SET `userlevel`='.$_GET['lvl'].' WHERE `username`=\''.$_GET['user'].'\' AND `ref`=\''.$site.'\'')) {
+		if($remote_connection->query('UPDATE `sites` SET `userlevel`='.$_GET['lvl'].' WHERE `username`=\''.$_GET['user'].'\' AND `ref`=\''.SITE.'\'')) {
 			echo "true";
 		}
 		else {
@@ -49,7 +49,7 @@
 		echo "<option value='1'>1</option><option value='2'>2</option><option value='3'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9 (SU)</option>";
 	}
 	else if($_GET['function']=='edittitle') {
-		if($remote_connection->query('UPDATE `sites` SET `title`=\''.$_GET['title'].'\' WHERE `username`=\''.$_GET['user'].'\' AND `ref`=\''.$site.'\'')) {
+		if($remote_connection->query('UPDATE `sites` SET `title`=\''.$_GET['title'].'\' WHERE `username`=\''.$_GET['user'].'\' AND `ref`=\''.SITE.'\'')) {
 			echo "true";
 		}
 		else {
@@ -57,7 +57,7 @@
 		}
 	}
 	else if($_GET['function']=='deleteuser') {
-		if($remote_connection->query('DELETE FROM `sites` WHERE `username`=\''.$_POST['username'].'\' AND `ref`=\''.$site.'\'')) {
+		if($remote_connection->query('DELETE FROM `sites` WHERE `username`=\''.$_POST['username'].'\' AND `ref`=\''.SITE.'\'')) {
 			echo "true";
 		}
 		else {
@@ -69,7 +69,7 @@
 			echo "false";
 			exit;	
 		}
-		if($remote_connection->query('INSERT INTO `sites` VALUES(\''.$_POST['username'].'\',\''.$site.'\',\'\',0)')) {
+		if($remote_connection->query('INSERT INTO `sites` VALUES(\''.$_POST['username'].'\',\''.SITE.'\',\'\',0)')) {
 			echo "true";
 		}
 		else {
@@ -79,19 +79,19 @@
 	else if($_GET['function']=='settings') {
 		if(isset($_POST['submit'])) {
 			$x=array();
-			$x[]=$remote_connection->query('UPDATE `system_siteinfo` SET `constant_value`=\''.htmlspecialchars($_POST['title']).'\' WHERE `site_ref`=\''.$site.'\' AND `constant_name`=\'SITE_TITLE\'');
-			$x[]=$remote_connection->query('UPDATE `system_siteinfo` SET `constant_value`=\''.htmlspecialchars($_POST['slogan']).'\' WHERE `site_ref`=\''.$site.'\' AND `constant_name`=\'SITE_SLOGAN\'');
-			$x[]=$remote_connection->query('UPDATE `system_siteinfo` SET `constant_value`=\''.htmlspecialchars($_POST['style']).'\' WHERE `site_ref`=\''.$site.'\' AND `constant_name`=\'SITE_CSS\'');
-			$x[]=$remote_connection->query('UPDATE `system_siteinfo` SET `constant_value`=\''.htmlspecialchars($_POST['author']).'\' WHERE `site_ref`=\''.$site.'\' AND `constant_name`=\'SITE_AUTHOR\'');
+			$x[]=$remote_connection->query('UPDATE `system_siteinfo` SET `constant_value`=\''.htmlspecialchars($_POST['title']).'\' WHERE `site_ref`=\''.SITE.'\' AND `constant_name`=\'SITE_TITLE\'');
+			$x[]=$remote_connection->query('UPDATE `system_siteinfo` SET `constant_value`=\''.htmlspecialchars($_POST['slogan']).'\' WHERE `site_ref`=\''.SITE.'\' AND `constant_name`=\'SITE_SLOGAN\'');
+			$x[]=$remote_connection->query('UPDATE `system_siteinfo` SET `constant_value`=\''.htmlspecialchars($_POST['style']).'\' WHERE `site_ref`=\''.SITE.'\' AND `constant_name`=\'SITE_CSS\'');
+			$x[]=$remote_connection->query('UPDATE `system_siteinfo` SET `constant_value`=\''.htmlspecialchars($_POST['author']).'\' WHERE `site_ref`=\''.SITE.'\' AND `constant_name`=\'SITE_AUTHOR\'');
 			if(!in_array(false,$x,true)) echo "true";
 			else echo "false";
 		}
 		else {
-			$settingsq=$remote_connection->query('SELECT * FROM `system_siteinfo` WHERE `site_ref`=\''.$site.'\'');
+			$settingsq=$remote_connection->query('SELECT * FROM `system_siteinfo` WHERE `site_ref`=\''.SITE.'\'');
 			while($setting=$settingsq->fetch_assoc()){
 				$settings[$setting['constant_name']]=$setting['constant_value'];
 			}
-			echo "<form onsubmit='addons.site.settings(\"".$site."\", this); return false;' method='POST'>
+			echo "<form onsubmit='addons.site.settings(\"".SITE."\", this); return false;' method='POST'>
 					<label>".$t->_('Site title').": <input name='title' value='".$settings['SITE_TITLE']."'></label><br>
 					<label>".$t->_('Site tagline').": <input name='slogan' value='".$settings['SITE_SLOGAN']."'></label><br>
 					<label>".$t->_('Style').": <select name='style'>";
@@ -110,13 +110,13 @@
 	}
 	else if($_GET['function']=="deletesite") {
 		$x=array();
-		$tables=$remote_connection->query("SHOW TABLES LIKE '{$site}_%'");
+		$tables=$remote_connection->query("SHOW TABLES LIKE '{SITE}_%'");
 		while($table=$tables->fetch_array()) {
 			$x[]=$remote_connection->query("DROP TABLE `$table[0]`");
 		}
-		$x[]=$remote_connection->query("DELETE FROM `system_domains` WHERE `site`='{$site}'");
-		$x[]=$remote_connection->query("DELETE FROM `system_siteinfo` WHERE `site_ref`='{$site}'");
-		$x[]=$remote_connection->query("DELETE FROM `sites` WHERE `ref`='{$site}'");
+		$x[]=$remote_connection->query("DELETE FROM `system_domains` WHERE `site`='{SITE}'");
+		$x[]=$remote_connection->query("DELETE FROM `system_siteinfo` WHERE `site_ref`='{SITE}'");
+		$x[]=$remote_connection->query("DELETE FROM `sites` WHERE `ref`='{SITE}'");
 		if(!in_array(false,$x)) {
 			echo "true";
 		}
@@ -127,33 +127,33 @@
 	}
 exit;
 }
-$q=$remote_connection->query('SELECT * FROM `'.$site.'_addons` WHERE `status`=1 AND `ulevel`<='.$userlevel);
+$q=$remote_connection->query('SELECT * FROM `'.SITE.'_addons` WHERE `status`=1 AND `ulevel`<='.$userlevel);
 while($addons=$q->fetch_assoc()) { ?>
-	<?php if(addons::available($addons['reference'])) { ?><img src='<?php echo URL_IMG; ?>/Silk/plugin.png' alt=''><a onclick="openLoc('<?php echo getSiteInfo($site,'SITE_TITLE'); ?> - <?php echo $addons['name']; ?>','?control=addons&site=<?php echo $site; ?>&aref=<?php echo $addons['reference']; ?>','<?php echo $site;?>_ctrls_<?php echo $addons['reference']; ?>')" ><?php echo $addons['name']; ?></a><?php } else { ?><img src='<?php echo URL_IMG; ?>/Silk/plugin_disabled.png' alt='[!]' title='<?php echo $t->_('Addon not available'); ?>'><?php echo $addons['name'];  } ?><br>
+	<?php if(addons::available($addons['reference'])) { ?><img src='<?php echo URL_IMG; ?>/Silk/plugin.png' alt=''><a onclick="openLoc('<?php echo getSiteInfo(SITE,'SITE_TITLE'); ?> - <?php echo $addons['name']; ?>','?control=addons&site=<?php echo SITE; ?>&aref=<?php echo $addons['reference']; ?>','<?php echo SITE;?>_ctrls_<?php echo $addons['reference']; ?>')" ><?php echo $addons['name']; ?></a><?php } else { ?><img src='<?php echo URL_IMG; ?>/Silk/plugin_disabled.png' alt='[!]' title='<?php echo $t->_('Addon not available'); ?>'><?php echo $addons['name'];  } ?><br>
 <?php }
 if($q->num_rows==0) {
 	echo $t->_('You are not allowed to change anything to this site'); //Nothign under the userlevel
 }
 if($userlevel==9) {
-$q=$remote_connection->query('SELECT * FROM `'.$site.'_addons` WHERE `editable`=1'); ?>
+$q=$remote_connection->query('SELECT * FROM `'.SITE.'_addons` WHERE `editable`=1'); ?>
 <table><tr><th><?php $t->_('Name'); ?></th><th><?php $t->_('Actions'); ?></th></tr>
 <?php while($addons=$q->fetch_assoc()) { 
 	if(!addons::installable($addons['reference'])) { ?>
 	<tr><td><img src='<?php echo URL_IMG; ?>/Silk/plugin_disabled.png' alt='[!]' title='<?php echo $t->_('Addon not available'); ?>'><?php echo $addons['name']; ?></td><td><img src="<?php echo URL_IMG ?>/Silk/script_error.png"> <img src="<?php echo URL_IMG ?>/Silk/layout_error.png"> <img src="<?php echo URL_IMG ?>/Silk/layout_error.png"> <img src="<?php echo URL_IMG ?>/Silk/layout_error.png"></td></tr>
 	<?php } else { ?>
-	<tr><td><img src='<?php echo URL_IMG; ?>/Silk/plugin.png' alt='[OK]' title='<?php echo $t->_('Addon available'); ?>'><?php echo $addons['name']; ?></td><td><?php if($addons['status']==0) {?><a onclick="addons.addons.install('<?php echo $site; ?>','<?php echo $addons['reference']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/script_add.png" alt="<?php echo $t->_('On'); ?>" title="<?php echo $t->_('Turn addon on'); ?>"></a><?php } else { ?><a onclick="addons.addons.uninstall('<?php echo $site; ?>','<?php echo $addons['reference']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/script_delete.png" alt="<?php echo $t->_('Off'); ?>" title="<?php echo $t->_('Turn addon off'); ?>"></a><?php } if(addons::installed($addons['reference'])) { ?> <a onclick="addons.addons.addto('<?php echo $site; ?>','<?php echo $addons['reference']; ?>','col1');"><img src="<?php echo URL_IMG ?>/Silk/layout_sidebar.png" alt="<?php echo $t->_('Add to column 1'); ?>" title="<?php echo $t->_('Add to column 1'); ?>"></a> <a onclick="addons.addons.addto('<?php echo $site; ?>','<?php echo $addons['reference']; ?>','col3');"><img src="<?php echo URL_IMG ?>/Silk/layout_sidebar.png" alt="<?php echo $t->_('Add to column 3'); ?>" title="<?php echo $t->_('Add to column 3'); ?>"></a> <a onclick="addons.addons.addto('<?php echo $site; ?>','<?php echo $addons['reference']; ?>','cms');"><img src="<?php echo URL_IMG ?>/Silk/layout_content.png" alt="<?php echo $t->_('Add to CMS'); ?>" title="<?php echo $t->_('Add to CMS'); ?>"></a><?php } else { ?> <img src="<?php echo URL_IMG ?>/Silk/layout_error.png"> <img src="<?php echo URL_IMG ?>/Silk/layout_error.png"> <img src="<?php echo URL_IMG ?>/Silk/layout_error.png"> <?php } ?></td></tr>
+	<tr><td><img src='<?php echo URL_IMG; ?>/Silk/plugin.png' alt='[OK]' title='<?php echo $t->_('Addon available'); ?>'><?php echo $addons['name']; ?></td><td><?php if($addons['status']==0) {?><a onclick="addons.addons.install('<?php echo SITE; ?>','<?php echo $addons['reference']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/script_add.png" alt="<?php echo $t->_('On'); ?>" title="<?php echo $t->_('Turn addon on'); ?>"></a><?php } else { ?><a onclick="addons.addons.uninstall('<?php echo SITE; ?>','<?php echo $addons['reference']; ?>');"><img src="<?php echo URL_IMG ?>/Silk/script_delete.png" alt="<?php echo $t->_('Off'); ?>" title="<?php echo $t->_('Turn addon off'); ?>"></a><?php } if(addons::installed($addons['reference'])) { ?> <a onclick="addons.addons.addto('<?php echo SITE; ?>','<?php echo $addons['reference']; ?>','col1');"><img src="<?php echo URL_IMG ?>/Silk/layout_sidebar.png" alt="<?php echo $t->_('Add to column 1'); ?>" title="<?php echo $t->_('Add to column 1'); ?>"></a> <a onclick="addons.addons.addto('<?php echo SITE; ?>','<?php echo $addons['reference']; ?>','col3');"><img src="<?php echo URL_IMG ?>/Silk/layout_sidebar.png" alt="<?php echo $t->_('Add to column 3'); ?>" title="<?php echo $t->_('Add to column 3'); ?>"></a> <a onclick="addons.addons.addto('<?php echo SITE; ?>','<?php echo $addons['reference']; ?>','cms');"><img src="<?php echo URL_IMG ?>/Silk/layout_content.png" alt="<?php echo $t->_('Add to CMS'); ?>" title="<?php echo $t->_('Add to CMS'); ?>"></a><?php } else { ?> <img src="<?php echo URL_IMG ?>/Silk/layout_error.png"> <img src="<?php echo URL_IMG ?>/Silk/layout_error.png"> <img src="<?php echo URL_IMG ?>/Silk/layout_error.png"> <?php } ?></td></tr>
 <?php }}  ?>
 </table>
 <?php
 
-$q=$remote_connection->query('SELECT * FROM `sites` WHERE `ref`="'.$site.'"') ?>
+$q=$remote_connection->query('SELECT * FROM `sites` WHERE `ref`="'.SITE.'"') ?>
 <table><tr><th><?php echo $t->_('User'); ?></th><th><?php echo $t->_('Lv.'); ?></th><th><?php echo $t->_('Title'); ?></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='addons.user.editlvl.expand("<?php echo $site; ?>","<?php echo $users['username']; ?>",this)'<?php } ?>><?php echo $users['userlevel'] ?></td><td ondblclick='addons.user.edittitle.expand("<?php echo $site;?>","<?php echo $users['username']; ?>",this)'><?php echo $users['title']; ?></td><td><?php if($users['username']!=$session->username) {?><a onclick='addons.user.delete("<?php echo $site; ?>","<?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>
+	<tr><td><img src="<?php echo URL_IMG; ?>/Silk/user.png"> <?php echo $users['username']; ?></td><td<?php if($users['username']!=$session->username) {?> ondblclick='addons.user.editlvl.expand("<?php echo SITE; ?>","<?php echo $users['username']; ?>",this)'<?php } ?>><?php echo $users['userlevel'] ?></td><td ondblclick='addons.user.edittitle.expand("<?php echo SITE;?>","<?php echo $users['username']; ?>",this)'><?php echo $users['title']; ?></td><td><?php if($users['username']!=$session->username) {?><a onclick='addons.user.delete("<?php echo SITE; ?>","<?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='addons.user.add("<?php echo $site; ?>",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>
+<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='addons.user.add("<?php echo SITE; ?>",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>
 
-<img src="<?php echo URL_IMG; ?>/Silk/layout_edit.png" alt="<?php echo $t->_('Edit site settings'); ?>" title="<?php echo $t->_('Edit the base settings of the site'); ?>"> <a onclick="openLoc('<?php echo getSiteInfo($site,'SITE_TITLE'); ?> - <?php echo $t->_('Settings'); ?>','?control=addons&site=<?php echo $site; ?>&function=settings','<?php echo $site;?>_settings')"><?php echo $t->_('Edit site settings'); ?></a><br>
-<img src="<?php echo URL_IMG; ?>/Silk/layout_delete.png" alt="<?php echo $t->_('Delete site'); ?>" title="<?php echo $t->_('Delete all site content and the site itself'); ?>"> <a onclick='addons.site.delete("<?php echo $site; ?>");'><?php echo $t->_('Delete site'); ?></a>
+<img src="<?php echo URL_IMG; ?>/Silk/layout_edit.png" alt="<?php echo $t->_('Edit site settings'); ?>" title="<?php echo $t->_('Edit the base settings of the site'); ?>"> <a onclick="openLoc('<?php echo getSiteInfo(SITE,'SITE_TITLE'); ?> - <?php echo $t->_('Settings'); ?>','?control=addons&site=<?php echo SITE; ?>&function=settings','<?php echo SITE;?>_settings')"><?php echo $t->_('Edit site settings'); ?></a><br>
+<img src="<?php echo URL_IMG; ?>/Silk/layout_delete.png" alt="<?php echo $t->_('Delete site'); ?>" title="<?php echo $t->_('Delete all site content and the site itself'); ?>"> <a onclick='addons.site.delete("<?php echo SITE; ?>");'><?php echo $t->_('Delete site'); ?></a>
 <?php } ?>
\ No newline at end of file

=== modified file 'system_remote/plugins/filemanager/default.php'
--- system/plugins/filemanager/default.php	2011-03-12 12:53:09 +0000
+++ system_remote/plugins/filemanager/default.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/filemanager/default.php ?>
+<?php //@./system_remote/plugins/filemanager/default.php ?>
 <?php
    /**
     * system/plugins/filemanager.php - RemoteCP (?control=addons&aref=filemanager)
@@ -17,10 +17,10 @@
 < HEADERS -->$buffer";
 }
 ob_start();
- if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.$site.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
-$session->log('200','File access granted ('.$site.')');
+ if(!hasSiteAddonLevel()) {$session->log('403','Site access denied ('.SITE.')'); exit;} //Kill & log non-siteadmins (ze zouden hier nooit mogen geweest zijn :)
+$session->log('200','File access granted ('.SITE.')');
 require_once('inc/mysqlfs/mysqlfs.php');
-$mysqlfs=new mysqlfs($remote_connection,$site.'_fs');
+$mysqlfs=new mysqlfs($remote_connection,SITE.'_fs');
 $mysqlfs->setuser($session->username,$userlevel);
 function check_user($user) {
 	global $database;
@@ -95,9 +95,9 @@
 			term();return;
 			}
 			echo "
-			<form action='?control=addons&site={$site}&aref=filemanager&action=edit&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='return false;'>
+			<form action='?control=addons&site=".SITE."&aref=filemanager&action=edit&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='return false;'>
 			<textarea name='content' style='width: 100%;height: 90%'>".htmlentities($mysqlfs->file_get_contents($_GET['path']))."</textarea>
-			<input type='submit' style='width: 50%;height: 10%' onclick='filemanager.edit(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;' value='".$t->_('Save')."'><input type='submit' style='width: 50%;height: 10%' name='abort' value='".$t->_('Back')."' onclick='filemanager.edit_abort(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\")'>
+			<input type='submit' style='width: 50%;height: 10%' onclick='filemanager.edit(\"".SITE."\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;' value='".$t->_('Save')."'><input type='submit' style='width: 50%;height: 10%' name='abort' value='".$t->_('Back')."' onclick='filemanager.edit_abort(\"".SITE."\",\"{$mysqlfs->simplify_path($_GET['path'])}\")'>
 			</form>
 			";
 			$show_dir=false;
@@ -126,7 +126,7 @@
 		}
 		else {
 			echo "
-			<form action='?control=addons&site={$site}&aref=filemanager&action=chmod&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.chmod(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
+			<form action='?control=addons&site=".SITE."&aref=filemanager&action=chmod&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.chmod(\"".SITE."\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
 			<div>
 			<table>
 			<thead><tr><th></th><th>".$t->_('Read')."</th><th>".$t->_('Write')."</th><th>".$t->_('Execute')."</th></tr></thead>
@@ -181,7 +181,7 @@
 		}
 		else {
 		echo "
-			<form action='?control=addons&site={$site}&aref=filemanager&action=chown&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.chown(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
+			<form action='?control=addons&site=".SITE."&aref=filemanager&action=chown&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.chown(\"".SITE."\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
 			<input type='text' value='{$mysqlfs->getinfo($_GET['path'],'owner')}' name='user'>
 			<input type='submit' value='".$t->_('Chown')."'>
 			</form>
@@ -202,7 +202,7 @@
 		}
 		else {
 		echo "
-			<form action='?control=addons&site={$site}&aref=filemanager&action=chgrp&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.chgrp(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
+			<form action='?control=addons&site=".SITE."&aref=filemanager&action=chgrp&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.chgrp(\"".SITE."\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
 			<input type='text' value='{$mysqlfs->getinfo($_GET['path'],'group')}' name='grp'>
 			<input type='submit' value='".$t->_('Chgrp')."'>
 			</form>
@@ -212,7 +212,7 @@
 		$show_dir=true;
 	}
 	else if($_GET['action']=="upload") {
-		echo "<form action='?control=addons&site={$site}&aref=filemanager&action=upload&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' enctype='multipart/form-data'>
+		echo "<form action='?control=addons&site=".SITE."&aref=filemanager&action=upload&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' enctype='multipart/form-data'>
 		<input type='file' name='file'>
 		<input type='submit' value='".$t->_('Upload')."'>
 		</form>";
@@ -250,7 +250,7 @@
 		}
 		else {
 			echo "
-			<form action='?control=addons&site={$site}&aref=filemanager&action=rename&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.rename(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
+			<form action='?control=addons&site=".SITE."&aref=filemanager&action=rename&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.rename(\"".SITE."\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
 			<input type='text' value='{$_GET['path']}' name='newname'>
 			<input type='submit' value='".$t->_('Rename')."'>
 			</form>
@@ -271,7 +271,7 @@
 		}
 		else {
 			echo "
-				<form action='?control=addons&site={$site}&aref=filemanager&action=copy&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.copy(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
+				<form action='?control=addons&site=".SITE."&aref=filemanager&action=copy&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' onsubmit='filemanager.copy(\"".SITE."\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this); return false;'>
 				<input type='text' value='{$_GET['path']}' name='dest'>
 				<input type='submit' value='".$t->_('Copy')."'>
 				</form>
@@ -304,7 +304,7 @@
 }
 #ob_start();
 if($show_file) {
-	$seval="window.open('?control=addons&site=$site&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=view')";
+	$seval="window.open('?control=addons&site=".SITE."&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=view')";
 	$show_dir=true;
 	$_GET['path']=dirname($_GET['path']);
 }
@@ -312,7 +312,7 @@
 	$dir=$mysqlfs->readdir_full($_GET['path']);
 	echo "<h1>".$t->_('Index of')." /{$mysqlfs->simplify_path($_GET['path'])}</h1>";
 	echo "
-	<form action='?' method='GET' onsubmit='filemanager.new(\"$site\",this); return false;'>
+	<form action='?' method='GET' onsubmit='filemanager.new(\"".SITE."\",this); return false;'>
 	<input type='hidden' name='path' value='{$mysqlfs->simplify_path($_GET['path'])}'>
 	<select name='type'>
 	<option value='d'>".$t->_('Folder')."</option>
@@ -321,19 +321,19 @@
 	<input type='text' name='name' value=''>
 	<input type='submit' value='".$t->_('Create')."'>
 	</form>
-	<input type='button' value='".$t->_('Upload')."' onclick='filemanager.upload.screen(\"$site\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this)'>	";
+	<input type='button' value='".$t->_('Upload')."' onclick='filemanager.upload.screen(\"".SITE."\",\"{$mysqlfs->simplify_path($_GET['path'])}\",this)'>	";
 	// echo "
-	// <form action='?control=addons&site={$site}&aref=filemanager&action=upload&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' enctype='multipart/form-data' target='{$site}_ajax_upl_ifrm'>
+	// <form action='?control=addons&site=".SITE."&aref=filemanager&action=upload&path={$mysqlfs->simplify_path($_GET['path'])}' method='POST' enctype='multipart/form-data' target='".SITE."_ajax_upl_ifrm'>
 	// <input type='file' name='file'>
 	// <input type='submit' value='".$t->_('Upload')."' onclick='filemanager.upload.start(this)'>
 	// </form>
-	// <iframe name='{$site}_ajax_upl_ifrm' style='display: none'></iframe>
+	// <iframe name='".SITE."_ajax_upl_ifrm' style='display: none'></iframe>
 	// ";
 	echo "<table><thead><tr><th>".$t->_('Name')."</th><th>".$t->_('Rights')."</th><th>".$t->_('Owner')."</th><th>".$t->_('Group')."</th><th>".$t->_('Last edited')."</th><th>".$t->_('Size')."</th><th>".$t->_('Actions')."</th></tr><tr><th colspan='7'><hr></th></tr></thead><tbody>";
 	foreach($dir as $value) {
 	$value['time']=date('Y-m-d H:i:s',$value['time']);
-		echo "<tr><td>[{$value['type']}] <a onclick=\"".(($value['type']=="d")?"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}','{$site}_ctrls_filemanager')":"window.open('?control=addons&site=$site&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=view'); return false;")."\">{$value['filename']}</a></td><td>{$value['rights']}</td><td>{$value['owner']}</td><td>{$value['group']}</td><td>{$value['time']}</td><td>{$mysqlfs->sizetohuman($value['size'])}</td><td>
-			<a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=delete','{$site}_ctrls_filemanager')\">".$t->_('Delete')."</a>".(($value['type']=='f')?" <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=edit','{$site}_ctrls_filemanager')\">".$t->_('Edit')."</a>":"")." <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chmod','{$site}_ctrls_filemanager')\">".$t->_('Chmod')."</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chown','{$site}_ctrls_filemanager')\">".$t->_('Chown')."</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chgrp','{$site}_ctrls_filemanager')\">".$t->_('Chgrp')."</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=rename','{$site}_ctrls_filemanager')\">".$t->_('Rename')."</a> <a onclick=\"openLoc('','?control=addons&site={$site}&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=copy','{$site}_ctrls_filemanager')\">".$t->_('Copy')."</a></td></tr>";
+		echo "<tr><td>[{$value['type']}] <a onclick=\"".(($value['type']=="d")?"openLoc('','?control=addons&site=".SITE."&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}','".SITE."_ctrls_filemanager')":"window.open('?control=addons&site=".SITE."&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=view'); return false;")."\">{$value['filename']}</a></td><td>{$value['rights']}</td><td>{$value['owner']}</td><td>{$value['group']}</td><td>{$value['time']}</td><td>{$mysqlfs->sizetohuman($value['size'])}</td><td>
+			<a onclick=\"openLoc('','?control=addons&site=".SITE."&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=delete','".SITE."_ctrls_filemanager')\">".$t->_('Delete')."</a>".(($value['type']=='f')?" <a onclick=\"openLoc('','?control=addons&site=".SITE."&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=edit','".SITE."_ctrls_filemanager')\">".$t->_('Edit')."</a>":"")." <a onclick=\"openLoc('','?control=addons&site=".SITE."&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chmod','".SITE."_ctrls_filemanager')\">".$t->_('Chmod')."</a> <a onclick=\"openLoc('','?control=addons&site=".SITE."&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chown','".SITE."_ctrls_filemanager')\">".$t->_('Chown')."</a> <a onclick=\"openLoc('','?control=addons&site=".SITE."&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=chgrp','".SITE."_ctrls_filemanager')\">".$t->_('Chgrp')."</a> <a onclick=\"openLoc('','?control=addons&site=".SITE."&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=rename','".SITE."_ctrls_filemanager')\">".$t->_('Rename')."</a> <a onclick=\"openLoc('','?control=addons&site=".SITE."&aref=filemanager&path={$mysqlfs->simplify_path($_GET['path'])}/{$value['filename']}&action=copy','".SITE."_ctrls_filemanager')\">".$t->_('Copy')."</a></td></tr>";
 		}
 	echo "</tbody></table>";
 }

=== modified file 'system_remote/plugins/filemanager/scripts.php'
--- system/plugins/filemanager/scripts.php	2011-02-23 18:45:08 +0000
+++ system_remote/plugins/filemanager/scripts.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/filemanager/scripts.php ?>
+<?php //@./system_remote/plugins/filemanager/scripts.php ?>
 $.getScript(URL_SCRIPTS+'/../php.js/dirname.js'); //Get dirname util
 filemanager={
 	new:function(site,elem) {

=== modified file 'system_remote/plugins/init.php'
--- system/plugins/init.php	2011-03-29 18:57:42 +0000
+++ system_remote/plugins/init.php	2011-03-30 16:10:37 +0000
@@ -1,3 +1,3 @@
-<?php //@./system/plugins/init.php ?>
-<?php
require_once('system/plugins/api.php');
-require_once('system/plugins/interfaces.php'); //Load all interfaces
$dh=opendir('system/plugins');
$PLUGINS=array();
while($file=readdir($dh)) {
	if($file=='..') continue;
	if(is_dir('system/plugins/'.$file))
		$PLUGINS[]=$file;
}
foreach($PLUGINS as $plugin) {
	if(addons::installed($plugin)&&file_exists('system/plugins/'.$plugin.'/api.php'))
		require_once('system/plugins/'.$plugin.'/api.php');
}
\ No newline at end of file
+<?php //@./system_remote/plugins/init.php ?>
+<?php
require_once('system_remote/plugins/api.php');
+require_once('system_remote/plugins/interfaces.php'); //Load all interfaces
$dh=opendir('system_remote/plugins');
$PLUGINS=array();
while($file=readdir($dh)) {
	if($file=='..') continue;
	if(is_dir('system_remote/plugins/'.$file))
		$PLUGINS[]=$file;
}
foreach($PLUGINS as $plugin) {
	if(addons::installed($plugin)&&file_exists('system_remote/plugins/'.$plugin.'/api.php'))
		require_once('system_remote/plugins/'.$plugin.'/api.php');
}
\ No newline at end of file

=== modified file 'system_remote/plugins/interfaces.php'
--- system/plugins/interfaces.php	2011-03-29 18:49:17 +0000
+++ system_remote/plugins/interfaces.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php
+<?php //@./system_remote/plugins/interfaces.php ?><?php
 /**
  * This file defines interfaces for all plugins
  * @package remotecp-panel

=== modified file 'system_remote/plugins/scripts.php'
--- system/plugins/scripts.php	2011-03-12 20:51:51 +0000
+++ system_remote/plugins/scripts.php	2011-03-30 16:10:37 +0000
@@ -1,4 +1,4 @@
-<?php //@./system/plugins/scripts.php ?>
+<?php //@./system_remote/plugins/scripts.php ?>
 var addons= {
 	addons: {
 		install: function(site,ref) {