- Removed "Proxy-Server" and "Firewall-Server" from Server Services.

interface/web/admin/form/server.tform.php

@@ -102,18 +102,6 @@ $form["tabs"]['services'] = array (
 			'default'	=> '0',
 			'value'		=> array(0 => 0,1 => 1)
 		),
-		'proxy_server' => array (
-			'datatype'	=> 'INTEGER',
-			'formtype'	=> 'CHECKBOX',
-			'default'	=> '0',
-			'value'		=> array(0 => 0,1 => 1)
-		),
-		'firewall_server' => array (
-			'datatype'	=> 'INTEGER',
-			'formtype'	=> 'CHECKBOX',
-			'default'	=> '0',
-			'value'		=> array(0 => 0,1 => 1)
-		),
 		'mirror_server_id' => array (
 			'datatype'	=> 'INTEGER',
 			'formtype'	=> 'TEXT',

interface/web/admin/templates/server_edit_services.htm

@@ -45,18 +45,6 @@
 						{tmpl_var name='vserver_server'}
 					</div>
 			</div>
-	  <div class="ctrlHolder">
-                <p class="label">{tmpl_var name='proxy_server_txt'}</p>
-                    <div class="multiField">
-                        {tmpl_var name='proxy_server'}
-                    </div>
-      </div>
-      <div class="ctrlHolder">
-                <p class="label">{tmpl_var name='firewall_server_txt'}</p>
-                    <div class="multiField">
-                        {tmpl_var name='firewall_server'}
-                    </div>
-      </div>
 	  <div class="ctrlHolder">
 		<label for="mirror_server_id">{tmpl_var name='mirror_server_id_txt'}</label>
         <select name="mirror_server_id" id="server_id" class="selectInput">

interface/web/admin/templates/server_list.htm

@@ -15,8 +15,6 @@
             <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_proxy_server" scope="col"><tmpl_var name="proxy_server_txt"></th>
-            <th class="tbl_col_firewall_server" scope="col"><tmpl_var name="firewall_server_txt"></th>
             <th class="tbl_col_buttons" scope="col">&nbsp;</th>
           </tr>
           <tr>
@@ -27,8 +25,6 @@
             <td class="tbl_col_file_server"><select name="search_active">{tmpl_var name='search_file_server'}</select></td>
             <td class="tbl_col_db_server"><select name="search_active">{tmpl_var name='search_db_server'}</select></td>
             <td class="tbl_col_vserver_server"><select name="search_active">{tmpl_var name='search_vserver_server'}</select></td>
-            <td class="tbl_col_proxy_server"><select name="search_active">{tmpl_var name='search_proxy_server'}</select></td>
-            <td class="tbl_col_firewallserver"><select name="search_active">{tmpl_var name='search_firewall_server'}</select></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/server_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
           </tr>
         </thead>
@@ -42,8 +38,6 @@
             <td class="tbl_col_file_server">{tmpl_var name="file_server"}</td>
             <td class="tbl_col_db_server">{tmpl_var name="db_server"}</td>
             <td class="tbl_col_vserver_server">{tmpl_var name="vserver_server"}</td>
-			<td class="tbl_col_proxy_server">{tmpl_var name="proxy_server"}</td>
-            <td class="tbl_col_firewall_server">{tmpl_var name="firewall_server"}</td>
             <td class="tbl_col_buttons">
               <div class="buttons icons16">    
                 <a class="icons16 icoDelete" href="javascript: del_record('admin/server_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
@@ -54,7 +48,7 @@
         </tbody>
         <tfoot>
           <tr>
-            <td class="tbl_footer tbl_paging" colspan="10"><tmpl_var name="paging"></td>
+            <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td>
           </tr>
         </tfoot>
       </table>