xaver
2012-03-03 8145fbd30c55be3ead0648c0ececa3a18644d41c
Sort and limit in ispconfig all templates... additional info howtoforge - http://www.howtoforge.com/forums/showthread.php?p=274790
62 files modified
372 ■■■■ changed files
interface/lib/classes/listform.inc.php 7 ●●●● patch | view | raw | blame | history
interface/lib/classes/listform_actions.inc.php 130 ●●●●● patch | view | raw | blame | history
interface/lib/classes/plugin_listview.inc.php 38 ●●●●● patch | view | raw | blame | history
interface/web/admin/templates/firewall_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/admin/templates/remote_user_list.htm 8 ●●●● patch | view | raw | blame | history
interface/web/admin/templates/server_config_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/admin/templates/server_ip_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/admin/templates/server_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/admin/templates/users_list.htm 8 ●●●● patch | view | raw | blame | history
interface/web/client/list/client_template.list.php 10 ●●●●● patch | view | raw | blame | history
interface/web/client/templates/client_template_list.htm 9 ●●●●● patch | view | raw | blame | history
interface/web/client/templates/clients_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/client/templates/resellers_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/dns/templates/dns_a_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/dns/templates/dns_slave_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/dns/templates/dns_soa_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/dns/templates/dns_template_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/domain/templates/domain_list.htm 4 ●●●● patch | view | raw | blame | history
interface/web/help/templates/support_message_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_alias_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_aliasdomain_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_blacklist_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_content_filter_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_domain_admin_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_domain_catchall_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_domain_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_forward_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_get_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_mailinglist_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_relay_recipient_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_transport_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_user_filter_list.htm 4 ●●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_user_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_user_stats_list.htm 10 ●●●● patch | view | raw | blame | history
interface/web/mail/templates/mail_whitelist_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/spamfilter_blacklist_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/spamfilter_policy_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/spamfilter_users_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/spamfilter_whitelist_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/mail/templates/user_quota_stats_list.htm 6 ●●●● patch | view | raw | blame | history
interface/web/monitor/templates/datalog_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/monitor/templates/syslog_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/cron_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/database_admin_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/database_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/ftp_user_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/shell_user_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/user_quota_stats_list.htm 10 ●●●● patch | view | raw | blame | history
interface/web/sites/templates/web_aliasdomain_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/web_domain_admin_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/web_domain_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/web_folder_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/web_folder_user_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/web_sites_stats_list.htm 10 ●●●● patch | view | raw | blame | history
interface/web/sites/templates/web_subdomain_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/sites/templates/webdav_user_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/themes/default_combobox/css/additional.css 2 ●●●●● patch | view | raw | blame | history
interface/web/themes/default_combobox/templates/main.tpl.htm 22 ●●●●● patch | view | raw | blame | history
interface/web/vm/templates/openvz_ip_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/vm/templates/openvz_ostemplate_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/vm/templates/openvz_template_list.htm 2 ●●● patch | view | raw | blame | history
interface/web/vm/templates/openvz_vm_list.htm 2 ●●● patch | view | raw | blame | history
interface/lib/classes/listform.inc.php
@@ -191,11 +191,16 @@
    public function getPagingSQL($sql_where = '1') 
    {
        global $app, $conf;
        //* Add Global Limit from selectbox
        if(!empty($_POST['search_limit']) AND intval($_POST['search_limit'])){
      $_SESSION['search']['limit'] = $_POST['search_limit'];
    }
        //* Get Config variables
        $list_name          = $this->listDef['name'];
        $search_prefix      = $this->listDef['search_prefix'];
        $records_per_page   = $this->listDef['records_per_page'];
        $records_per_page   = (empty($_SESSION['search']['limit']) ? $this->listDef['records_per_page'] : $_SESSION['search']['limit']) ;
        $table              = $this->listDef['table'];
        //* set PAGE to zero, if in session not set
interface/lib/classes/listform_actions.inc.php
@@ -55,7 +55,34 @@
        
        $app->tpl->newTemplate("listpage.tpl.htm");
        $app->tpl->setInclude('content_tpl','templates/'.$app->listform->listDef["name"].'_list.htm');
        //* Manipulate order by for sorting / Every list has a stored value
        //* Against notice error
        if(!isset($_SESSION['search'][$app->listform->listDef["name"]]['order'])){
          $_SESSION['search'][$app->listform->listDef["name"]]['order'] = '';
        }
        if(!empty($_GET['orderby'])){
          $order = str_replace('tbl_col_','',$_GET['orderby']);
          //* Check the css class submited value
          if (preg_match("/^[a-z\_]{1,}$/",$order)) {
            if($_SESSION['search'][$app->listform->listDef["name"]]['order'] == $order){
              $_SESSION['search'][$app->listform->listDef["name"]]['order'] = $order.' DESC';
            } else {
              $_SESSION['search'][$app->listform->listDef["name"]]['order'] = $order;
            }
          }
        }
        // If a manuel oder by like customers isset the sorting will be infront
        if(!empty($_SESSION['search'][$app->listform->listDef["name"]]['order'])){
          if(empty($this->SQLOrderBy)){
            $this->SQLOrderBy = "ORDER BY ".$_SESSION['search'][$app->listform->listDef["name"]]['order'];
          } else {
            $this->SQLOrderBy = str_replace("ORDER BY ","ORDER BY ".$_SESSION['search'][$app->listform->listDef["name"]]['order'].', ',$this->SQLOrderBy);
          }
        }
        // Getting Datasets from DB
        $records = $app->db->queryAllRecords($this->getQueryString());
@@ -130,7 +157,99 @@
        $limit_sql = $app->listform->getPagingSQL($sql_where);
        $app->tpl->setVar('paging',$app->listform->pagingHTML);
        return 'SELECT * FROM '.$app->listform->listDef['table']." WHERE $sql_where $order_by_sql $limit_sql";
        $extselect = '';
        $join = '';
        if(!empty($_SESSION['search'][$app->listform->listDef["name"]]['order'])){
          $order = str_replace(' DESC','',$_SESSION['search'][$app->listform->listDef["name"]]['order']);
          if($order == 'server_id' && $app->listform->listDef['table'] != 'server'){
            $join .= ' LEFT JOIN server as s ON '.$app->listform->listDef['table'].'.server_id = s.server_id ';
            $order_by_sql = str_replace('server_id','server_name',$order_by_sql);
          } elseif($order == 'client_id' && $app->listform->listDef['table'] != 'client'){
            $join .= ' LEFT JOIN client as c ON '.$app->listform->listDef['table'].'.client_id = c.client_id ';
            $order_by_sql = str_replace('client_id','contact_name',$order_by_sql);
          } elseif($order == 'parent_domain_id'){
            $join .= ' LEFT JOIN web_domain as wd ON '.$app->listform->listDef['table'].'.parent_domain_id = wd.domain_id ';
            $order_by_sql = str_replace('parent_domain_id','wd.domain',$order_by_sql);
            $sql_where = str_replace('type',$app->listform->listDef['table'].'.type',$sql_where);
          } elseif($order == 'sys_groupid'){
            $join .= ' LEFT JOIN sys_group as sg ON '.$app->listform->listDef['table'].'.sys_groupid = sg.groupid ';
            $order_by_sql = str_replace('sys_groupid','name',$order_by_sql);
          } elseif($order == 'rid'){
            $join .= ' LEFT JOIN spamfilter_users as su ON '.$app->listform->listDef['table'].'.rid = su.id ';
            $order_by_sql = str_replace('rid','email',$order_by_sql);
          } elseif($order == 'policy_id'){
            $join .= ' LEFT JOIN spamfilter_policy as sp ON '.$app->listform->listDef['table'].'.policy_id = sp.id ';
            $order_by_sql = str_replace('policy_id','policy_name',$order_by_sql);
          } elseif($order == 'web_folder_id'){
            $join .= ' LEFT JOIN web_folder as wf ON '.$app->listform->listDef['table'].'.web_folder_id = wf.web_folder_id ';
            $order_by_sql = str_replace('web_folder_id','path',$order_by_sql);
          } elseif($order == 'ostemplate_id' && $app->listform->listDef['table'] != 'openvz_ostemplate'){
            $join .= ' LEFT JOIN openvz_ostemplate as oo ON '.$app->listform->listDef['table'].'.ostemplate_id = oo.ostemplate_id ';
            $order_by_sql = str_replace('ostemplate_id','template_name',$order_by_sql);
          } elseif($order == 'template_id' && $app->listform->listDef['table'] != 'openvz_template'){
            $join .= ' LEFT JOIN openvz_template as ot ON '.$app->listform->listDef['table'].'.template_id = ot.template_id ';
            $order_by_sql = str_replace('template_id','template_name',$order_by_sql);
          } elseif($order == 'sender_id' && $app->listform->listDef['table'] != 'sys_user'){
            $join .= ' LEFT JOIN sys_user as su ON '.$app->listform->listDef['table'].'.sender_id = su.userid ';
            $order_by_sql = str_replace('sender_id','username',$order_by_sql);
          } elseif($order == 'web_traffic_last_month'){
            $tmp_year = date('Y',mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
            $tmp_month = date('m',mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
            $extselect .= ', SUM(wt.traffic_bytes) as calctraffic';
            $join .= ' JOIN web_traffic as wt ON '.$app->listform->listDef['table'].'.domain = wt.hostname ';
            $sql_where .= " AND YEAR(wt.traffic_date) = '$tmp_year' AND MONTH(wt.traffic_date) = '$tmp_month'";
            $order_by_sql = str_replace('web_traffic_last_month','calctraffic',$order_by_sql);
            $order_by_sql = "GROUP BY domain ".$order_by_sql;
          } elseif($order == 'web_traffic_this_month'){
            $tmp_year = date('Y');
            $tmp_month = date('m');
            $extselect .= ', SUM(wt.traffic_bytes) as calctraffic';
            $join .= ' JOIN web_traffic as wt ON '.$app->listform->listDef['table'].'.domain = wt.hostname ';
            $sql_where .= " AND YEAR(wt.traffic_date) = '$tmp_year' AND MONTH(wt.traffic_date) = '$tmp_month'";
            $order_by_sql = str_replace('web_traffic_this_month','calctraffic',$order_by_sql);
            $order_by_sql = "GROUP BY domain ".$order_by_sql;
          } elseif($order == 'web_traffic_last_year'){
            $tmp_year = date('Y',mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
            $extselect .= ', SUM(wt.traffic_bytes) as calctraffic';
            $join .= ' JOIN web_traffic as wt ON '.$app->listform->listDef['table'].'.domain = wt.hostname ';
            $sql_where .= " AND YEAR(wt.traffic_date) = '$tmp_year'";
            $order_by_sql = str_replace('web_traffic_last_year','calctraffic',$order_by_sql);
            $order_by_sql = "GROUP BY domain ".$order_by_sql;
          } elseif($order == 'web_traffic_this_year'){
            $tmp_year = date('Y');
            $extselect .= ', SUM(wt.traffic_bytes) as calctraffic';
            $join .= ' JOIN web_traffic as wt ON '.$app->listform->listDef['table'].'.domain = wt.hostname ';
            $sql_where .= " AND YEAR(wt.traffic_date) = '$tmp_year'";
            $order_by_sql = str_replace('web_traffic_this_year','calctraffic',$order_by_sql);
            $order_by_sql = "GROUP BY domain ".$order_by_sql;
          } elseif($order == 'mail_traffic_last_month'){
            $tmp_date = date('Y-m',mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
            $join .= ' JOIN mail_traffic as mt ON '.$app->listform->listDef['table'].'.mailuser_id = mt.mailuser_id ';
            $sql_where .= " AND mt.month like '$tmp_date%'";
            $order_by_sql = str_replace('mail_traffic_last_month','traffic',$order_by_sql);
          } elseif($order == 'mail_traffic_this_month'){
            $tmp_date = date('Y-m');
            $join .= ' JOIN mail_traffic as mt ON '.$app->listform->listDef['table'].'.mailuser_id = mt.mailuser_id ';
            $sql_where .= " AND mt.month like '$tmp_date%'";
            $order_by_sql = str_replace('mail_traffic_this_month','traffic',$order_by_sql);
          } elseif($order == 'mail_traffic_last_year'){
            $tmp_date = date('Y',mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
            $extselect .= ', SUM(mt.traffic) as calctraffic';
            $join .= ' JOIN mail_traffic as mt ON '.$app->listform->listDef['table'].'.mailuser_id = mt.mailuser_id ';
            $sql_where .= " AND mt.month like '$tmp_date%'";;
            $order_by_sql = str_replace('mail_traffic_last_year','calctraffic',$order_by_sql);
            $order_by_sql = "GROUP BY mailuser_id ".$order_by_sql;
          } elseif($order == 'mail_traffic_this_year'){
            $tmp_date = date('Y');
            $extselect .= ', SUM(mt.traffic) as calctraffic';
            $join .= ' JOIN mail_traffic as mt ON '.$app->listform->listDef['table'].'.mailuser_id = mt.mailuser_id ';
            $sql_where .= " AND mt.month like '$tmp_date%'";
            $order_by_sql = str_replace('mail_traffic_this_year','calctraffic',$order_by_sql);
            $order_by_sql = "GROUP BY mailuser_id ".$order_by_sql;
          }
        }
        return 'SELECT '.$app->listform->listDef['table'].'.*'.$extselect.' FROM '.$app->listform->listDef['table']."$join WHERE $sql_where $order_by_sql $limit_sql";
    }
    
    
@@ -145,6 +264,15 @@
        include($lng_file);
        $app->tpl->setVar($wb);
        
        //* Limit each page
        $limits = array('5'=>'5','15'=>'15','25'=>'25','50'=>'50','100'=>'100','999999999' => 'all');
        //* create options and set selected, if default -> 15 is selected
        foreach($limits as $key => $val){
          $options .= '<option value="'.$key.'" '.(isset($_SESSION['search']['limit']) &&  $_SESSION['search']['limit'] == $key ? 'selected="selected"':'' ).(!isset($_SESSION['search']['limit']) && $key == '15' ? 'selected="selected"':'').'>'.$val.'</option>';
        }
        $app->tpl->setVar('search_limit','<select name="search_limit" style="width:50px">'.$options.'</select>');
        $app->tpl->setVar('toolsarea_head_txt',$app->lng('toolsarea_head_txt'));
        $app->tpl->setVar($app->listform->wordbook);
        $app->tpl->setVar('form_action', $app->listform->listDef['file']);
interface/lib/classes/plugin_listview.inc.php
@@ -82,7 +82,43 @@
                if(isset($this->options["sql_order_by"])) {
                    $sql_order_by = $this->options["sql_order_by"];
                }
        //* Limit each page
        $limits = array('5'=>'5','15'=>'15','25'=>'25','50'=>'50','100'=>'100','999999999' => 'all');
        //* create options and set selected, if default -> 15 is selected
        foreach($limits as $key => $val){
          $options .= '<option value="'.$key.'" '.(isset($_SESSION['search']['limit']) &&  $_SESSION['search']['limit'] == $key ? 'selected="selected"':'' ).(!isset($_SESSION['search']['limit']) && $key == '15' ? 'selected="selected"':'').'>'.$val.'</option>';
        }
        $listTpl->setVar('search_limit','<select name="search_limit" style="width:50px">'.$options.'</select>');
        //Sorting
        if(!isset($_SESSION['search'][$app->listform->listDef["name"]]['order'])){
          $_SESSION['search'][$app->listform->listDef["name"]]['order'] = '';
        }
        if(!empty($_GET['orderby'])){
          $order = str_replace('tbl_col_','',$_GET['orderby']);
          //* Check the css class submited value
          if (preg_match("/^[a-z\_]{1,}$/",$order)) {
            if($_SESSION['search'][$app->listform->listDef["name"]]['order'] == $order){
              $_SESSION['search'][$app->listform->listDef["name"]]['order'] = $order.' DESC';
            } else {
              $_SESSION['search'][$app->listform->listDef["name"]]['order'] = $order;
            }
          }
        }
        // If a manuel oder by like customers isset the sorting will be infront
        if(!empty($_SESSION['search'][$app->listform->listDef["name"]]['order'])){
          if(empty($sql_order_by)){
            $sql_order_by = "ORDER BY ".$_SESSION['search'][$app->listform->listDef["name"]]['order'];
          } else {
            $sql_order_by = str_replace("ORDER BY ","ORDER BY ".$_SESSION['search'][$app->listform->listDef["name"]]['order'].', ',$sql_order_by);
          }
        }
                // Loading language field
                $lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$app->listform->listDef['name']."_list.lng";
                include($lng_file);
interface/web/admin/templates/firewall_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_tcp_port" scope="col"><tmpl_var name="tcp_port_txt"></th>
            <th class="tbl_col_udp_port" scope="col"><tmpl_var name="udp_port_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/admin/templates/remote_user_list.htm
@@ -16,12 +16,12 @@
        <thead>
          <tr>
            <th class="tbl_col_remote_userid" scope="col"><tmpl_var name="parent_remote_userid_txt"></th>
            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="tbl_col_remote_username" scope="col"><tmpl_var name="username_txt"></th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_remote_userid"></td>           
         <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
         <td class="tbl_col_remote_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/remote_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
          </tr>
        </thead>
@@ -29,7 +29,7 @@
          <tmpl_loop name="records">
          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
            <td class="tbl_col_remote_userid"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_userid"}</a></td>
            <td class="tbl_col_username"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_username"}</a></td>
            <td class="tbl_col_remote_username"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_username"}</a></td>
            <td class="tbl_col_buttons">
              <div class="buttons icons16">    
                <a class="icons16 icoDelete" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
interface/web/admin/templates/server_config_list.htm
@@ -9,7 +9,7 @@
        <thead>
          <tr>
            <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
interface/web/admin/templates/server_ip_list.htm
@@ -23,7 +23,7 @@
            <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
            <th class="tbl_col_virtualhost" scope="col"><tmpl_var name="virtualhost_txt"></th>
            <th class="tbl_col_virtualhost_port" scope="col"><tmpl_var name="virtualhost_port_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
interface/web/admin/templates/server_list.htm
@@ -15,7 +15,7 @@
            <th class="tbl_col_file_server" scope="col"><tmpl_var name="file_server_txt"></th>
            <th class="tbl_col_db_server" scope="col"><tmpl_var name="db_server_txt"></th>
            <th class="tbl_col_vserver_server" scope="col"><tmpl_var name="vserver_server_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
interface/web/admin/templates/users_list.htm
@@ -20,10 +20,10 @@
        <thead>
          <tr>
            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
            <th class="tbl_col_vorname" scope="col"><tmpl_var name="vorname_txt"></th>
            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
            <th class="tbl_col_ort" scope="col"><tmpl_var name="ort_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col"><tmpl_var name="vorname_txt"></th>
            <th class="" scope="col"><tmpl_var name="name_txt"></th>
            <th class="" scope="col"><tmpl_var name="ort_txt"></th>
            <th scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
interface/web/client/list/client_template.list.php
@@ -45,6 +45,16 @@
* Suchfelder
*****************************************************/
$liste["item"][] = array(    'field'        => "template_id",
                            'datatype'    => "INTEGER",
                            'formtype'    => "TEXT",
                            'op'        => "=",
                            'prefix'    => "",
                            'suffix'    => "",
                            'width'        => "",
                            'value'        => "");
$liste["item"][] = array(    'field'        => "template_type",
                            'datatype'    => "VARCHAR",
                            'formtype'    => "SELECT",
interface/web/client/templates/client_template_list.htm
@@ -18,12 +18,14 @@
      <table class="list">
        <thead>
          <tr>
        <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
            <th class="tbl_col_template_type" scope="col"><tmpl_var name="template_type_txt"></th>
            <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
            <th class="tbl_col_last" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_template_type"><select name="search_template_type">{tmpl_var name='search_template_type'}</select></td>
        <td class="tbl_col_template_id"><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" style="width:30px;" /></td>
        <td class="tbl_col_template_type"><select name="search_template_type">{tmpl_var name='search_template_type'}</select></td>
            <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
          </tr>
@@ -31,6 +33,7 @@
        <tbody>
          <tmpl_loop name="records">
          <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
        <td class="tbl_col_template_id"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_id"}</a></td>
            <td class="tbl_col_template_type"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_type"}</a></td>
            <td class="tbl_col_template_name"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
            <td class="tbl_col_buttons">
@@ -43,7 +46,7 @@
        </tbody>
        <tfoot>
          <tr>
            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
            <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
          </tr>
        </tfoot>
      </table>
interface/web/client/templates/clients_list.htm
@@ -24,7 +24,7 @@
            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
            <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
            <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
            <th class="tbl_col_country" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
interface/web/client/templates/resellers_list.htm
@@ -23,7 +23,7 @@
            <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
            <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
            <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
            <th class="tbl_col_country" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
interface/web/dns/templates/dns_a_list.htm
@@ -48,7 +48,7 @@
            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
            <th class="tbl_col_data" scope="col"><tmpl_var name="data_txt"></th>
            <th class="tbl_col_aux" scope="col"><tmpl_var name="aux_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/dns/templates/dns_slave_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
            <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/dns/templates/dns_soa_list.htm
@@ -29,7 +29,7 @@
            <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
            <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
            <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/dns/templates/dns_template_list.htm
@@ -20,7 +20,7 @@
          <tr>
            <th class="tbl_col_visible" scope="col"><tmpl_var name="visible_txt"></th>
            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_visible"><select name="search_visible">{tmpl_var name='search_visible'}</select></td>
interface/web/domain/templates/domain_list.htm
@@ -25,8 +25,8 @@
        <thead>
          <tr>
            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
            <th class="tbl_col_domain" scope="col"><tmpl_var name="user_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="user_txt">A</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
interface/web/help/templates/support_message_list.htm
@@ -20,7 +20,7 @@
          <tr>
            <th class="tbl_col_sender_id" scope="col"><tmpl_var name="sender_id_txt"></th>
            <th class="tbl_col_subject" scope="col"><tmpl_var name="subject_txt"></th>
            <th class="tbl_col_subject" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_sender_id"><select name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td>
interface/web/mail/templates/mail_alias_list.htm
@@ -21,7 +21,7 @@
            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/mail_aliasdomain_list.htm
@@ -21,7 +21,7 @@
            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/mail_blacklist_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
            <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/mail_content_filter_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_pattern" scope="col"><tmpl_var name="pattern_txt"></th>
            <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/mail_domain_admin_list.htm
@@ -21,7 +21,7 @@
            <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/mail_domain_catchall_list.htm
@@ -21,7 +21,7 @@
            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/mail_domain_list.htm
@@ -21,7 +21,7 @@
            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/mail_forward_list.htm
@@ -21,7 +21,7 @@
            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/mail_get_list.htm
@@ -23,7 +23,7 @@
            <th class="tbl_col_source_server" scope="col"><tmpl_var name="source_server_txt"></th>
            <th class="tbl_col_source_username" scope="col"><tmpl_var name="source_username_txt"></th>
            <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/mail_mailinglist_list.htm
@@ -19,7 +19,7 @@
          <tr>
            <th class="tbl_col_listname" scope="col"><tmpl_var name="listname_txt"></th>
            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_listname"><input type="text" name="search_listname" value="{tmpl_var name='search_listname'}" /></td>
interface/web/mail/templates/mail_relay_recipient_list.htm
@@ -20,7 +20,7 @@
            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/mail_transport_list.htm
@@ -23,7 +23,7 @@
            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
            <th class="tbl_col_transport" scope="col"><tmpl_var name="transport_txt"></th>
            <th class="tbl_col_sort_order" scope="col"><tmpl_var name="sort_order_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/mail_user_filter_list.htm
@@ -15,11 +15,11 @@
        <thead>
          <tr>
            <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('filter_records','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
          </tr>
        </thead>
        <tbody>
interface/web/mail/templates/mail_user_list.htm
@@ -22,7 +22,7 @@
      <tmpl_if name="enable_custom_login"><th class="tbl_col_login" scope="col"><tmpl_var name="login_txt"></th></tmpl_if>
      <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
            <th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
interface/web/mail/templates/mail_user_stats_list.htm
@@ -9,11 +9,11 @@
        <thead>
          <tr>
            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
            <th class="tbl_col_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
            <th class="tbl_col_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
            <th class="tbl_col_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
            <th class="tbl_col_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="tbl_col_mail_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
            <th class="tbl_col_mail_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
            <th class="tbl_col_mail_traffic_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
            <th class="tbl_col_mail_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
interface/web/mail/templates/mail_whitelist_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
            <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/spamfilter_blacklist_list.htm
@@ -23,7 +23,7 @@
            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
            <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/spamfilter_policy_list.htm
@@ -23,7 +23,7 @@
            <th class="tbl_col_spam_lover" scope="col"><tmpl_var name="spam_lover_txt"></th>
            <th class="tbl_col_banned_files_lover" scope="col"><tmpl_var name="banned_files_lover_txt"></th>
            <th class="tbl_col_bad_header_lover" scope="col"><tmpl_var name="bad_header_lover_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_policy_name"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td>
interface/web/mail/templates/spamfilter_users_list.htm
@@ -23,7 +23,7 @@
            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
            <th class="tbl_col_policy_id" scope="col"><tmpl_var name="policy_id_txt"></th>
            <th class="tbl_col_fullname" scope="col"><tmpl_var name="fullname_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_local"><select name="search_local">{tmpl_var name='search_local'}</select></td>
interface/web/mail/templates/spamfilter_whitelist_list.htm
@@ -23,7 +23,7 @@
            <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
            <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/mail/templates/user_quota_stats_list.htm
@@ -9,9 +9,9 @@
          <tr>
            <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
            <th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
            <th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="quota_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
        <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
        <th class="" scope="col" style="text-align:right;"><tmpl_var name="quota_txt"></th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_domain"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
interface/web/monitor/templates/datalog_list.htm
@@ -12,7 +12,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
            <th class="tbl_col_dbtable" scope="col"><tmpl_var name="dbtable_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_tstamp">&nbsp;</td>
interface/web/monitor/templates/syslog_list.htm
@@ -12,7 +12,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_loglevel" scope="col"><tmpl_var name="loglevel_txt"></th>
            <th class="tbl_col_message" scope="col"><tmpl_var name="message_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_tstamp">&nbsp;</td>
interface/web/sites/templates/cron_list.htm
@@ -27,7 +27,7 @@
            <th class="tbl_col_run_month" scope="col"><tmpl_var name="run_month_txt"></th>
            <th class="tbl_col_run_wday" scope="col"><tmpl_var name="run_wday_txt"></th>
            <th class="tbl_col_command" scope="col"><tmpl_var name="command_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/sites/templates/database_admin_list.htm
@@ -23,7 +23,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
            <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/sites/templates/database_list.htm
@@ -23,7 +23,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_user_txt"></th>
            <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/sites/templates/ftp_user_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/sites/templates/shell_user_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/sites/templates/user_quota_stats_list.htm
@@ -9,11 +9,11 @@
          <tr>
            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
            <th class="tbl_col_system_user" scope="col"><tmpl_var name="system_user_txt"></th>
            <th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
            <th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="soft_txt"></th>
            <th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="hard_txt"></th>
            <th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="files_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
        <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
        <th class="" scope="col" style="text-align:right;"><tmpl_var name="soft_txt"></th>
        <th class="" scope="col" style="text-align:right;"><tmpl_var name="hard_txt"></th>
        <th class="" scope="col" style="text-align:right;"><tmpl_var name="files_txt"></th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
interface/web/sites/templates/web_aliasdomain_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/sites/templates/web_domain_admin_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_domain_id"><input type="text" name="search_domain_id" size="4" value="{tmpl_var name='search_domain_id'}" /></td>
interface/web/sites/templates/web_domain_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td>
interface/web/sites/templates/web_folder_list.htm
@@ -21,7 +21,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
            <th class="tbl_col_path" scope="col"><tmpl_var name="path_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_active'}</select></td>
interface/web/sites/templates/web_folder_user_list.htm
@@ -20,7 +20,7 @@
            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
            <th class="tbl_col_web_folder_id" scope="col"><tmpl_var name="web_folder_id_txt"></th>
            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_active'}</select></td>
interface/web/sites/templates/web_sites_stats_list.htm
@@ -9,11 +9,11 @@
        <thead>
          <tr>
            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
            <th class="tbl_col_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
            <th class="tbl_col_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
            <th class="tbl_col_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
            <th class="tbl_col_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="tbl_col_web_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
            <th class="tbl_col_web_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
            <th class="tbl_col_web_traffic_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
            <th class="tbl_col_web_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
interface/web/sites/templates/web_subdomain_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
            <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/sites/templates/webdav_user_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/themes/default_combobox/css/additional.css
@@ -151,3 +151,5 @@
/* workarounds */
button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
.pnl_listarea th{cursor:pointer}
.pnl_listarea th:hover{background-position:0 -15px!important}
interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -100,6 +100,28 @@
            }
        });
        (function( $ ){
          $(".pnl_listarea th").live("click",  function(){
            if($(this).attr('class').length > 0 && $("#Filter").length > 0){
              eval($("#Filter").attr("onclick").replace(".php');",".php?orderby="+$(this).attr('class')+"');"));
              var element = $(this).attr('class');
              $("#pageForm").ajaxComplete(function() {
              if($("th."+element).css("background-position") == '0px -15px'){
                if($("th."+element).css("text-align") == "right"){
                  $("th."+element).css("text-align","left");
                } else {
                  $("th."+element).css("text-align","right");
                }
              } else {
                $(".pnl_listarea th").css("text-align","");
              }
              $(".pnl_listarea th").css("background-position","0 0");
              $("th."+element).css("background-position","0 -15px");
              });
            }
        });
        })( jQuery );
        (function( $ ) {
        $.widget( "ui.combobox", {
            _create: function() {
interface/web/vm/templates/openvz_ip_list.htm
@@ -21,7 +21,7 @@
            <th class="tbl_col_vm_id" scope="col"><tmpl_var name="vm_id_txt"></th>
            <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
            <th class="tbl_col_reserved" scope="col"><tmpl_var name="reserved_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
interface/web/vm/templates/openvz_ostemplate_list.htm
@@ -22,7 +22,7 @@
            <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
            <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
            <th class="tbl_col_allservers" scope="col"><tmpl_var name="allservers_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/vm/templates/openvz_template_list.htm
@@ -19,7 +19,7 @@
          <tr>
            <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
            <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
interface/web/vm/templates/openvz_vm_list.htm
@@ -24,7 +24,7 @@
            <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
            <th class="tbl_col_hostname" scope="col"><tmpl_var name="hostname_txt"></th>
            <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
          </tr>
          <tr>
            <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>