Implemented: FS#926 - User assignment from a Reseller to a Reseller

Author: Till Brehm

interface/web/client/client_edit.php

@@ -221,6 +221,24 @@ function onShowEnd() {
 			}
 		}
 
+		if($app->auth->is_admin()) {
+			// Fill the client select field
+			$sql = "SELECT client.client_id, sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 AND client.limit_client > 0 ORDER BY sys_group.name";
+			$clients = $app->db->queryAllRecords($sql);
+			$client_select = "<option value='0'>- ".$app->tform->lng('none_txt')." -</option>";
+			//$tmp_data_record = $app->tform->getDataRecord($this->id);
+			if(is_array($clients)) {
+				$selected_client_id = 0; // needed to get list of PHP versions
+				foreach($clients as $client) {
+					if(is_array($this->dataRecord) && ($client["client_id"] == $this->dataRecord['parent_client_id']) && !$selected_client_id) $selected_client_id = $client["client_id"];
+					$selected = @(is_array($this->dataRecord) && ($client["client_id"] == $this->dataRecord['parent_client_id']))?'SELECTED':'';
+					if($selected == 'SELECTED') $selected_client_id = $client["client_id"];
+					$client_select .= "<option value='$client[client_id]' $selected>$client[contactname]</option>\r\n";
+				}
+			}
+			$app->tpl->setVar("parent_client_id", $client_select);
+		}
+		
 		parent::onShowEnd();
 
 	}
@@ -262,6 +280,14 @@ function onAfterInsert() {
 		if($_SESSION['s']['user']['typ'] == 'user') {
 			$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);
+		} else {
+			if($this->dataRecord['parent_client_id'] > 0) {
+				//* get userid of the reseller and add it to the group of the client
+				$tmp = $app->db->queryOneRecord("SELECT sys_user.userid FROM sys_user,sys_group WHERE sys_user.default_group = sys_group.groupid AND sys_group.client_id = ".$app->functions->intval($this->dataRecord['parent_client_id']));
+				$app->auth->add_group_to_user($tmp['userid'], $groupid);
+				$app->db->query("UPDATE client SET parent_client_id = ".$app->functions->intval($this->dataRecord['parent_client_id'])." WHERE client_id = ".$this->id);
+				unset($tmp);
+			}
 		}
 
 		//* Set the default servers
@@ -448,7 +474,7 @@ function onAfterUpdate() {
 			$app->db->query($sql);
 		}
 
-		// reseller status changed
+		//* reseller status changed
 		if(isset($this->dataRecord["limit_client"]) && $this->dataRecord["limit_client"] != $this->oldDataRecord["limit_client"]) {
 			$modules = $conf['interface_modules_enabled'];
 			if($this->dataRecord["limit_client"] > 0) $modules .= ',client';
@@ -457,6 +483,34 @@ function onAfterUpdate() {
 			$sql = "UPDATE sys_user SET modules = '$modules' WHERE client_id = $client_id";
 			$app->db->query($sql);
 		}
+		
+		//* Client has been moved to another reseller
+		if($_SESSION['s']['user']['typ'] == 'admin' && isset($this->dataRecord['parent_client_id']) && $this->dataRecord['parent_client_id'] != $this->oldDataRecord['parent_client_id']) {
+			//* Get groupid of the client
+			$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".intval($this->id));
+			$groupid = $tmp['groupid'];
+			unset($tmp);
+			
+			//* Remove sys_user of old reseller from client group
+			if($this->oldDataRecord['parent_client_id'] > 0) {
+				//* get userid of the old reseller remove it from the group of the client
+				$tmp = $app->db->queryOneRecord("SELECT sys_user.userid FROM sys_user,sys_group WHERE sys_user.default_group = sys_group.groupid AND sys_group.client_id = ".$app->functions->intval($this->oldDataRecord['parent_client_id']));
+				$app->auth->remove_group_from_user($tmp['userid'], $groupid);
+				unset($tmp);
+			}
+			
+			//* Add sys_user of new reseller to client group
+			if($this->dataRecord['parent_client_id'] > 0) {
+				//* get userid of the reseller and add it to the group of the client
+				$tmp = $app->db->queryOneRecord("SELECT sys_user.userid, sys_user.default_group FROM sys_user,sys_group WHERE sys_user.default_group = sys_group.groupid AND sys_group.client_id = ".$app->functions->intval($this->dataRecord['parent_client_id']));
+				$app->auth->add_group_to_user($tmp['userid'], $groupid);
+				$app->db->query("UPDATE client SET sys_userid = ".$app->functions->intval($tmp['userid']).", sys_groupid = ".$app->functions->intval($tmp['default_group']).", parent_client_id = ".$app->functions->intval($this->dataRecord['parent_client_id'])." WHERE client_id = ".$this->id);
+				unset($tmp);
+			} else {
+				//* Client is not assigned to a reseller anymore, so we assign it to the admin
+				$app->db->query("UPDATE client SET sys_userid = 1, sys_groupid = 1, parent_client_id = 0 WHERE client_id = ".$this->id);
+			}
+		}
 
 		if(isset($this->dataRecord['template_master'])) {
 			$app->uses('client_templates');

interface/web/client/lib/lang/en_client.lng

@@ -154,4 +154,6 @@ $wb['gender_m_txt'] = 'Mr.';
 $wb['gender_f_txt'] = 'Ms.';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
+$wb['parent_client_id_txt'] = 'Client of reseller';
+$wb['none_txt'] = 'none';
 ?>

interface/web/client/templates/client_edit_limits.htm

@@ -37,6 +37,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
                 <div class="ctrlHolder">
                     &nbsp;
                 </div>
+				<tmpl_if name="is_admin">
+                <div class="ctrlHolder">
+                    <label for="parent_client_id_id">{tmpl_var name='parent_client_id_txt'}</label>
+                    <select name="parent_client_id" id="parent_client_id" class="selectInput">
+                        {tmpl_var name='parent_client_id'}
+                    </select>
+                </div>
+                </tmpl_if>
             <div class="subsectiontoggle"><span class="showing"></span>{tmpl_var name='web_limits_txt'}<em class="showing"></em></div>
             <div>
                 <div class="ctrlHolder">
@@ -313,7 +321,7 @@ <h2><tmpl_var name="list_head_txt"></h2>
         .find('div.pnl_formsarea')
         .find('fieldset')
         .find('input,select,button')
-        .not('#template_master,#template_additional,#default_mailserver,#default_webserver,#default_dbserver,#default_dnsserver,#default_slave_dnsserver,#customer_no_template,#customer_no_start,#customer_no_counter')
+        .not('#template_master,#template_additional,#default_mailserver,#default_webserver,#default_dbserver,#default_dnsserver,#default_slave_dnsserver,#customer_no_template,#customer_no_start,#customer_no_counter,#parent_client_id')
         .click(function(e) {
             if(custom_template_selected()) return true;
             e.preventDefault();