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"]);
         }
      }
      
@@ -82,11 +76,12 @@
      
      $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 */
         $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']);
@@ -96,9 +91,10 @@
      
      if($this->id > 0) {
         //* we are editing a existing record
         $app->tpl->setVar("parent_domain_id_disabled", 'disabled="disabled"');
         $app->tpl->setVar("edit_disabled", 1);
         $app->tpl->setVar("parent_domain_id_value", $this->dataRecord["parent_domain_id"]);
      } else {
         $app->tpl->setVar("parent_domain_id_disabled", '');
         $app->tpl->setVar("edit_disabled", 0);
      }

      parent::onShowEnd();
@@ -112,6 +108,9 @@
      
      // 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();
   }
@@ -127,7 +126,7 @@
         }
      }
      unset($blacklist);

		
      /*
       * If the names should be restricted -> do it!
       */
@@ -135,8 +134,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'];
      }
@@ -181,7 +181,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'];
@@ -197,7 +198,7 @@
   function getClientName() {
      global $app, $conf;
   
      if($_SESSION["s"]["user"]["typ"] != 'admin') {
      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 {