Layout fix: tab toggle and monitor tables

Marius Cramer

2015-01-08 89e4329a8068e3631d3f64f6896fa3907c687cf5

 interface/web/sites/web_vhost_domain_edit.php

@@ -113,12 +113,20 @@
         $client_group_id = $_SESSION["s"]["user"]["default_group"];
         $client = $app->db->queryOneRecord("SELECT client.web_servers FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
         $web_servers = explode(',', $client['web_servers']);
         $app->tpl->setVar("server_id_value", $web_servers[0]);
         $server_id = $web_servers[0];
         $app->tpl->setVar("server_id_value", $server_id);
         unset($web_servers);
      } else {
         $settings = $app->getconf->get_global_config('sites');
         $app->tform->formDef['tabs']['domain']['fields']['server_id']['default'] = intval($settings['default_webserver']);
         $server_id = intval($settings['default_webserver']);
         $app->tform->formDef['tabs']['domain']['fields']['server_id']['default'] = $server_id;
      }
      if(!$server_id){
         $default_web_server = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = ? ORDER BY server_id LIMIT 0,1", 1);
         $server_id = $default_web_server['server_id'];
      }
      $web_config = $app->getconf->get_server_config($server_id, 'web');
      $app->tform->formDef['tabs']['domain']['fields']['php']['default'] = $web_config['php_handler'];
      $app->tform->formDef['tabs']['domain']['readonly'] = false;

      $app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type);
@@ -129,6 +137,7 @@
      global $app, $conf;

      $app->uses('ini_parser,getconf');
      $settings = $app->getconf->get_global_config('domains');

      $read_limits = array('limit_cgi', 'limit_ssi', 'limit_perl', 'limit_ruby', 'limit_python', 'force_suexec', 'limit_hterror', 'limit_wildcard', 'limit_ssl');

@@ -182,7 +191,7 @@
         if($app->functions->intval($this->dataRecord["server_id"]) > 0) {
            // check if server is in client's servers or add it.
            $chk_sid = explode(',', $client['web_servers']);
            if(in_array($this->dataRecord["server_id"], $client['web_servers']) == false) {
            if(in_array($this->dataRecord["server_id"], explode(',', $client['web_servers'])) == false) {
               if($client['web_servers'] != '') $client['web_servers'] .= ',';
               $client['web_servers'] .= $app->functions->intval($this->dataRecord["server_id"]);
            }
@@ -293,22 +302,24 @@
         $app->tpl->setVar("server_id", $options_web_servers);
         unset($options_web_servers);

         // Fill the client select field
         $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY client.company_name, client.contact_name, sys_group.name";
         $records = $app->db->queryAllRecords($sql);
         $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$app->functions->intval($client['client_id']));
         $client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
         //$tmp_data_record = $app->tform->getDataRecord($this->id);
         if(is_array($records)) {
            $selected_client_group_id = 0; // needed to get list of PHP versions
            foreach( $records as $rec) {
               if(is_array($this->dataRecord) && ($rec["groupid"] == $this->dataRecord['client_group_id'] || $rec["groupid"] == $this->dataRecord['sys_groupid']) && !$selected_client_group_id) $selected_client_group_id = $rec["groupid"];
               $selected = @(is_array($this->dataRecord) && ($rec["groupid"] == $this->dataRecord['client_group_id'] || $rec["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
               if($selected == 'SELECTED') $selected_client_group_id = $rec["groupid"];
               $client_select .= "<option value='$rec[groupid]' $selected>$rec[contactname]</option>\r\n";
         if ($settings['use_domain_module'] != 'y') {
            // Fill the client select field
            $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id']." ORDER BY client.company_name, client.contact_name, sys_group.name";
            $records = $app->db->queryAllRecords($sql);
            $tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$app->functions->intval($client['client_id']));
            $client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
            //$tmp_data_record = $app->tform->getDataRecord($this->id);
            if(is_array($records)) {
               $selected_client_group_id = 0; // needed to get list of PHP versions
               foreach( $records as $rec) {
                  if(is_array($this->dataRecord) && ($rec["groupid"] == $this->dataRecord['client_group_id'] || $rec["groupid"] == $this->dataRecord['sys_groupid']) && !$selected_client_group_id) $selected_client_group_id = $rec["groupid"];
                  $selected = @(is_array($this->dataRecord) && ($rec["groupid"] == $this->dataRecord['client_group_id'] || $rec["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
                  if($selected == 'SELECTED') $selected_client_group_id = $rec["groupid"];
                  $client_select .= "<option value='$rec[groupid]' $selected>$rec[contactname]</option>\r\n";
               }
            }
            $app->tpl->setVar("client_group_id", $client_select);
         }
         $app->tpl->setVar("client_group_id", $client_select);

         if($app->functions->intval($this->dataRecord["server_id"]) > 0) {
            // check if server is in client's servers or add it.
@@ -451,9 +462,13 @@
               }
               $server_id = intval(@$this->dataRecord["server_id"]);
            } else {
               // Get the first server ID
               $tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
               $server_id = intval($tmp['server_id']);
               $settings = $app->getconf->get_global_config('sites');
               $server_id = intval($settings['default_webserver']);
               if (!$server_id) {
                  // Get the first server ID
                  $tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1");
                  $server_id = intval($tmp['server_id']);
               }
            }

            //* get global web config
@@ -493,22 +508,24 @@
         unset($tmp);
         unset($ips);

         // Fill the client select field
         $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
         $clients = $app->db->queryAllRecords($sql);
         $client_select = "<option value='0'></option>";
         //$tmp_data_record = $app->tform->getDataRecord($this->id);
         if(is_array($clients)) {
            $selected_client_group_id = 0; // needed to get list of PHP versions
            foreach($clients as $client) {
               if(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']) && !$selected_client_group_id) $selected_client_group_id = $client["groupid"];
               //$selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
               $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
               if($selected == 'SELECTED') $selected_client_group_id = $client["groupid"];
               $client_select .= "<option value='$client[groupid]' $selected>$client[contactname]</option>\r\n";
         if ($settings['use_domain_module'] != 'y') {
            // Fill the client select field
            $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY client.company_name, client.contact_name, sys_group.name";
            $clients = $app->db->queryAllRecords($sql);
            $client_select = "<option value='0'></option>";
            //$tmp_data_record = $app->tform->getDataRecord($this->id);
            if(is_array($clients)) {
               $selected_client_group_id = 0; // needed to get list of PHP versions
               foreach($clients as $client) {
                  if(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']) && !$selected_client_group_id) $selected_client_group_id = $client["groupid"];
                  //$selected = @($client["groupid"] == $tmp_data_record["sys_groupid"])?'SELECTED':'';
                  $selected = @(is_array($this->dataRecord) && ($client["groupid"] == $this->dataRecord['client_group_id'] || $client["groupid"] == $this->dataRecord['sys_groupid']))?'SELECTED':'';
                  if($selected == 'SELECTED') $selected_client_group_id = $client["groupid"];
                  $client_select .= "<option value='$client[groupid]' $selected>$client[contactname]</option>\r\n";
               }
            }
            $app->tpl->setVar("client_group_id", $client_select);
         }
         $app->tpl->setVar("client_group_id", $client_select);

         //PHP Version Selection (FastCGI)
         $server_type = 'apache';
@@ -596,8 +613,15 @@
      }

      $ssl_domain_select = '';
      $tmp = $app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ".$this->id);
      $ssl_domains = array($tmp["domain"], 'www.'.$tmp["domain"], '*.'.$tmp["domain"]);
      $ssl_domains = array();
      $tmpd = $app->db->queryAllRecords("SELECT domain, type FROM web_domain WHERE domain_id = ".$this->id." OR parent_domain_id = ".$this->id);
      foreach($tmpd as $tmp) {
         if($tmp['type'] == 'subdomain' || $tmp['type'] == 'vhostsubdomain') {
            $ssl_domains[] = $tmp["domain"];
         } else {
            $ssl_domains = array_merge($ssl_domains, array($tmp["domain"],'www.'.$tmp["domain"],'*.'.$tmp["domain"]));
         }
      }
      if(is_array($ssl_domains)) {
         foreach( $ssl_domains as $ssl_domain) {
            $selected = ($ssl_domain == $this->dataRecord['ssl_domain'])?'SELECTED':'';
@@ -628,8 +652,6 @@
       * Now we have to check, if we should use the domain-module to select the domain
       * or not
       */
      $app->uses('ini_parser,getconf');
      $settings = $app->getconf->get_global_config('domains');
      if ($settings['use_domain_module'] == 'y') {
         /*
          * The domain-module is in use.
@@ -676,6 +698,8 @@
      }
      
      $app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type);

      $app->tpl->setVar('is_spdy_enabled', ($web_config['enable_spdy'] === 'y'));

      parent::onShowEnd();
   }
@@ -739,6 +763,10 @@
               // invalid domain selected
               $app->tform->errorMessage .= $app->tform->lng("domain_error_empty")."<br />";
            } else {
               if ($this->_vhostdomain_type == 'domain' &&
                     ($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid']))) {
                  $this->dataRecord['client_group_id'] = $app->tools_sites->getClientIdForDomain($this->dataRecord['domain']);
               }
               if($this->_vhostdomain_type == 'subdomain') $this->dataRecord['domain'] = $this->dataRecord['domain'] . '.' . $domain_check;
               else $this->dataRecord['domain'] = $domain_check;
            }
@@ -874,9 +902,11 @@
         // When the record is updated
         if($this->id > 0) {
            // restore the server ID if the user is not admin and record is edited
            $tmp = $app->db->queryOneRecord("SELECT server_id, `web_folder`, `cgi`, `ssi`, `perl`, `ruby`, `python`, `suexec`, `errordocs`, `subdomain`, `ssl` FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
            $tmp = $app->db->queryOneRecord("SELECT server_id, `system_user`, `system_group`, `web_folder`, `cgi`, `ssi`, `perl`, `ruby`, `python`, `suexec`, `errordocs`, `subdomain`, `ssl` FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
            $this->dataRecord["server_id"] = $tmp["server_id"];
            $this->dataRecord['web_folder'] = $tmp['web_folder']; // cannot be changed!
            $this->dataRecord['system_user'] = $tmp['system_user'];
            $this->dataRecord['system_group'] = $tmp['system_group'];

            // set the settings to current if not provided (or cleared due to limits)
            if($this->dataRecord['cgi'] == 'n') $this->dataRecord['cgi'] = $tmp['cgi'];
@@ -1040,6 +1070,10 @@
         }
      }

      if($web_config['enable_spdy'] === 'n') {
         unset($app->tform->formDef["tabs"]['ssl']['fields']['enable_spdy']);
      }

      parent::onSubmit();
   }