Changeset 165

Timestamp:

06/28/11 12:55:21 (12 years ago)

Author:

merek

Message:

Revert all changes since r152 - please use samerajarmeh branch insted an merg all changes into trunk as some changes in branch are not on the newest csp source and could break some core functions

Location:

trunk

Files:

• CardServProxy.ipr (modified) (8 diffs)
• config/proxy-reference.html (modified) (4 diffs)
• src/com/bowman/cardserv/ProxyConfig.java (modified) (3 diffs)
• src/com/bowman/cardserv/SimpleUserManager.java (modified) (6 diffs)
• src/com/bowman/cardserv/interfaces/CamdConstants.java (modified) (1 diff)
• src/com/bowman/cardserv/interfaces/UserManager.java (modified) (2 diffs)
• src/com/bowman/cardserv/proxy.xml (modified) (2 diffs)
• src/com/bowman/cardserv/rmi/RemoteHandler.java (modified) (2 diffs)
• src/com/bowman/cardserv/rmi/UserStatus.java (modified) (2 diffs)
• src/com/bowman/cardserv/session/AbstractSession.java (modified) (1 diff)
• src/com/bowman/cardserv/session/CspSession.java (modified) (1 diff)
• src/com/bowman/cardserv/session/ExtNewcamdSession.java (modified) (1 diff)
• src/com/bowman/cardserv/session/NewcamdSession.java (modified) (9 diffs)
• src/com/bowman/cardserv/web/XmlHelper.java (modified) (1 diff)
• web/xslt/cws-status-resp.xsl (modified) (3 diffs)

trunk/CardServProxy.ipr

@@ -11 +11 @@
       <properties />
     </buildFile>
+    <buildFile url="file://$PROJECT_DIR$/build.local.xml">
+      <additionalClassPath />
+      <antReference projectDefault="true" />
+      <customJdkName value="" />
+      <maximumHeapSize value="128" />
+      <maximumStackSize value="32" />
+      <properties />
+    </buildFile>
   </component>
   <component name="BuildJarProjectSettings">
@@ -30 +38 @@
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
@@ -40 +47 @@
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
         <ADDITIONAL_INDENT_OPTIONS fileType="xml">
@@ -50 +56 @@
           <option name="LABEL_INDENT_SIZE" value="0" />
           <option name="LABEL_INDENT_ABSOLUTE" value="false" />
-          <option name="USE_RELATIVE_INDENTS" value="false" />
         </ADDITIONAL_INDENT_OPTIONS>
       </value>
@@ -154 +159 @@
           <option name="PARAMETER" value="true" />
           <option name="REPORT_PARAMETER_FOR_PUBLIC_METHODS" value="true" />
+          <option name="INJECTION_ANNOS">
+            <value>
+              <list size="0" />
+            </value>
+          </option>
         </inspection_tool>
         <inspection_tool class="UnterminatedStatementJS" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -161 +171 @@
           <option name="ADD_SERVLET_TO_ENTRIES" value="true" />
           <option name="ADD_NONJAVA_TO_ENTRIES" value="true" />
+          <option name="ADDITIONAL_ANNOTATIONS">
+            <value>
+              <list size="1">
+                <item index="0" class="java.lang.String" itemvalue="javax.ws.rs.*" />
+              </list>
+            </value>
+          </option>
+          <option name="ADD_EJB_TO_ENTRIES" value="true" />
+          <option name="ADD_TESTNG_TO_ENTRIES" value="true" />
+          <option name="ADD_JUNIT_TO_ENTRIES" value="true" />
         </inspection_tool>
       </profile>
@@ -167 +187 @@
     <option name="USE_PROJECT_PROFILE" value="true" />
     <version value="1.0" />
-    <list size="6">
+    <list size="5">
       <item index="0" class="java.lang.String" itemvalue="SERVER PROBLEM" />
-      <item index="1" class="java.lang.String" itemvalue="WEAK WARNING" />
-      <item index="2" class="java.lang.String" itemvalue="INFO" />
-      <item index="3" class="java.lang.String" itemvalue="TYPO" />
-      <item index="4" class="java.lang.String" itemvalue="WARNING" />
-      <item index="5" class="java.lang.String" itemvalue="ERROR" />
+      <item index="1" class="java.lang.String" itemvalue="INFO" />
+      <item index="2" class="java.lang.String" itemvalue="TYPO" />
+      <item index="3" class="java.lang.String" itemvalue="WARNING" />
+      <item index="4" class="java.lang.String" itemvalue="ERROR" />
     </list>
   </component>
@@ -331 +350 @@
     </modules>
   </component>
-  <component name="ProjectResources">
-    <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_4" assert-keyword="true" jdk-15="false" project-jdk-name="1.6" project-jdk-type="JavaSDK" />
   <component name="ResourceManagerContainer">

trunk/config/proxy-reference.html

@@ -51 +51 @@
 <ul>
 <li><a href="#cardserv-proxy">/cardserv-proxy (attributes: *ver)</a></li>
-<br />
-<li><a href="#msg-enabled">msg-enabled</a></li>
-<li><a href="#msg-emu">msg-emu</a></li>
-<li><a href="#msg-words">msg-words</a></li>
-<br />
 <li><a href="#ca-profiles">ca-profiles</a></li>
 <ul>
@@ -260 +255 @@
 </a>
 
-<a name="msg-enabled">
-<div class='indent'><strong>msg-enabled</strong></div><br />
-** please complete documentation ** <br />
-<br />
-Example: <em class='italic'>&lt;msg-enabled>true&lt;/msg-enabled></em><br />
-<br />
-</a>
-
-<a name="msg-emu">
-<div class='indent'><strong>msg-emu</strong></div><br />
-** please complete documentation ** <br />
-<br />
-Example: <em class='italic'>&lt;msg-emu>Mgcamd Acamd Evocamd&lt;/msg-emu></em><br />
-<br />
-</a>
-
-<a name="msg-words">
-<div class='indent'><strong>msg-words</strong></div><br />
-** please complete documentation ** <br />
-<br />
-Example: <em class='italic'>&lt;msg-words>Welcome to CardServProxy&lt;/msg-words></em><br />
-<br />
-</a>
-
 <a name="ca-profiles">
 <div class='indent'>ca-profiles</div><br />
@@ -822 +793 @@
 
 <a name="user-manager/auth-config/user">
-<div class='indent'><strong>user-manager/auth-config/user (attributes: *name, *password, display-name, ip-mask, profiles, max-connections, admin, enabled, start-date, expire-date, spider, ecm-rate)</strong></div><br />
+<div class='indent'><strong>user-manager/auth-config/user (attributes: *name, *password, display-name, ip-mask, profiles, max-connections, admin, enabled)</strong></div><br />
 One user definition for the SimpleUserManager (also used by the XmlUserManager, see <strong>README.XmlUserManager.txt</strong> for more details):<br /><br />
 - <strong class='bold'>name</strong>: User name, avoid long names, spaces and special characters. There are no particular limitations as far as the proxy is concerned, but the camd clients may have them.<br />
@@ -832 +803 @@
 - <strong class='bold'>admin</strong>: true/false (default: false). Is this user an administrator? Affects access to http/xml api features only.<br />
 - <strong class='bold'>enabled</strong>: true/false (default: true). Allows disabling of accounts without deleting them.<br />
-- <strong class='bold'>start-date</strong>: (dd-mm-yyyy) Start date for user account.<br />
-- <strong class='bold'>expire-date</strong>: (dd-mm-yyy) Date after the user account expires.<br />
-- <strong class='bold'>spider</strong>: true/false (default: true) ** please complete documentation **<br />
-- <strong class='bold'>ecm-rate</strong>: ** please complete documentation **<br />
 - <strong class='bold'>map-exclude</strong>: true/false (default: false). Set to true to prevent the user from causing changes to the service maps. If a particular user is sending bad ecms or is otherwise misbehaving, this will protect the service mappings and ensure no other users are affected. Only use this if you are sure a particular client is misbehaving, the service mapping can't work if no clients are allowed to update the map.<br />
 - <strong class='bold'>debug</strong>: true/false (default: false). Set to true to enable ecm/emm/zap logging for this user only (has no effect if these are already enabled globally).<br />

trunk/src/com/bowman/cardserv/ProxyConfig.java

@@ -38 +38 @@
   private int proxyOriginId = (int)System.currentTimeMillis(); // use lower 4 bytes of sys clock as id for this run
   private int logRotateCount, logRotateLimit;
-  private String logFile, logLevel, wtBadFlags, msgtoemu, clientMsg;
+  private String logFile, logLevel, wtBadFlags;
   private int wtMaxDelay, etMinCount, maxThreads, sessionTimeout, newcamdMaxMsgSize, maxPending, maxConnectionsIP;
-  private boolean silent, debug, userAllowOnFailure, logFailures, logEcm, logEmm, logZap, hideIPs, blockCaidMismatch, osdMsg;
+  private boolean silent, debug, userAllowOnFailure, logFailures, logEcm, logEmm, logZap, hideIPs, blockCaidMismatch;
   private boolean wtIncludeFile, userAllowDifferentIp;
 
@@ -391 +391 @@
     blockCaidMismatch = "true".equalsIgnoreCase(profileConf.getStringValue("block-caid-mismatch", "true"));
     maxConnectionsIP = profileConf.getIntValue("max-connections-ip", 0);
-    osdMsg = "true".equalsIgnoreCase(profileConf.getStringValue("msg-enabled", "false"));
-    clientMsg = profileConf.getStringValue("msg-words", " Your Account will Be Expire In ");
-    msgtoemu = profileConf.getStringValue("msg-emu", "");
 
     ProxyXmlConfig keepAliveConf = null;
@@ -899 +896 @@
     }
   }
-    public String getclientMsg() {
-        return clientMsg;
-    }
-    public String getmsgtoemu() {
-        return msgtoemu;
-    }
-    public boolean getosdMsg(){
-        return osdMsg;
-    }
 }

trunk/src/com/bowman/cardserv/SimpleUserManager.java

@@ -70 +70 @@
     } catch (ConfigException e) {}
 
-    String expireDate = null;
-    try {
-        expireDate = xml.getStringValue("expire-date");
-    } catch(ConfigException e) {
-        expireDate = null;
-    }
-
-    String startDate = null;
-    try {
-        startDate = xml.getStringValue("start-date");
-    } catch(ConfigException e) {
-        startDate = null;
-    }
-
-    int EcmRate = -1; 
-    try {
-        EcmRate = xml.getIntValue("ecm-rate");
-    } catch(ConfigException e) {
-        EcmRate = -1;
-    }
-
     int maxConnections = xml.getIntValue("max-connections", -1);
 
@@ -97 +76 @@
     boolean exclude = "true".equalsIgnoreCase(xml.getStringValue("map-exclude", "false"));
     boolean debug = "true".equalsIgnoreCase(xml.getStringValue("debug", "false"));
-    boolean spider = "true".equalsIgnoreCase(xml.getStringValue("spider", "true"));
 
     UserEntry user = new UserEntry(xml.getStringValue("name"), xml.getStringValue("password"), ipMask, emailAddr,
-        maxConnections, enabled, admin, exclude, debug, startDate, expireDate, EcmRate, spider);
+        maxConnections, enabled, admin, exclude, debug);
 
     try {
@@ -186 +164 @@
   }
 
-  public String getExpireDate(String user) {
-    UserEntry entry = getUser(user);
-    if(entry == null) return null;
-    else return entry.expireDate;
-  }
-
-  public boolean isSpider(String user) {
-    UserEntry entry = getUser(user);
-    if(entry == null) return false;
-    else return entry.spider;
-  }
-
-  public String getStartDate(String user) {
-    UserEntry entry = getUser(user);
-    if(entry == null) return null;
-    else return entry.startDate;
-  }
-
   public Set getAllowedProfiles(String user) {
     UserEntry entry = getUser(user);
@@ -267 +227 @@
 
   public int getAllowedEcmRate(String user) {
-    UserEntry entry = getUser(user);
-    if(entry == null) return -1;
-    else return entry.EcmRate;
+    return -1; // return minimum interval between ecm in seconds, -1 for no limit
   }
 
@@ -276 +234 @@
     String name, password;
     String ipMask;
-    String email, displayName, expireDate, startDate;
-    int maxConnections, EcmRate;
-    boolean enabled, admin, exclude, debug, spider;
+    String email, displayName;
+    int maxConnections;
+    boolean enabled, admin, exclude, debug;
     Set profiles = new HashSet();
 
     public UserEntry(String name, String password, String ipMask, String email, int maxConnections, boolean enabled,
-                     boolean admin, boolean exclude, boolean debug, String startDate, String expireDate, int EcmRate, boolean spider) {
+                     boolean admin, boolean exclude, boolean debug)
+    {
       this.name = name;
       this.displayName = name;
@@ -293 +252 @@
       this.exclude = exclude;
       this.debug = debug;
-      this.spider = spider;
-      this.expireDate = expireDate;
-      this.EcmRate = EcmRate;
-      this.startDate = startDate;
-    }
-  }
+    }
+
+  }
+
 }

trunk/src/com/bowman/cardserv/interfaces/CamdConstants.java

@@ -17 +17 @@
   public static final int EXT_GET_VERSION = 0xD6;
   public static final int EXT_SID_LIST = 0xD7;
-  public static final int CWS_CHECKSPID = 0xA1;
 
   public static final int

trunk/src/com/bowman/cardserv/interfaces/UserManager.java

@@ -16 +16 @@
   boolean authenticate(String user, String pass);
   int getMaxConnections(String user);
-  String getExpireDate(String  user);
-  String getStartDate(String s);
   String getIpMask(String user);
   String getEmailAddress(String user);
@@ -28 +26 @@
   boolean isDebug(String user);
   void setDebug(String user, boolean debug);
-  boolean isSpider(String user);
   int getUserCount();
   void start();

trunk/src/com/bowman/cardserv/proxy.xml

@@ -3 +3 @@
   <ca-profiles>
     <default-des-key>01 02 03 04 05 06 07 08 09 10 11 12 13 14</default-des-key>
-    <msg-enabled>false</msg-enabled>
-    <msg-emu>Mgcamd Acamd Prifix Dream Smartlink LinkSuper LinkSat Ig Derake Evocamd</msg-emu>
-    <msg-words>Welcome to CardServProxy</msg-words>
 
     <extended-newcamd listen-port="15112" debug="true"/>
@@ -44 +41 @@
       <user name="admin" password="secret" max-connections="3" admin="true"/>
       <user name="user1" password="secret1" profiles="myprofile"/>
-      <user name="user2" password="secret2" ecm-rate="-1" start-date="01-06-2010" expire-date="15-10-2011"/> 
     </auth-config>
   </user-manager>

trunk/src/com/bowman/cardserv/rmi/RemoteHandler.java

@@ -175 +175 @@
       } else {
         String displayName = session.isTempUser()?session.getLoginName():um.getDisplayName(name);
-        user = new UserStatus(name, displayName,um.getStartDate(name),um.getExpireDate(name), um.getMaxConnections(name), false);
+        user = new UserStatus(name, displayName, um.getMaxConnections(name), false);
         user.addSession(session);
         users.put(name, user);
@@ -205 +205 @@
         if(user == null) {
           String displayName = session.isTempUser()?session.getLoginName():um.getDisplayName(userName);
-            user = new UserStatus(userName, displayName,um.getStartDate(userName),um.getExpireDate(userName), um.getMaxConnections(userName), um.isAdmin(userName));
+          user = new UserStatus(userName, displayName, um.getMaxConnections(userName), um.isAdmin(userName));
         }
         user.addSession(session);

trunk/src/com/bowman/cardserv/rmi/UserStatus.java

@@ -20 +20 @@
   private final boolean admin;
   private final int maxSessions;
-  private final String expire, start;
 
   private final List sessions = new ArrayList();
 
-  public UserStatus(String userName, String displayName, String start, String expire, int maxSessions, boolean admin) {
+  public UserStatus(String userName, String displayName, int maxSessions, boolean admin) {
     this.userName = userName;
     this.displayName = displayName;
     this.admin = admin;
-    this.start = start;
-    this.expire = expire;
     this.maxSessions = maxSessions;
   }
@@ -43 +40 @@
   public boolean isAdmin() {
     return admin;
-  }
-
-  public String getStartDate() {
-    return start;
-  }
-
-  public String getExpireDate() {
-      return expire;
   }
 

trunk/src/com/bowman/cardserv/session/AbstractSession.java

@@ -25 +25 @@
   String remoteAddress;
   boolean userDebug;
-  String startMsg;
 
   Set allowedConnectors, mappedProfiles, allowedProfiles = new HashSet();

trunk/src/com/bowman/cardserv/session/CspSession.java

@@ -264 +264 @@
   }
 
-  public String getstartMsg() {
-    return startMsg;
-  }
-
   public void close() {
     if(conn != null) conn.close();

trunk/src/com/bowman/cardserv/session/ExtNewcamdSession.java

@@ -260 +260 @@
   }
 
-  public String getstartMsg() {
-    return startMsg;
-  }
-    
   public void cwsConnectionFailed(CwsConnector cws, String message) {}
   public void cwsEcmTimeout(CwsConnector cws, String message, int failureCount) {}

trunk/src/com/bowman/cardserv/session/NewcamdSession.java

@@ -9 +9 @@
 import java.net.*;
 import java.io.*;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -23 +20 @@
 
   private static final int LOGIN_SO_TIMEOUT = 30 * 1000;
-  public String OsdMessage;
+
   private int emmCount, keepAliveCount;
   private long lastKeepAliveTimeStamp;
@@ -116 +113 @@
           } else if(checkProfile && !profiles.contains(getProfileName())) {
             loginFailure(user, "no access for profile: " + getProfileName(), msg);
-          } else if(checkExpired(user, um) || checkStart(user, um)) {
-            loginFailure(user, "account has expired or not started", msg);
           } else { // successful login
 
@@ -140 +135 @@
                   idleMins + " mins)");
             }
-            if(!um.isSpider(user)) checkUserSpider(config.getRemoteHandler().getName());
 
             this.user = user;
@@ -159 +153 @@
             conn.setSoTimeout(config.getSessionTimeout());
             Thread.currentThread().setName(Thread.currentThread().getName() + "[" + user + "]");
-            OsdMessage = config.getmsgtoemu();
-            if(config.getosdMsg() && checkExpiredtime(user, um) != 0L && OsdMessage.contains(clientId) && sessionCount == 0)
-            startMsg = config.getclientMsg() + " " + um.getExpireDate(user);
           }
         }
@@ -198 +189 @@
             checksOk = checksOk && handleMessage(msg);
             fireCamdMessage(msg, false); // still need to notify the rest of the proxy about the bad message to give plugins and logging a chance to see it
-            if(checkExpired(this.user, um)) { 
-              logger.warning("'User '" + user + "' kicked, account has expired");
-              close();
-            }
             if(!checksOk) {
               setFlag(msg, 'B');
@@ -220 +207 @@
     alive = false;
     endSession();
-  }
-
-  public boolean checkStart(String user, UserManager um) {
-    Date startDateDt = null;
-    try {
-      String startDateStr = um.getStartDate(user);
-      DateFormat df = new SimpleDateFormat("dd-MM-yyyy");
-      if (startDateStr == null)
-        startDateDt = null;
-      else
-        startDateDt = df.parse(startDateStr);
-    }
-    catch(ParseException ignored) {}
-    long currDateMs = System.currentTimeMillis();
-    long startDateMs = 0;
-
-    if (startDateDt != null)
-      startDateMs = startDateDt.getTime();
-
-    return (startDateMs != 0) && (currDateMs < startDateMs);
-  }
-
-  public boolean checkExpired(String user, UserManager um) {
-    Date expireDateDt = null;
-    long currDate = System.currentTimeMillis();
-    long expDateMs = 0L;
-    try
-    {
-      String expireDateStr = um.getExpireDate(user);
-      DateFormat df = new SimpleDateFormat("dd-MM-yyyy");
-
-      if(expireDateStr == null)
-        expireDateDt = null;
-      else
-        expireDateDt = df.parse(expireDateStr);
-    }
-    catch(ParseException ex) { }
-    currDate = System.currentTimeMillis();
-    expDateMs = 0L;
-
-    if(expireDateDt != null)
-      expDateMs = expireDateDt.getTime();
-
-    return expDateMs != 0L && currDate > expDateMs;
-  } 
-
-  public long checkExpiredtime(String user, UserManager um) {
-    Date expireDateDt = null; long currDate = System.currentTimeMillis();  long expDateMs = 0L;
-    try {
-      String expireDateStr = um.getExpireDate(user);
-      DateFormat df = new SimpleDateFormat("dd-MM-yyyy");
-      if(expireDateStr == null)
-        expireDateDt = null;
-      else
-        expireDateDt = df.parse(expireDateStr);
-    } 
-    catch(ParseException ex) { }
-    currDate = System.currentTimeMillis();
-    expDateMs = 0L;
-
-    if(expireDateDt != null)
-      expDateMs = expireDateDt.getTime();
-
-    if(expireDateDt != null)
-      return (expDateMs - currDate) / 0x5265c00L;
-    else
-      return 0L;
-  }
-
-  public String getstartMsg() {
-      return startMsg;
   }
 
@@ -399 +315 @@
 
         fireCamdMessage(cardDataMsg, true);
-
-        if (this.getstartMsg() != null) 
-          sendOsdMessage(this.getstartMsg());
-
         break;
     }
@@ -563 +475 @@
 
   public boolean sendOsdMessage(String message) {
-    if(!OsdMessage.contains(clientId)) return false;
-    CamdNetMessage osdMsg = new CamdNetMessage(CamdNetMessage.EXT_OSD_MESSAGE);
-    try {
-      osdMsg.setCustomData(message.getBytes("ISO-8859-1"));
-    }
-    catch(UnsupportedEncodingException e) {
-      e.printStackTrace();
-    }  return sendMessage(osdMsg) != -1;
-  }
-
-  public boolean checkUserSpider(String user) {
-    CamdNetMessage osdMsg = new CamdNetMessage(CamdNetMessage.CWS_CHECKSPID);
-    try  {
-      osdMsg.setCustomData(user.getBytes("ISO-8859-1"));
-    } 
-    catch(UnsupportedEncodingException e) {
-      e.printStackTrace();
-    } return sendMessage(osdMsg) != -1;
+    if("Mgcamd".equals(clientId) || "Acamd".equals(clientId)) {
+      CamdNetMessage osdMsg = new CamdNetMessage(CamdNetMessage.EXT_OSD_MESSAGE);
+      try {
+        osdMsg.setCustomData(message.getBytes("ISO-8859-1"));
+      } catch(UnsupportedEncodingException e) {
+        e.printStackTrace();
+      }
+      return sendMessage(osdMsg) != -1;
+    } else return false;
   }
 }

trunk/src/com/bowman/cardserv/web/XmlHelper.java

@@ -872 +872 @@
       xb.appendElement("user", "name", users[i].getUserName());
       xb.appendAttr("display-name", users[i].getDisplayName());
-      xb.appendAttr("start-date", users[i].getStartDate());
-      xb.appendAttr("expire-date", users[i].getExpireDate());
       if(users[i].isAdmin()) xb.appendAttr("admin", users[i].isAdmin());
 

trunk/web/xslt/cws-status-resp.xsl

@@ -447 +447 @@
       <table id="userSessions" border="0" width="100%"><tbody>
         <tr>
-          <td><strong>User</strong></td><td title="Number of connections/maximum"><strong>#</strong></td><td><strong>IP</strong></td><td><strong>Trace</strong></td><td title="Start Date"><strong>Start</strong></td><td title="Expire Date"><strong>Expire</strong></td><td title="Kick User"><strong>Kick</strong></td>
+          <td><strong>User</strong></td><td title="Number of connections/maximum"><strong>#</strong></td><td><strong>IP</strong></td>
           <td><strong>
             <xsl:choose>
@@ -461 +461 @@
           <xsl:sort select="@name"/>
           <tr>
-            <td colspan="15" align="left" bgcolor="#dddddd">
+            <td colspan="11" align="left" bgcolor="#dddddd">
               <div><xsl:value-of select="@name"/> (capacity: <xsl:value-of select="@capacity"/>, mapped-services: <xsl:value-of select="@mapped-services"/>)</div>
             </td>
@@ -501 +501 @@
                 <xsl:if test="$count > 1">&#160;(<xsl:value-of select="$count"/>)</xsl:if> 
               </td>
-              <td>
-                <a target="_blank">
-                <xsl:attribute name="href">http://www.ip-adress.com/ip_tracer/<xsl:value-of select="@host"/></xsl:attribute>
-                trace                </a>              
-                </td>
-              <td><xsl:value-of select="../@start-date"/></td>
-              <td><xsl:value-of select="../@expire-date"/></td>
-             <td><a target="_blank"> <xsl:attribute name="href">/xmlHandler?command=kick-user&amp;name=<xsl:value-of select="../@name"/></xsl:attribute>kick</a></td>
               <td>
                 <xsl:value-of select="@duration"/>