Merged language files.

tbrehm

2013-02-21 dcf6c1791dbb8594b99e895919c4ffdee461f92d

 interface/web/sites/shell_user_edit.php

@@ -79,13 +79,10 @@
      
      if ($this->dataRecord['username'] != ""){
         /* REMOVE the restriction */
         $app->tpl->setVar("username", preg_replace('/'.$shelluser_prefix.'/', '', $this->dataRecord['username'], 1));
         $app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $shelluser_prefix));
      }
      if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
         $app->tpl->setVar("username_prefix", $global_config['shelluser_prefix']);
      } else {
         $app->tpl->setVar("username_prefix", $shelluser_prefix);
      }
        
        $app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $shelluser_prefix, $global_config['shelluser_prefix']));
      
      if($this->id > 0) {
         //* we are editing a existing record
@@ -102,7 +99,7 @@
      global $app, $conf;
      
      // Get the record of the parent domain
      $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".intval(@$this->dataRecord["parent_domain_id"]));
      $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));
      
      // Set a few fixed values
      $this->dataRecord["server_id"] = $parent_domain["server_id"];
@@ -138,6 +135,7 @@
         $global_config = $app->getconf->get_global_config('sites');
         $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
         
            $this->dataRecord['username_prefix'] = $shelluser_prefix;
         /* restrict the names */
         $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
      }
@@ -147,7 +145,7 @@
   function onAfterInsert() {
      global $app, $conf;
      
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".intval($this->dataRecord["parent_domain_id"]));
      $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($this->dataRecord["parent_domain_id"]));
      $server_id = $web["server_id"];
      $dir = $web["document_root"];
      $puser = $web["system_user"];
@@ -184,6 +182,10 @@
         $global_config = $app->getconf->get_global_config('sites');
         $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
         
            $old_record = $app->tform->getDataRecord($this->id);
            $shelluser_prefix = $app->tools_sites->getPrefix($old_record['username_prefix'], $shelluser_prefix);
            $this->dataRecord['username_prefix'] = $shelluser_prefix;
            
         /* restrict the names */
         $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
      }