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

---
 interface/web/client/client_edit.php |  392 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 197 insertions(+), 195 deletions(-)

diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index ab33d9e..3fa7837 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -38,8 +38,8 @@
 * End Form configuration
 ******************************************/
 
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
 
 //* Check permissions for module
 $app->auth->check_module_permissions('client');
@@ -49,18 +49,18 @@
 $app->load('tform_actions');
 
 class page_action extends tform_actions {
-    var $_template_additional = array();
-    
+	var $_template_additional = array();
+
 	function onShowNew() {
 		global $app, $conf;
-		
+
 		// we will check only users, not admins
 		if($_SESSION["s"]["user"]["typ"] == 'user') {
-			
+
 			// Get the limits of the client
 			$client_group_id = $_SESSION["s"]["user"]["default_group"];
 			$client = $app->db->queryOneRecord("SELECT limit_client FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-			
+
 			// Check if the user may add another website.
 			if($client["limit_client"] >= 0) {
 				$tmp = $app->db->queryOneRecord("SELECT count(client_id) as number FROM client WHERE sys_groupid = $client_group_id");
@@ -69,21 +69,21 @@
 				}
 			}
 		}
-		
+
 		parent::onShowNew();
 	}
-	
-	
+
+
 	function onSubmit() {
 		global $app, $conf;
-		
+
 		// we will check only users, not admins
 		if($_SESSION["s"]["user"]["typ"] == 'user' && $this->id == 0) {
-			
+
 			// Get the limits of the client
 			$client_group_id = $_SESSION["s"]["user"]["default_group"];
 			$client = $app->db->queryOneRecord("SELECT limit_client FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
-			
+
 			// Check if the user may add another website.
 			if($client["limit_client"] >= 0) {
 				$tmp = $app->db->queryOneRecord("SELECT count(client_id) as number FROM client WHERE sys_groupid = $client_group_id");
@@ -92,28 +92,28 @@
 				}
 			}
 		}
-        
-        if($this->id != 0) {
-            $this->oldTemplatesAssigned = $app->db->queryAllRecords('SELECT * FROM `client_template_assigned` WHERE `client_id` = ' . $this->id);
-            if(!is_array($this->oldTemplatesAssigned) || count($this->oldTemplatesAssigned) < 1) {
-                // check previous type of storing templates
-                $tpls = explode('/', $this->oldDataRecord['template_additional']);
-                $this->oldTemplatesAssigned = array();
-                foreach($tpls as $item) {
-                    $item = trim($item);
-                    if(!$item) continue;
-                    $this->oldTemplatesAssigned[] = array('assigned_template_id' => 0, 'client_template_id' => $item, 'client_id' => $this->id);
-                }
-                unset($tpls);
-            }
-        } else {
-            $this->oldTemplatesAssigned = array();
-        }
-        
-        $this->_template_additional = explode('/', $this->dataRecord['template_additional']);
-        $this->dataRecord['template_additional'] = '';
-        
-        parent::onSubmit();
+
+		if($this->id != 0) {
+			$this->oldTemplatesAssigned = $app->db->queryAllRecords('SELECT * FROM `client_template_assigned` WHERE `client_id` = ' . $this->id);
+			if(!is_array($this->oldTemplatesAssigned) || count($this->oldTemplatesAssigned) < 1) {
+				// check previous type of storing templates
+				$tpls = explode('/', $this->oldDataRecord['template_additional']);
+				$this->oldTemplatesAssigned = array();
+				foreach($tpls as $item) {
+					$item = trim($item);
+					if(!$item) continue;
+					$this->oldTemplatesAssigned[] = array('assigned_template_id' => 0, 'client_template_id' => $item, 'client_id' => $this->id);
+				}
+				unset($tpls);
+			}
+		} else {
+			$this->oldTemplatesAssigned = array();
+		}
+
+		$this->_template_additional = explode('/', $this->dataRecord['template_additional']);
+		$this->dataRecord['template_additional'] = '';
+
+		parent::onSubmit();
 	}
 
 	function onShowEnd() {
@@ -128,54 +128,54 @@
 			$option .= '<option value="' . $item['template_id'] . '|' .  $item['template_name'] . '">' . $item['template_name'] . '</option>';
 			$tpl[$item['template_id']] = $item['template_name'];
 		}
-		$app->tpl->setVar('tpl_add_select',$option);
+		$app->tpl->setVar('tpl_add_select', $option);
 
-        // check for new-style records
-        $result = $app->db->queryAllRecords('SELECT assigned_template_id, client_template_id FROM client_template_assigned WHERE client_id = ' . $this->id);
-        if($result && count($result) > 0) {
-            // new style
-            $items = array();
-            $text = '';
-            foreach($result as $item){
-                if (trim($item['client_template_id']) != ''){
-                    if ($text != '') $text .= '';
-                    $text .= '<li rel="' . $item['assigned_template_id'] . '">' . $tpl[$item['client_template_id']];
-                    $text .= '<a href="#" class="button icons16 icoDelete"></a>';
-                                        $tmp = new stdClass();
-                    $tmp->id = $item['assigned_template_id'];
-                    $tmp->data = '';
-                    $app->plugin->raiseEvent('get_client_template_details', $tmp);
-                    if($tmp->data != '') $text .= '<br /><em>' . $tmp->data . '</em>';
+		// check for new-style records
+		$result = $app->db->queryAllRecords('SELECT assigned_template_id, client_template_id FROM client_template_assigned WHERE client_id = ' . $this->id);
+		if($result && count($result) > 0) {
+			// new style
+			$items = array();
+			$text = '';
+			foreach($result as $item){
+				if (trim($item['client_template_id']) != ''){
+					if ($text != '') $text .= '';
+					$text .= '<li rel="' . $item['assigned_template_id'] . '">' . $tpl[$item['client_template_id']];
+					$text .= '<a href="#" class="button icons16 icoDelete"></a>';
+					$tmp = new stdClass();
+					$tmp->id = $item['assigned_template_id'];
+					$tmp->data = '';
+					$app->plugin->raiseEvent('get_client_template_details', $tmp);
+					if($tmp->data != '') $text .= '<br /><em>' . $tmp->data . '</em>';
 
-                    $text .= '</li>';
-                    $items[] = $item['assigned_template_id'] . ':' . $item['client_template_id'];
-                }
-            }
+					$text .= '</li>';
+					$items[] = $item['assigned_template_id'] . ':' . $item['client_template_id'];
+				}
+			}
 
-            $tmprec = $app->tform->getHTML(array('template_additional' => implode('/', $items)), $this->active_tab, 'EDIT');
-            $app->tpl->setVar('template_additional', $tmprec['template_additional']);
-            unset($tmprec);
-        } else {
-            // old style
-            $sql = "SELECT template_additional FROM client WHERE client_id = " . $this->id;
-            $result = $app->db->queryOneRecord($sql);
-            $tplAdd = explode("/", $result['template_additional']);
-            $text = '';
-            foreach($tplAdd as $item){
-                if (trim($item) != ''){
-                    if ($text != '') $text .= '';
-                    $text .= '<li>' . $tpl[$item]. '<a href="#" class="button icons16 icoDelete"></a></li>';
-                }
-            }
-        }
+			$tmprec = $app->tform->getHTML(array('template_additional' => implode('/', $items)), $this->active_tab, 'EDIT');
+			$app->tpl->setVar('template_additional', $tmprec['template_additional']);
+			unset($tmprec);
+		} else {
+			// old style
+			$sql = "SELECT template_additional FROM client WHERE client_id = " . $this->id;
+			$result = $app->db->queryOneRecord($sql);
+			$tplAdd = explode("/", $result['template_additional']);
+			$text = '';
+			foreach($tplAdd as $item){
+				if (trim($item) != ''){
+					if ($text != '') $text .= '';
+					$text .= '<li>' . $tpl[$item]. '<a href="#" class="button icons16 icoDelete"></a></li>';
+				}
+			}
+		}
 
 		$app->tpl->setVar('template_additional_list', $text);
-		$app->tpl->setVar('app_module','client');
+		$app->tpl->setVar('app_module', 'client');
 
 		parent::onShowEnd();
 
 	}
-    
+
 	/*
 	 This function is called automatically right after
 	 the data was successful inserted in the database.
@@ -185,36 +185,36 @@
 		// Create the group for the client
 		$groupid = $app->db->datalogInsert('sys_group', "(name,description,client_id) VALUES ('".$app->db->quote($this->dataRecord["username"])."','',".$this->id.")", 'groupid');
 		$groups = $groupid;
-		
+
 		$username = $app->db->quote($this->dataRecord["username"]);
 		$password = $app->db->quote($this->dataRecord["password"]);
 		$modules = $conf['interface_modules_enabled'];
 		if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] > 0) $modules .= ',client';
-		$startmodule = (stristr($modules,'dashboard'))?'dashboard':'client';
+		$startmodule = (stristr($modules, 'dashboard'))?'dashboard':'client';
 		$usertheme = $app->db->quote($this->dataRecord["usertheme"]);
 		$type = 'user';
 		$active = 1;
 		$language = $app->db->quote($this->dataRecord["language"]);
 		$password = $app->auth->crypt_password($password);
-		
+
 		// Create the controlpaneluser for the client
 		//Generate ssh-rsa-keys
 		exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""');
 		$app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".$app->db->quote(@file_get_contents('/tmp/id_rsa'))."', ssh_rsa = '".$app->db->quote(@file_get_contents('/tmp/id_rsa.pub'))."' WHERE client_id = ".$this->id);
 		exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub');
-		
+
 		// Create the controlpaneluser for the client
 		$sql = "INSERT INTO sys_user (username,passwort,modules,startmodule,app_theme,typ,active,language,groups,default_group,client_id)
 		VALUES ('$username','$password','$modules','$startmodule','$usertheme','$type','$active','$language',$groups,$groupid,".$this->id.")";
 		$app->db->query($sql);
-		
-		//* If the user who inserted the client is a reseller (not admin), we will have to add this new client group 
+
+		//* If the user who inserted the client is a reseller (not admin), we will have to add this new client group
 		//* to his groups, so he can administrate the records of this client.
 		if($_SESSION['s']['user']['typ'] == 'user') {
-			$app->auth->add_group_to_user($_SESSION['s']['user']['userid'],$groupid);
+			$app->auth->add_group_to_user($_SESSION['s']['user']['userid'], $groupid);
 			$app->db->query("UPDATE client SET parent_client_id = ".$app->functions->intval($_SESSION['s']['user']['client_id'])." WHERE client_id = ".$this->id);
 		}
-		
+
 		//* Set the default servers
 		$tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE mail_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
 		$default_mailserver = $app->functions->intval($tmp['server_id']);
@@ -224,19 +224,19 @@
 		$default_dnsserver = $app->functions->intval($tmp['server_id']);
 		$tmp = $app->db->queryOneRecord('SELECT server_id FROM server WHERE db_server = 1 AND mirror_server_id = 0 LIMIT 0,1');
 		$default_dbserver = $app->functions->intval($tmp['server_id']);
-		
+
 		$sql = "UPDATE client SET default_mailserver = $default_mailserver, default_webserver = $default_webserver, default_dnsserver = $default_dnsserver, default_slave_dnsserver = $default_dnsserver, default_dbserver = $default_dbserver WHERE client_id = ".$this->id;
 		$app->db->query($sql);
-		
-        if(isset($this->dataRecord['template_master'])) {
-            $app->uses('client_templates');
-            $app->client_templates->update_client_templates($this->id, $this->_template_additional);
-        }
+
+		if(isset($this->dataRecord['template_master'])) {
+			$app->uses('client_templates');
+			$app->client_templates->update_client_templates($this->id, $this->_template_additional);
+		}
 
 		parent::onAfterInsert();
 	}
-	
-	
+
+
 	/*
 	 This function is called automatically right after
 	 the data was successful updated in the database.
@@ -249,120 +249,121 @@
 			$client_id = $this->id;
 			$sql = "UPDATE sys_user SET username = '$username' WHERE client_id = $client_id";
 			$app->db->query($sql);
-			
+
 			$tmp = $app->db->queryOneRecord("SELECT * FROM sys_group WHERE client_id = $client_id");
 			$app->db->datalogUpdate("sys_group", "name = '$username'", 'groupid', $tmp['groupid']);
 			unset($tmp);
 		}
-		
+
 		// password changed
 		if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord["password"]) && $this->dataRecord["password"] != '') {
 			$password = $app->db->quote($this->dataRecord["password"]);
 			$salt="$1$";
 			$base64_alphabet='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
 			for ($n=0;$n<8;$n++) {
-				$salt.=$base64_alphabet[mt_rand(0,63)];
+				$salt.=$base64_alphabet[mt_rand(0, 63)];
 			}
 			$salt.="$";
-			$password = crypt(stripslashes($password),$salt);
+			$password = crypt(stripslashes($password), $salt);
 			$client_id = $this->id;
 			$sql = "UPDATE sys_user SET passwort = '$password' WHERE client_id = $client_id";
 			$app->db->query($sql);
 		}
-		
-        if(!isset($this->dataRecord['locked'])) $this->dataRecord['locked'] = 'n';
-        if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && $this->dataRecord["locked"] != $this->oldDataRecord['locked']) {
-            /** lock all the things like web, mail etc. - easy to extend */
-            
-            // get tmp_data of client
-            $client_data = $app->db->queryOneRecord('SELECT `tmp_data` FROM `client` WHERE `client_id` = ' . $this->id);
-            
-            if($client_data['tmp_data'] == '') $tmp_data = array();
-            else $tmp_data = unserialize($client_data['tmp_data']);
-            
-            if(!is_array($tmp_data)) $tmp_data = array();
-            
-            // database tables with their primary key columns
-            $to_disable = array('cron' => 'id',
-                                'ftp_user' => 'ftp_user_id',
-                                'mail_domain' => 'domain_id',
-                                'mail_forwarding' => 'forwarding_id',
-                                'mail_get' => 'mailget_id',
-                                'openvz_vm' => 'vm_id',
-                                'shell_user' => 'shell_user_id',
-                                'webdav_user' => 'webdav_user_id',
-                                'web_database' => 'database_id',
-                                'web_domain' => 'domain_id',
-                                'web_folder' => 'web_folder_id',
-                                'web_folder_user' => 'web_folder_user_id'
-                               );
-            
-            $udata = $app->db->queryOneRecord('SELECT `userid` FROM `sys_user` WHERE `client_id` = ' . $this->id);
-            $gdata = $app->db->queryOneRecord('SELECT `groupid` FROM `sys_group` WHERE `client_id` = ' . $this->id);
-            $sys_groupid = $gdata['groupid'];
-            $sys_userid = $udata['userid'];
-            
-            $entries = array();
-            if($this->dataRecord['locked'] == 'y') {
-                $prev_active = array();
-                $prev_sysuser = array();
-                foreach($to_disable as $current => $keycolumn) {
-                    $prev_active[$current] = array();
-                    $prev_sysuser[$current] = array();
-                    
-                    $entries = $app->db->queryAllRecords('SELECT `' . $keycolumn . '` as `id`, `sys_userid`, `active` FROM `' . $current . '` WHERE `sys_groupid` = ' . $sys_groupid);
-                    foreach($entries as $item) {
-                        
-                        if($item['active'] != 'y') $prev_active[$current][$item['id']]['active'] = 'n';
-                        if($item['sys_userid'] != $sys_userid) $prev_sysuser[$current][$item['id']]['active'] = $item['sys_userid'];
-                        // we don't have to store these if y, as everything without previous state gets enabled later
-                        
-                        $app->db->datalogUpdate($current, array('active' => 'n', 'sys_userid' => $_SESSION["s"]["user"]["userid"]), $keycolumn, $item['id']);
-                    }
-                }
-                
-                $tmp_data['prev_active'] = $prev_active;
-                $tmp_data['prev_sys_userid'] = $prev_sysuser;
-                $app->db->query("UPDATE `client` SET `tmp_data` = '" . $app->db->quote(serialize($tmp_data)) . "' WHERE `client_id` = " . $this->id);
-                unset($prev_active);
-                unset($prev_sysuser);
-            } elseif($this->dataRecord['locked'] == 'n') {
-                foreach($to_disable as $current => $keycolumn) {
-                    $entries = $app->db->queryAllRecords('SELECT `' . $keycolumn . '` as `id` FROM `' . $current . '` WHERE `sys_groupid` = ' . $sys_groupid);
-                    foreach($entries as $item) {
-                        $set_active = 'y';
-                        $set_sysuser = $sys_userid;
-                        if(array_key_exists('prev_active', $tmp_data) == true
-                            && array_key_exists($current, $tmp_data['prev_active']) == true
-                            && array_key_exists($item['id'], $tmp_data['prev_active'][$current]) == true
-                            && $tmp_data['prev_active'][$current][$item['id']] == 'n') $set_active = 'n';
-                        if(array_key_exists('prev_sysuser', $tmp_data) == true
-                            && array_key_exists($current, $tmp_data['prev_sysuser']) == true
-                            && array_key_exists($item['id'], $tmp_data['prev_sysuser'][$current]) == true
-                            && $tmp_data['prev_sysuser'][$current][$item['id']] != $sys_userid) $set_sysuser = $tmp_data['prev_sysuser'][$current][$item['id']];
-                        
-                        $app->db->datalogUpdate($current, array('active' => $set_active, 'sys_userid' => $set_sysuser), $keycolumn, $item['id']);
-                    }
-                }
-                if(array_key_exists('prev_active', $tmp_data)) unset($tmp_data['prev_active']);
-                $app->db->query("UPDATE `client` SET `tmp_data` = '" . $app->db->quote(serialize($tmp_data)) . "' WHERE `client_id` = " . $this->id);
-            }
-            unset($tmp_data);
-            unset($entries);
-            unset($to_disable);
-        }
-        
-        if(!isset($this->dataRecord['canceled'])) $this->dataRecord['canceled'] = 'n';
-        if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && $this->dataRecord["canceled"] != $this->oldDataRecord['canceled']) {
-            if($this->dataRecord['canceled'] == 'y') {
-                $sql = "UPDATE sys_user SET active = '0' WHERE client_id = " . $this->id;
-                $app->db->query($sql);
-            } elseif($this->dataRecord['canceled'] == 'n') {
-                $sql = "UPDATE sys_user SET active = '1' WHERE client_id = " . $this->id;
-                $app->db->query($sql);
-            }
-        }
-        
+
+		if(!isset($this->dataRecord['locked'])) $this->dataRecord['locked'] = 'n';
+		if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && $this->dataRecord["locked"] != $this->oldDataRecord['locked']) {
+			/** lock all the things like web, mail etc. - easy to extend */
+
+
+			// get tmp_data of client
+			$client_data = $app->db->queryOneRecord('SELECT `tmp_data` FROM `client` WHERE `client_id` = ' . $this->id);
+
+			if($client_data['tmp_data'] == '') $tmp_data = array();
+			else $tmp_data = unserialize($client_data['tmp_data']);
+
+			if(!is_array($tmp_data)) $tmp_data = array();
+
+			// database tables with their primary key columns
+			$to_disable = array('cron' => 'id',
+				'ftp_user' => 'ftp_user_id',
+				'mail_domain' => 'domain_id',
+				'mail_forwarding' => 'forwarding_id',
+				'mail_get' => 'mailget_id',
+				'openvz_vm' => 'vm_id',
+				'shell_user' => 'shell_user_id',
+				'webdav_user' => 'webdav_user_id',
+				'web_database' => 'database_id',
+				'web_domain' => 'domain_id',
+				'web_folder' => 'web_folder_id',
+				'web_folder_user' => 'web_folder_user_id'
+			);
+
+			$udata = $app->db->queryOneRecord('SELECT `userid` FROM `sys_user` WHERE `client_id` = ' . $this->id);
+			$gdata = $app->db->queryOneRecord('SELECT `groupid` FROM `sys_group` WHERE `client_id` = ' . $this->id);
+			$sys_groupid = $gdata['groupid'];
+			$sys_userid = $udata['userid'];
+
+			$entries = array();
+			if($this->dataRecord['locked'] == 'y') {
+				$prev_active = array();
+				$prev_sysuser = array();
+				foreach($to_disable as $current => $keycolumn) {
+					$prev_active[$current] = array();
+					$prev_sysuser[$current] = array();
+
+					$entries = $app->db->queryAllRecords('SELECT `' . $keycolumn . '` as `id`, `sys_userid`, `active` FROM `' . $current . '` WHERE `sys_groupid` = ' . $sys_groupid);
+					foreach($entries as $item) {
+
+						if($item['active'] != 'y') $prev_active[$current][$item['id']]['active'] = 'n';
+						if($item['sys_userid'] != $sys_userid) $prev_sysuser[$current][$item['id']]['active'] = $item['sys_userid'];
+						// we don't have to store these if y, as everything without previous state gets enabled later
+
+						$app->db->datalogUpdate($current, array('active' => 'n', 'sys_userid' => $_SESSION["s"]["user"]["userid"]), $keycolumn, $item['id']);
+					}
+				}
+
+				$tmp_data['prev_active'] = $prev_active;
+				$tmp_data['prev_sys_userid'] = $prev_sysuser;
+				$app->db->query("UPDATE `client` SET `tmp_data` = '" . $app->db->quote(serialize($tmp_data)) . "' WHERE `client_id` = " . $this->id);
+				unset($prev_active);
+				unset($prev_sysuser);
+			} elseif($this->dataRecord['locked'] == 'n') {
+				foreach($to_disable as $current => $keycolumn) {
+					$entries = $app->db->queryAllRecords('SELECT `' . $keycolumn . '` as `id` FROM `' . $current . '` WHERE `sys_groupid` = ' . $sys_groupid);
+					foreach($entries as $item) {
+						$set_active = 'y';
+						$set_sysuser = $sys_userid;
+						if(array_key_exists('prev_active', $tmp_data) == true
+							&& array_key_exists($current, $tmp_data['prev_active']) == true
+							&& array_key_exists($item['id'], $tmp_data['prev_active'][$current]) == true
+							&& $tmp_data['prev_active'][$current][$item['id']] == 'n') $set_active = 'n';
+						if(array_key_exists('prev_sysuser', $tmp_data) == true
+							&& array_key_exists($current, $tmp_data['prev_sysuser']) == true
+							&& array_key_exists($item['id'], $tmp_data['prev_sysuser'][$current]) == true
+							&& $tmp_data['prev_sysuser'][$current][$item['id']] != $sys_userid) $set_sysuser = $tmp_data['prev_sysuser'][$current][$item['id']];
+
+						$app->db->datalogUpdate($current, array('active' => $set_active, 'sys_userid' => $set_sysuser), $keycolumn, $item['id']);
+					}
+				}
+				if(array_key_exists('prev_active', $tmp_data)) unset($tmp_data['prev_active']);
+				$app->db->query("UPDATE `client` SET `tmp_data` = '" . $app->db->quote(serialize($tmp_data)) . "' WHERE `client_id` = " . $this->id);
+			}
+			unset($tmp_data);
+			unset($entries);
+			unset($to_disable);
+		}
+
+		if(!isset($this->dataRecord['canceled'])) $this->dataRecord['canceled'] = 'n';
+		if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && $this->dataRecord["canceled"] != $this->oldDataRecord['canceled']) {
+			if($this->dataRecord['canceled'] == 'y') {
+				$sql = "UPDATE sys_user SET active = '0' WHERE client_id = " . $this->id;
+				$app->db->query($sql);
+			} elseif($this->dataRecord['canceled'] == 'n') {
+				$sql = "UPDATE sys_user SET active = '1' WHERE client_id = " . $this->id;
+				$app->db->query($sql);
+			}
+		}
+
 		// language changed
 		if(isset($conf['demo_mode']) && $conf['demo_mode'] != true && isset($this->dataRecord['language']) && $this->dataRecord['language'] != '' && $this->oldDataRecord['language'] != $this->dataRecord['language']) {
 			$language = $app->db->quote($this->dataRecord["language"]);
@@ -370,7 +371,7 @@
 			$sql = "UPDATE sys_user SET language = '$language' WHERE client_id = $client_id";
 			$app->db->query($sql);
 		}
-		
+
 		// reseller status changed
 		if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != $this->oldDataRecord["limit_client"]) {
 			$modules = $conf['interface_modules_enabled'];
@@ -380,14 +381,15 @@
 			$sql = "UPDATE sys_user SET modules = '$modules' WHERE client_id = $client_id";
 			$app->db->query($sql);
 		}
-		
-        if(isset($this->dataRecord['template_master'])) {
-            $app->uses('client_templates');
-            $app->client_templates->update_client_templates($this->id, $this->_template_additional);
-        }
-        
+
+		if(isset($this->dataRecord['template_master'])) {
+			$app->uses('client_templates');
+			$app->client_templates->update_client_templates($this->id, $this->_template_additional);
+		}
+
 		parent::onAfterUpdate();
 	}
+
 }
 
 $page = new page_action;

--
Gitblit v1.9.1