Bugfix: removed some columns from being sortable

mcramer

2012-10-09 a84ff46ff8c731a321ae87bea0e05d3fef3aceae

 interface/web/admin/system_config_edit.php

@@ -77,6 +77,25 @@
      $app->tpl->setVar($record);
   }
   
    function onSubmit() {
        global $app;
        
        $app->uses('ini_parser,getconf');
		
        $section = $app->tform->getCurrentTab();
		
      $server_config_array = $app->getconf->get_global_config();
      $new_config = $app->tform->encode($this->dataRecord,$section);
        if($section == 'mail') {
            if($new_config['smtp_pass'] == '') $new_config['smtp_pass'] = $server_config_array['smtp_pass'];
            if($new_config['smtp_enabled'] == 'y' && ($new_config['admin_mail'] == '' || $new_config['admin_name'] == '')) {
                $app->tform->errorMessage .= $app->tform->lng("smtp_missing_admin_mail_txt");
            }
        }
        
        parent::onSubmit();
    }
    
   function onUpdateSave($sql) {
      global $app,$conf;
      
@@ -85,15 +104,16 @@
      
      $section = $app->tform->getCurrentTab();
      
        
      $server_config_array = $app->getconf->get_global_config();
      $new_config = $app->tform->encode($this->dataRecord,$section);
        if($section == 'sites' && $new_config['vhost_subdomains'] != $server_config_array['vhost_subdomains']) {
            // check for existing subdomains
            $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'subdomain' OR `type` = 'vhostsubdomain'");
        if($section == 'sites' && $new_config['vhost_subdomains'] != 'y' && $server_config_array['vhost_subdomains'] == 'y') {
            // check for existing vhost subdomains, if found the mode cannot be disabled
            $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `type` = 'vhostsubdomain'");
            if($check['cnt'] > 0) {
                $new_config['vhost_subdomains'] = $server_config_array['vhost_subdomains'];
                $new_config['vhost_subdomains'] = 'y';
            }
        } elseif($section == 'mail') {
            if($new_config['smtp_pass'] == '') $new_config['smtp_pass'] = $server_config_array['smtp_pass'];
        }
        $server_config_array[$section] = $new_config;
      $server_config_str = $app->ini_parser->get_ini_string($server_config_array);
@@ -114,7 +134,7 @@
         $app->db->query($sql);
         $sql = "REPLACE INTO domain (sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, domain ) " .
            "SELECT sys_userid, sys_groupid, sys_perm_user, sys_perm_group, sys_perm_other, domain " .
            "FROM web_domain";
            "FROM web_domain WHERE type NOT IN ('subdomain','vhostsubdomain')";
         $app->db->query($sql);
      }