- Changed a German translation. - Extended SEO redirect check for subdomain...

ftimme

2012-11-12 8e38755040c6c2073f92f0ffb087da530d0e7a0a

 interface/web/sites/shell_user_edit.php

@@ -40,7 +40,6 @@

require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
require_once('tools.inc.php');

//* Check permissions for module
$app->auth->check_module_permissions('sites');
@@ -74,14 +73,13 @@
       * data can be edited
       */
      
      $app->uses('getconf');
      $app->uses('getconf,tools_sites');
      $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 = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
      $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
      
      if ($this->dataRecord['username'] != ""){
         /* REMOVE the restriction */
         $app->tpl->setVar("username", str_replace($shelluser_prefix , '', $this->dataRecord['username']));
         $app->tpl->setVar("username", preg_replace('/'.$shelluser_prefix.'/', '', $this->dataRecord['username'], 1));
      }
      if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
         $app->tpl->setVar("username_prefix", $global_config['shelluser_prefix']);
@@ -104,13 +102,17 @@
      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"];
      
      if(isset($this->dataRecord['username']) && trim($this->dataRecord['username']) == '') $app->tform->errorMessage .= $app->tform->lng('username_error_empty').'<br />';
      if(isset($this->dataRecord['username']) && empty($this->dataRecord['parent_domain_id'])) $app->tform->errorMessage .= $app->tform->lng('parent_domain_id_error_empty').'<br />';
      if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'..')) $app->tform->errorMessage .= $app->tform->lng('dir_dot_error').'<br />';
      if(isset($this->dataRecord['dir']) && stristr($this->dataRecord['dir'],'./')) $app->tform->errorMessage .= $app->tform->lng('dir_slashdot_error').'<br />';
		
      if(isset($this->dataRecord['ssh_rsa'])) $this->dataRecord['ssh_rsa'] = trim($this->dataRecord['ssh_rsa']);
      
      parent::onSubmit();
   }
@@ -132,10 +134,9 @@
       */
      if ($app->tform->errorMessage == ''){
         
         $app->uses('getconf');
         $app->uses('getconf,tools_sites');
         $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 = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
         $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
         
         /* restrict the names */
         $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
@@ -146,7 +147,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"];
@@ -179,10 +180,9 @@
         /*
         * If the names should be restricted -> do it!
         */
         $app->uses('getconf');
         $app->uses('getconf,tools_sites');
         $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 = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
         $shelluser_prefix = $app->tools_sites->replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
         
         /* restrict the names */
         $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
@@ -194,28 +194,6 @@
      
      
   }
	
   function getClientName() {
      global $app, $conf;
	
      if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
         // Get the group-id of the user
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
      } else {
         // Get the group-id from the data itself
         $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);
      $clientName = $tmp['name'];
      if ($clientName == "") $clientName = 'default';
      $clientName = convertClientName($clientName);
		
      return $clientName;
	
   }
	
}

$page = new page_action;