Fixed: FS#764 - spamfilter not well updated after change of domain

tbrehm

2009-06-28 3721d3e94ebc2d839492f11b3be8847344060eb3

 interface/web/sites/shell_user_edit.php

@@ -82,7 +82,8 @@
      
      $app->uses('getconf');
      $global_config = $app->getconf->get_global_config('sites');
      $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
      //$shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
      $shelluser_prefix = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
      
      if ($this->dataRecord['username'] != ""){
         /* REMOVE the restriction */
@@ -92,6 +93,14 @@
         $app->tpl->setVar("username_prefix", $global_config['shelluser_prefix']);
      } else {
         $app->tpl->setVar("username_prefix", $shelluser_prefix);
      }
		
      if($this->id > 0) {
         //* we are editing a existing record
         $app->tpl->setVar("edit_disabled", 1);
         $app->tpl->setVar("parent_domain_id_value", $this->dataRecord["parent_domain_id"]);
      } else {
         $app->tpl->setVar("edit_disabled", 0);
      }

      parent::onShowEnd();
@@ -128,8 +137,9 @@
         
         $app->uses('getconf');
         $global_config = $app->getconf->get_global_config('sites');
         $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);

         // $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
         $shelluser_prefix = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
			
         /* restrict the names */
         $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
      }
@@ -174,7 +184,8 @@
         */
         $app->uses('getconf');
         $global_config = $app->getconf->get_global_config('sites');
         $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
         // $shelluser_prefix = ($global_config['shelluser_prefix'] == '')?'':str_replace('[CLIENTNAME]', $this->getClientName(), $global_config['shelluser_prefix']);
         $shelluser_prefix = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
         
         /* restrict the names */
         $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
@@ -195,7 +206,8 @@
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
      } else {
         // Get the group-id from the data itself
         $client_group_id = $this->dataRecord['client_group_id'];
         $web = $app->db->queryOneRecord("SELECT sys_groupid FROM web_domain WHERE domain_id = ".intval($this->dataRecord['parent_domain_id']));
         $client_group_id = $web['sys_groupid'];
      }
      /* get the name of the client */
      $tmp = $app->db->queryOneRecord("SELECT name FROM sys_group WHERE groupid = " . $client_group_id);