From 7fe908c50c8dbc5cc05f571dbe11d66141caacd4 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:01:22 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines

---
 server/plugins-available/shelluser_jailkit_plugin.inc.php |  423 ++++++++++++++++++++++++++--------------------------
 1 files changed, 214 insertions(+), 209 deletions(-)

diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index 268df9c..9816b70 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -29,229 +29,233 @@
 */
 
 class shelluser_jailkit_plugin {
-	
+
 	//* $plugin_name and $class_name have to be the same then the name of this class
 	var $plugin_name = 'shelluser_jailkit_plugin';
 	var $class_name = 'shelluser_jailkit_plugin';
-	
+
 	//* This function is called during ispconfig installation to determine
 	//  if a symlink shall be created for this plugin.
 	function onInstall() {
 		global $conf;
-		
+
 		if($conf['services']['web'] == true) {
 			return true;
 		} else {
 			return false;
 		}
-		
+
 	}
-	
-		
+
+
 	/*
 	 	This function is called when the plugin is loaded
 	*/
-	
+
 	function onLoad() {
 		global $app;
-		
+
 		/*
 		Register for the events
 		*/
-		
-		$app->plugins->registerEvent('shell_user_insert',$this->plugin_name,'insert');
-		$app->plugins->registerEvent('shell_user_update',$this->plugin_name,'update');
-		$app->plugins->registerEvent('shell_user_delete',$this->plugin_name,'delete');
 
-		
+		$app->plugins->registerEvent('shell_user_insert', $this->plugin_name, 'insert');
+		$app->plugins->registerEvent('shell_user_update', $this->plugin_name, 'update');
+		$app->plugins->registerEvent('shell_user_delete', $this->plugin_name, 'delete');
+
+
 	}
-	
+
 	//* This function is called, when a shell user is inserted in the database
-	function insert($event_name,$data) {
+	function insert($event_name, $data) {
 		global $app, $conf;
-		
+
 		$app->uses('system');
 		$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$data['new']['parent_domain_id']);
-		
+
 		if($app->system->is_user($data['new']['username'])) {
-		
+
 			/**
-		 	* Setup Jailkit Chroot System If Enabled 
-		 	*/
+			 * Setup Jailkit Chroot System If Enabled
+			 */
+
+
 			if ($data['new']['chroot'] == "jailkit")
 			{
-				
-				
+
+
 				// load the server configuration options
 				$app->uses("getconf");
 				$this->data = $data;
 				$this->app = $app;
 				$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
-				
+
 				$this->_update_website_security_level();
-				
-				$app->system->web_folder_protection($web['document_root'],false);
-			
+
+				$app->system->web_folder_protection($web['document_root'], false);
+
 				$this->_setup_jailkit_chroot();
-				
+
 				$this->_add_jailkit_user();
-				
+
 				//* call the ssh-rsa update function
 				$this->_setup_ssh_rsa();
-				
+
 				//$command .= 'usermod -s /usr/sbin/jk_chrootsh -U '.escapeshellcmd($data['new']['username']);
 				//exec($command);
 				$app->system->usermod($data['new']['username'], 0, 0, '', '/usr/sbin/jk_chrootsh', '', '');
-				
+
 				//* Unlock user
 				$command = 'usermod -U '.escapeshellcmd($data['new']['username']).' 2>/dev/null';
 				exec($command);
-				
+
 				$this->_update_website_security_level();
-				$app->system->web_folder_protection($web['document_root'],true);
+				$app->system->web_folder_protection($web['document_root'], true);
 			}
-		
-			$app->log("Jailkit Plugin -> insert username:".$data['new']['username'],LOGLEVEL_DEBUG);
-			
+
+			$app->log("Jailkit Plugin -> insert username:".$data['new']['username'], LOGLEVEL_DEBUG);
+
 		} else {
-			$app->log("Jailkit Plugin -> insert username:".$data['new']['username']." skipped, the user does not exist.",LOGLEVEL_WARN);
+			$app->log("Jailkit Plugin -> insert username:".$data['new']['username']." skipped, the user does not exist.", LOGLEVEL_WARN);
 		}
-		
+
 	}
-	
+
 	//* This function is called, when a shell user is updated in the database
-	function update($event_name,$data) {
+	function update($event_name, $data) {
 		global $app, $conf;
-		
+
 		$app->uses('system');
 		$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$data['new']['parent_domain_id']);
-		
+
 		if($app->system->is_user($data['new']['username'])) {
-		
+
+
+
 			/**
-		 	* Setup Jailkit Chroot System If Enabled 
-		 	*/
+			 * Setup Jailkit Chroot System If Enabled
+			 */
 			if ($data['new']['chroot'] == "jailkit")
 			{
-				
+
 				// load the server configuration options
 				$app->uses("getconf");
 				$this->data = $data;
 				$this->app = $app;
 				$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
-				
+
 				$this->_update_website_security_level();
-				
-				$app->system->web_folder_protection($web['document_root'],false);
-			
+
+				$app->system->web_folder_protection($web['document_root'], false);
+
 				$this->_setup_jailkit_chroot();
 				$this->_add_jailkit_user();
-				
+
 				//* call the ssh-rsa update function
 				$this->_setup_ssh_rsa();
-				
+
 				$this->_update_website_security_level();
-				
-				$app->system->web_folder_protection($web['document_root'],true);
+
+				$app->system->web_folder_protection($web['document_root'], true);
 			}
-		
-			$app->log("Jailkit Plugin -> update username:".$data['new']['username'],LOGLEVEL_DEBUG);
-			
+
+			$app->log("Jailkit Plugin -> update username:".$data['new']['username'], LOGLEVEL_DEBUG);
+
 		} else {
-			$app->log("Jailkit Plugin -> update username:".$data['new']['username']." skipped, the user does not exist.",LOGLEVEL_WARN);
+			$app->log("Jailkit Plugin -> update username:".$data['new']['username']." skipped, the user does not exist.", LOGLEVEL_WARN);
 		}
-		
+
 	}
-	
+
 	//* This function is called, when a shell user is deleted in the database
 	/**
 	 * TODO: Remove chroot user home and from the chroot passwd file
-	 */ 
-	function delete($event_name,$data) {
+	 */
+	function delete($event_name, $data) {
 		global $app, $conf;
-		
+
 		$app->uses('system');
-		
+
 		$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$data['old']['parent_domain_id']);
-		
+
 		if ($data['old']['chroot'] == "jailkit")
 		{
 			$app->uses("getconf");
 			$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
-			
+
 			$jailkit_chroot_userhome = $this->_get_home_dir($data['old']['username']);
-			
+
 			//commented out proved to be dangerous on config errors
 			//exec('rm -rf '.$data['old']['dir'].$jailkit_chroot_userhome);
-			
-			$app->system->web_folder_protection($web['document_root'],false);
-			
+
+			$app->system->web_folder_protection($web['document_root'], false);
+
 			if(@is_dir($data['old']['dir'].$jailkit_chroot_userhome)) {
 				$command = 'userdel -f';
 				$command .= ' '.escapeshellcmd($data['old']['username']).' &> /dev/null';
 				exec($command);
-				$app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
+				$app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome, LOGLEVEL_DEBUG);
 			}
-			
-			$app->system->web_folder_protection($web['document_root'],true);
-			
+
+			$app->system->web_folder_protection($web['document_root'], true);
+
 		}
-		
-		$app->log("Jailkit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG);
-		
-		
+
+		$app->log("Jailkit Plugin -> delete username:".$data['old']['username'], LOGLEVEL_DEBUG);
+
+
 	}
-	
+
 	function _setup_jailkit_chroot()
 	{
-			global $app;
-			
-			//check if the chroot environment is created yet if not create it with a list of program sections from the config
-			if (!is_dir($this->data['new']['dir'].'/etc/jailkit'))
-			{
-				$command = '/usr/local/ispconfig/server/scripts/create_jailkit_chroot.sh';
-				$command .= ' '.escapeshellcmd($this->data['new']['dir']);
-				$command .= ' \''.$this->jailkit_config['jailkit_chroot_app_sections'].'\'';
-				exec($command.' 2>/dev/null');
-				
-				$this->app->log("Added jailkit chroot with command: ".$command,LOGLEVEL_DEBUG);
-				
-				$this->_add_jailkit_programs();
-				
-				//add bash.bashrc script
-				//we need to collect the domain name to be used as the HOSTNAME in the bashrc script
-				$web = $this->app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ".intval($this->data['new']["parent_domain_id"]));
-				
-				$this->app->load('tpl');
-		
-				$tpl = new tpl();
-				$tpl->newTemplate("bash.bashrc.master");
-				
-				$tpl->setVar('jailkit_chroot',true);
-				$tpl->setVar('domain',$web['domain']);
-				$tpl->setVar('home_dir',$this->_get_home_dir(""));
-				
-				$bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc';
-				if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc);
-				
-				file_put_contents($bashrc,$tpl->grab());
-				unset($tpl);
-				
-				$this->app->log("Added bashrc script : ".$bashrc,LOGLEVEL_DEBUG);
-				
-				$tpl = new tpl();
-				$tpl->newTemplate("motd.master");
-				
-				$tpl->setVar('domain',$web['domain']);
-				
-				$motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd';
-				if(@is_file($motd) || @is_link($motd)) unlink($motd);
-				
-				$app->system->file_put_contents($motd,$tpl->grab());
-				
-			}
+		global $app;
+
+		//check if the chroot environment is created yet if not create it with a list of program sections from the config
+		if (!is_dir($this->data['new']['dir'].'/etc/jailkit'))
+		{
+			$command = '/usr/local/ispconfig/server/scripts/create_jailkit_chroot.sh';
+			$command .= ' '.escapeshellcmd($this->data['new']['dir']);
+			$command .= ' \''.$this->jailkit_config['jailkit_chroot_app_sections'].'\'';
+			exec($command.' 2>/dev/null');
+
+			$this->app->log("Added jailkit chroot with command: ".$command, LOGLEVEL_DEBUG);
+
+			$this->_add_jailkit_programs();
+
+			//add bash.bashrc script
+			//we need to collect the domain name to be used as the HOSTNAME in the bashrc script
+			$web = $this->app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ".intval($this->data['new']["parent_domain_id"]));
+
+			$this->app->load('tpl');
+
+			$tpl = new tpl();
+			$tpl->newTemplate("bash.bashrc.master");
+
+			$tpl->setVar('jailkit_chroot', true);
+			$tpl->setVar('domain', $web['domain']);
+			$tpl->setVar('home_dir', $this->_get_home_dir(""));
+
+			$bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc';
+			if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc);
+
+			file_put_contents($bashrc, $tpl->grab());
+			unset($tpl);
+
+			$this->app->log("Added bashrc script : ".$bashrc, LOGLEVEL_DEBUG);
+
+			$tpl = new tpl();
+			$tpl->newTemplate("motd.master");
+
+			$tpl->setVar('domain', $web['domain']);
+
+			$motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd';
+			if(@is_file($motd) || @is_link($motd)) unlink($motd);
+
+			$app->system->file_put_contents($motd, $tpl->grab());
+
+		}
 	}
-	
+
 	function _add_jailkit_programs()
 	{
 		//copy over further programs and its libraries
@@ -259,43 +263,43 @@
 		$command .= ' '.escapeshellcmd($this->data['new']['dir']);
 		$command .= ' \''.$this->jailkit_config['jailkit_chroot_app_programs'].'\'';
 		exec($command.' 2>/dev/null');
-		
-		$this->app->log("Added programs to jailkit chroot with command: ".$command,LOGLEVEL_DEBUG);
+
+		$this->app->log("Added programs to jailkit chroot with command: ".$command, LOGLEVEL_DEBUG);
 	}
-	
+
 	function _get_home_dir($username)
 	{
-		return str_replace("[username]",escapeshellcmd($username),$this->jailkit_config['jailkit_chroot_home']);
+		return str_replace("[username]", escapeshellcmd($username), $this->jailkit_config['jailkit_chroot_home']);
 	}
-	
+
 	function _add_jailkit_user()
 	{
-			global $app;
-			
-			//add the user to the chroot
-			$jailkit_chroot_userhome = $this->_get_home_dir($this->data['new']['username']);
-			$jailkit_chroot_puserhome = $this->_get_home_dir($this->data['new']['puser']);
-			
-			if(!is_dir($this->data['new']['dir'].'/etc')) mkdir($this->data['new']['dir'].'/etc', 0755);
-			if(!is_file($this->data['new']['dir'].'/etc/passwd')) touch($this->data['new']['dir'].'/etc/passwd', 0755);
-			
-			// IMPORTANT!
-			// ALWAYS create the user. Even if the user was created before
-			// if we check if the user exists, then a update (no shell -> jailkit) will not work
-			// and the user has FULL ACCESS to the root of the server!
-			$command = '/usr/local/ispconfig/server/scripts/create_jailkit_user.sh';
-			$command .= ' '.escapeshellcmd($this->data['new']['username']);
-			$command .= ' '.escapeshellcmd($this->data['new']['dir']);
-			$command .= ' '.$jailkit_chroot_userhome;
-			$command .= ' '.escapeshellcmd($this->data['new']['shell']);
-			$command .= ' '.$this->data['new']['puser'];
-			$command .= ' '.$jailkit_chroot_puserhome;
-			exec($command.' 2>/dev/null');
-			
-			//* Change the homedir of the shell user and parent user
-			//* We have to do this manually as the usermod command fails 
-			//* when the user is logged in or a command is running under that user
-			/*
+		global $app;
+
+		//add the user to the chroot
+		$jailkit_chroot_userhome = $this->_get_home_dir($this->data['new']['username']);
+		$jailkit_chroot_puserhome = $this->_get_home_dir($this->data['new']['puser']);
+
+		if(!is_dir($this->data['new']['dir'].'/etc')) mkdir($this->data['new']['dir'].'/etc', 0755);
+		if(!is_file($this->data['new']['dir'].'/etc/passwd')) touch($this->data['new']['dir'].'/etc/passwd', 0755);
+
+		// IMPORTANT!
+		// ALWAYS create the user. Even if the user was created before
+		// if we check if the user exists, then a update (no shell -> jailkit) will not work
+		// and the user has FULL ACCESS to the root of the server!
+		$command = '/usr/local/ispconfig/server/scripts/create_jailkit_user.sh';
+		$command .= ' '.escapeshellcmd($this->data['new']['username']);
+		$command .= ' '.escapeshellcmd($this->data['new']['dir']);
+		$command .= ' '.$jailkit_chroot_userhome;
+		$command .= ' '.escapeshellcmd($this->data['new']['shell']);
+		$command .= ' '.$this->data['new']['puser'];
+		$command .= ' '.$jailkit_chroot_puserhome;
+		exec($command.' 2>/dev/null');
+
+		//* Change the homedir of the shell user and parent user
+		//* We have to do this manually as the usermod command fails
+		//* when the user is logged in or a command is running under that user
+		/*
 			$passwd_file_array = file('/etc/passwd');
 			$passwd_out = '';
 			if(is_array($passwd_file_array)) {
@@ -313,59 +317,59 @@
 					}
 				}
 			}*/
-			
-			$app->system->usermod($this->data['new']['username'], 0, 0, $this->data['new']['dir'].'/.'.$jailkit_chroot_userhome, '/usr/sbin/jk_chrootsh');
-			$app->system->usermod($this->data['new']['puser'], 0, 0, $this->data['new']['dir'].'/.'.$jailkit_chroot_userhome, '/usr/sbin/jk_chrootsh');
-				
-			$this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG);
-						
-			if(!is_dir($this->data['new']['dir'].$jailkit_chroot_userhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), 0755, true);
-			$app->system->chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['username']);
-			$app->system->chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['pgroup']);
-				
-			$this->app->log("Added created jailkit user home in : ".$this->data['new']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
-			
-			if(!is_dir($this->data['new']['dir'].$jailkit_chroot_puserhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), 0755, true);
-			$app->system->chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['puser']);
-			$app->system->chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['pgroup']);
-				
-			$this->app->log("Added jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome,LOGLEVEL_DEBUG);
-			
+
+		$app->system->usermod($this->data['new']['username'], 0, 0, $this->data['new']['dir'].'/.'.$jailkit_chroot_userhome, '/usr/sbin/jk_chrootsh');
+		$app->system->usermod($this->data['new']['puser'], 0, 0, $this->data['new']['dir'].'/.'.$jailkit_chroot_userhome, '/usr/sbin/jk_chrootsh');
+
+		$this->app->log("Added jailkit user to chroot with command: ".$command, LOGLEVEL_DEBUG);
+
+		if(!is_dir($this->data['new']['dir'].$jailkit_chroot_userhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), 0755, true);
+		$app->system->chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['username']);
+		$app->system->chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_userhome), $this->data['new']['pgroup']);
+
+		$this->app->log("Added created jailkit user home in : ".$this->data['new']['dir'].$jailkit_chroot_userhome, LOGLEVEL_DEBUG);
+
+		if(!is_dir($this->data['new']['dir'].$jailkit_chroot_puserhome)) mkdir(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), 0755, true);
+		$app->system->chown(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['puser']);
+		$app->system->chgrp(escapeshellcmd($this->data['new']['dir'].$jailkit_chroot_puserhome), $this->data['new']['pgroup']);
+
+		$this->app->log("Added jailkit parent user home in : ".$this->data['new']['dir'].$jailkit_chroot_puserhome, LOGLEVEL_DEBUG);
+
 
 	}
-	
+
 	//* Update the website root directory permissions depending on the security level
 	function _update_website_security_level() {
-		global $app,$conf;
-		
+		global $app, $conf;
+
 		// load the server configuration options
 		$app->uses("getconf");
 		$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
-		
+
 		// Get the parent website of this shell user
 		$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$this->data['new']['parent_domain_id']);
-		
+
 		//* If the security level is set to high
 		if($web_config['security_level'] == 20 && is_array($web)) {
-			$app->system->web_folder_protection($web["document_root"],false);
-			$app->system->chmod($web["document_root"],0755);
-			$app->system->chown($web["document_root"],'root');
-			$app->system->chgrp($web["document_root"],'root');
-			$app->system->web_folder_protection($web["document_root"],true);
+			$app->system->web_folder_protection($web["document_root"], false);
+			$app->system->chmod($web["document_root"], 0755);
+			$app->system->chown($web["document_root"], 'root');
+			$app->system->chgrp($web["document_root"], 'root');
+			$app->system->web_folder_protection($web["document_root"], true);
 		}
-		
+
 	}
-	
+
 	//* Wrapper for exec function for easier debugging
 	private function _exec($command) {
 		global $app;
-		$app->log('exec: '.$command,LOGLEVEL_DEBUG);
+		$app->log('exec: '.$command, LOGLEVEL_DEBUG);
 		exec($command);
 	}
 
 	private function _setup_ssh_rsa() {
 		global $app;
-		$this->app->log("ssh-rsa setup shelluser_jailkit",LOGLEVEL_DEBUG); 
+		$this->app->log("ssh-rsa setup shelluser_jailkit", LOGLEVEL_DEBUG);
 		// Get the client ID, username, and the key
 		$domain_data = $this->app->db->queryOneRecord('SELECT sys_groupid FROM web_domain WHERE web_domain.domain_id = '.intval($this->data['new']['parent_domain_id']));
 		$sys_group_data = $this->app->db->queryOneRecord('SELECT * FROM sys_group WHERE sys_group.groupid = '.intval($domain_data['sys_groupid']));
@@ -375,38 +379,38 @@
 		$userkey = $client_data['ssh_rsa'];
 		unset($domain_data);
 		unset($client_data);
-		
+
 		// ssh-rsa authentication variables
 		$sshrsa = $this->data['new']['ssh_rsa'];
 		$usrdir = escapeshellcmd($this->data['new']['dir']).'/'.$this->_get_home_dir($this->data['new']['username']);
 		$sshdir = $usrdir.'/.ssh';
 		$sshkeys= $usrdir.'/.ssh/authorized_keys';
-			
+
 		$app->uses('file');
 		$sshrsa = $app->file->unix_nl($sshrsa);
-		$sshrsa = $app->file->remove_blank_lines($sshrsa,0);
-		
+		$sshrsa = $app->file->remove_blank_lines($sshrsa, 0);
+
 		// If this user has no key yet, generate a pair
 		if ($userkey == '' && $id > 0){
 			//Generate ssh-rsa-keys
 			exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""');
-			
+
 			// use the public key that has been generated
 			$userkey = $app->system->file_get_contents('/tmp/id_rsa.pub');
-			
+
 			// save keypair in client table
 			$this->app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".$app->db->quote($app->system->file_get_contents('/tmp/id_rsa'))."', ssh_rsa = '".$app->db->quote($userkey)."' WHERE client_id = ".$id);
 
 			$app->system->unlink('/tmp/id_rsa');
 			$app->system->unlink('/tmp/id_rsa.pub');
-			$this->app->log("ssh-rsa keypair generated for ".$username,LOGLEVEL_DEBUG);
+			$this->app->log("ssh-rsa keypair generated for ".$username, LOGLEVEL_DEBUG);
 		};
-		
+
 		if (!file_exists($sshkeys)){
 			// add root's key
 			$app->file->mkdirs($sshdir, '0755');
 			if(is_file('/root/.ssh/authorized_keys')) $app->system->file_put_contents($sshkeys, $app->system->file_get_contents('/root/.ssh/authorized_keys'));
-		
+
 			// Remove duplicate keys
 			$existing_keys = @file($sshkeys);
 			$new_keys = explode("\n", $userkey);
@@ -418,32 +422,32 @@
 				}
 			}
 			$final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
-			
+
 			// add the user's key
 			file_put_contents($sshkeys, $final_keys);
 			$app->file->remove_blank_lines($sshkeys);
-			$this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys,LOGLEVEL_DEBUG);
+			$this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys, LOGLEVEL_DEBUG);
 		}
 		//* Get the keys
 		$existing_keys = file($sshkeys);
 		$new_keys = explode("\n", $sshrsa);
-		$old_keys = explode("\n",$this->data['old']['ssh_rsa']);
-			
+		$old_keys = explode("\n", $this->data['old']['ssh_rsa']);
+
 		//* Remove all old keys
 		if(is_array($old_keys)) {
 			foreach($old_keys as $key => $val) {
-				$k = array_search(trim($val),$existing_keys);
+				$k = array_search(trim($val), $existing_keys);
 				unset($existing_keys[$k]);
 			}
 		}
-			
+
 		//* merge the remaining keys and the ones fom the ispconfig database.
 		if(is_array($new_keys)) {
 			$final_keys_arr = array_merge($existing_keys, $new_keys);
 		} else {
 			$final_keys_arr = $existing_keys;
 		}
-			
+
 		$new_final_keys_arr = array();
 		if(is_array($final_keys_arr) && !empty($final_keys_arr)){
 			foreach($final_keys_arr as $key => $val){
@@ -451,18 +455,19 @@
 			}
 		}
 		$final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
-			
-		// add the custom key 
+
+		// add the custom key
 		$app->system->file_put_contents($sshkeys, $final_keys);
 		$app->file->remove_blank_lines($sshkeys);
-		$this->app->log("ssh-rsa key updated in ".$sshkeys,LOGLEVEL_DEBUG);
-		
+		$this->app->log("ssh-rsa key updated in ".$sshkeys, LOGLEVEL_DEBUG);
+
 		// set proper file permissions
 		exec("chown -R ".escapeshellcmd($this->data['new']['puser']).":".escapeshellcmd($this->data['new']['pgroup'])." ".$sshdir);
 		exec("chmod 700 ".$sshdir);
 		exec("chmod 600 '$sshkeys'");
-		
+
 	}
+
 } // end class
 
 ?>

--
Gitblit v1.9.1