Fixed: FS#1619 - Add apache SNI / SAN support for SSL.

tbrehm

2011-09-26 b31bb1f27f066a2d49f5ab9ee0ca15e985efc788

 interface/web/sites/shell_user_edit.php

@@ -56,17 +56,11 @@
      
      // we will check only users, not admins
      if($_SESSION["s"]["user"]["typ"] == 'user') {
			
         // Get the limits of the client
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
         $client = $app->db->queryOneRecord("SELECT limit_shell_user FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
			
         // Check if the user may add another shell user.
         if($client["limit_shell_user"] >= 0) {
            $tmp = $app->db->queryOneRecord("SELECT count(shell_user_id) as number FROM shell_user WHERE sys_groupid = $client_group_id");
            if($tmp["number"] >= $client["limit_shell_user"]) {
               $app->error($app->tform->wordbook["limit_shell_user_txt"]);
            }
         if(!$app->tform->checkClientLimit('limit_shell_user')) {
            $app->error($app->tform->wordbook["limit_shell_user_txt"]);
         }
         if(!$app->tform->checkResellerLimit('limit_shell_user')) {
            $app->error('Reseller: '.$app->tform->wordbook["limit_shell_user_txt"]);
         }
      }
      
@@ -79,38 +73,28 @@
       * If the names are restricted -> remove the restriction, so that the
       * data can be edited
       */
      if ($interfaceConf['restrict_names'] == true){
         /* get the restriction */
         $restriction = '[CLIENTNAME]_';
         if (isset($interfaceConf['restrict_shelluser'])) $restriction = $interfaceConf['restrict_shelluser'];
         $tmplRestriction = $restriction;
         /* Get the group-id */
         if($_SESSION["s"]["user"]["typ"] != 'admin') {
            // 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);
         $restriction = str_replace('[CLIENTNAME]', $clientName, $restriction);
         if ($this->dataRecord['username'] != ""){
            /* REMOVE the restriction */
            $app->tpl->setVar("username", str_replace($restriction , '', $this->dataRecord['username']));
            $app->tpl->setVar("username", str_replace($restriction , '', $this->dataRecord['username']));
         }
         if($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
            $app->tpl->setVar("username_prefix", $tmplRestriction);
         }
         else {
            $app->tpl->setVar("username_prefix", $restriction);
         }
		
      $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 = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
		
      if ($this->dataRecord['username'] != ""){
         /* REMOVE the restriction */
         $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']);
      } 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();
@@ -125,52 +109,36 @@
      // 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 />';
		
      parent::onSubmit();
   }
   
   function onBeforeInsert() {
      global $app, $conf, $interfaceConf;

      $error = false;
      // check if the username is not blacklisted
      $blacklist = file(ISPC_LIB_PATH.'/shelluser_blacklist');
      foreach($blacklist as $line) {
         if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))){
            $app->tform->errorMessage .= 'The username is not allowed.';
            $error = true;
         }
      }
      unset($blacklist);

		
      /*
       * If the names should be restricted -> do it!
       */
      if ($error == false){
         if ($interfaceConf['restrict_names'] == true){
            /* get the restriction */
            $restriction = '[CLIENTNAME]_';
            if (isset($interfaceConf['restrict_shelluser'])) $restriction = $interfaceConf['restrict_shelluser'];

            /* Get the group-id */
            if($_SESSION["s"]["user"]["typ"] != 'admin') {
               // 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);
            $restriction = str_replace('[CLIENTNAME]', $clientName, $restriction);

            /* restrict the names */
            $this->dataRecord['username'] = $restriction . $this->dataRecord['username'];
         }
      if ($app->tform->errorMessage == ''){
			
         $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 = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
			
         /* restrict the names */
         $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
      }
      parent::onBeforeInsert();
   }
@@ -195,13 +163,11 @@
   function onBeforeUpdate() {
      global $app, $conf, $interfaceConf;
      
      $error = false;
      // check if the username is not blacklisted
      $blacklist = file(ISPC_LIB_PATH.'/shelluser_blacklist');
      foreach($blacklist as $line) {
         if(strtolower(trim($line)) == strtolower(trim($this->dataRecord['username']))){
            $app->tform->errorMessage .= 'The username is not allowed.';
            $error = true;
         }
      }
      unset($blacklist);
@@ -209,34 +175,17 @@
      /*
       * If the names should be restricted -> do it!
       */
      if ($error == false){
      if ($app->tform->errorMessage == '') {
         /*
         * If the names should be restricted -> do it!
         */
         if ($interfaceConf['restrict_names'] == true){
            /* get the restriction */
            $restriction = '[CLIENTNAME]_';
            if (isset($interfaceConf['restrict_dbname'])) $restriction = $interfaceConf['restrict_dbname'];

            /* Get the group-id */
            if($_SESSION["s"]["user"]["typ"] != 'admin') {
               // 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);
            $restriction = str_replace('[CLIENTNAME]', $clientName, $restriction);
            /* restrict the names */
            $this->dataRecord['username'] = $restriction . $this->dataRecord['username'];
         }
         $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 = replacePrefix($global_config['shelluser_prefix'], $this->dataRecord);
			
         /* restrict the names */
         $this->dataRecord['username'] = $shelluser_prefix . $this->dataRecord['username'];
      }
   }
   
@@ -246,6 +195,27 @@
      
   }
   
   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;