- WebDAV Users: show only domains that run on Apache (because nginx does no...

ftimme

2011-10-11 81d79a79e4b29e9314b64b2e4c49b48ae8319767

 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"]);
         }
      }
      
@@ -87,7 +81,7 @@
      
      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']);
@@ -115,6 +109,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();
   }
   
@@ -129,7 +126,7 @@
         }
      }
      unset($blacklist);

		
      /*
       * If the names should be restricted -> do it!
       */
@@ -201,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 {