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

Till Brehm

2014-01-19 5192dbc06c7d08457e652b55f1cba4f0af23c1be

 interface/web/client/client_edit.php

@@ -221,6 +221,24 @@
         }
      }
      
      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 @@
      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 @@
         $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 @@
         $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');