You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/08/05 23:23:03 UTC
svn commit: r230512 - in /incubator/roller/branches/roller_2.0:
src/org/roller/presentation/ src/org/roller/presentation/weblog/actions/
src/org/roller/presentation/website/actions/
src/org/roller/presentation/website/formbeans/ web/WEB-INF/classes/ we...
Author: snoopdave
Date: Fri Aug 5 14:22:54 2005
New Revision: 230512
URL: http://svn.apache.org/viewcvs?rev=230512&view=rev
Log:
further group blogging UI refinements
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/WebsiteFormEx.java
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/blacklist.txt
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties
incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
incubator/roller/branches/roller_2.0/web/website/edit-website.jsp
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java?rev=230512&r1=230511&r2=230512&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/RollerSession.java Fri Aug 5 14:22:54 2005
@@ -52,6 +52,13 @@
if (session != null)
{
rollerSession = (RollerSession)session.getAttribute(ROLLER_SESSION);
+ if (rollerSession == null)
+ {
+ // HttpSession with no RollerSession?
+ // Must be a session that was de-serialzied from a previous run.
+ rollerSession = new RollerSession();
+ session.setAttribute(ROLLER_SESSION, rollerSession);
+ }
Principal principal = request.getUserPrincipal();
if (rollerSession.getAuthenticatedUser() == null && principal != null)
{
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=230512&r1=230511&r2=230512&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java Fri Aug 5 14:22:54 2005
@@ -431,8 +431,10 @@
sb.append(
MessageFormat.format(
resources.getString("weblogEntry.pendingEntrySubject"),
- new Object[] {entry.getWebsite().getName()})
- );
+ new Object[] {
+ entry.getWebsite().getName(),
+ entry.getWebsite().getHandle()
+ }));
subject = sb.toString();
sb = new StringBuffer();
sb.append(
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java?rev=230512&r1=230511&r2=230512&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/InviteMemberAction.java Fri Aug 5 14:22:54 2005
@@ -1,6 +1,16 @@
package org.roller.presentation.website.actions;
import java.io.IOException;
+import java.net.MalformedURLException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ResourceBundle;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -16,13 +26,18 @@
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.actions.DispatchAction;
+import org.apache.struts.util.RequestUtils;
+import org.roller.RollerException;
+import org.roller.model.Roller;
import org.roller.model.RollerFactory;
import org.roller.model.UserManager;
import org.roller.pojos.PermissionsData;
import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
+import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerSession;
import org.roller.presentation.website.formbeans.InviteMemberForm;
+import org.roller.util.MailUtil;
/**
* Allows website admin to invite new members to website.
@@ -101,7 +116,7 @@
umgr.inviteUser(website, user, Short.parseShort(mask));
request.setAttribute("user", user);
forward = mapping.findForward("inviteMemberDone.page");
- // ROLLER_2.0: notify user by email of invitation
+ notifyInvitee(request, website, user);
msgs.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("inviteMember.userInvited"));
}
@@ -109,4 +124,88 @@
if (!errors.isEmpty()) saveErrors(request, errors);
return forward;
}
+
+ /**
+ * Inform invitee of new invitation.
+ */
+ private void notifyInvitee(
+ HttpServletRequest request, WebsiteData website, UserData user)
+ throws Exception
+ {
+ try
+ {
+ Roller roller = RollerFactory.getRoller();
+ UserManager umgr = roller.getUserManager();
+ javax.naming.Context ctx = (javax.naming.Context)
+ new InitialContext().lookup("java:comp/env");
+ Session mailSession =
+ (Session)ctx.lookup("mail/Session");
+ if (mailSession != null)
+ {
+ String userName = user.getUserName();
+ String from = website.getEmailAddress();
+ String cc[] = new String[] {from};
+ String bcc[] = new String[0];
+ String to[] = new String[] {user.getEmailAddress()};
+ String subject;
+ String content;
+
+ // Figure URL to entry edit page
+ RollerContext rc = RollerContext.getRollerContext(request);
+ String rootURL = rc.getAbsoluteContextUrl(request);
+ if (rootURL == null || rootURL.trim().length()==0)
+ {
+ rootURL = RequestUtils.serverURL(request)
+ + request.getContextPath();
+ }
+ String url = rootURL + "/editor/yourWebsites.do";
+
+ ResourceBundle resources = ResourceBundle.getBundle(
+ "ApplicationResources",
+ website.getLocaleInstance());
+ StringBuffer sb = new StringBuffer();
+ sb.append(MessageFormat.format(
+ resources.getString("inviteMember.notificationSubject"),
+ new Object[] {
+ website.getName(),
+ website.getHandle()})
+ );
+ subject = sb.toString();
+ sb = new StringBuffer();
+ sb.append(MessageFormat.format(
+ resources.getString("inviteMember.notificationContent"),
+ new Object[] {
+ website.getName(),
+ website.getHandle(),
+ user.getUserName(),
+ url
+ }));
+ content = sb.toString();
+ MailUtil.sendTextMessage(
+ mailSession, from, to, cc, bcc, subject, content);
+ }
+ }
+ catch (NamingException e)
+ {
+ mLogger.error("ERROR: Notification email(s) not sent, "
+ + "Roller's mail session not properly configured", e);
+ }
+ catch (MessagingException e)
+ {
+ mLogger.error("ERROR: Notification email(s) not sent, "
+ + "due to Roller configuration or mail server problem.", e);
+ }
+ catch (MalformedURLException e)
+ {
+ mLogger.error("ERROR: Notification email(s) not sent, "
+ + "Roller site URL is malformed?", e);
+ }
+ catch (RollerException e)
+ {
+ throw new RuntimeException(
+ "FATAL ERROR: unable to find Roller object", e);
+ }
+ }
+
+
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java?rev=230512&r1=230511&r2=230512&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/actions/WebsiteFormAction.java Fri Aug 5 14:22:54 2005
@@ -18,19 +18,20 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.actions.DispatchAction;
import org.roller.RollerException;
import org.roller.RollerPermissionsException;
import org.roller.config.RollerRuntimeConfig;
+import org.roller.model.Roller;
import org.roller.model.RollerFactory;
import org.roller.model.UserManager;
import org.roller.model.WeblogManager;
import org.roller.pojos.UserData;
-import org.roller.pojos.WeblogCategoryData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.RollerSession;
-import org.roller.presentation.forms.WebsiteForm;
import org.roller.presentation.pagecache.PageCacheFilter;
import org.roller.presentation.website.formbeans.WebsiteFormEx;
@@ -71,33 +72,38 @@
try
{
RollerRequest rreq = RollerRequest.getRollerRequest(request);
- RollerSession rollerSession = RollerSession.getRollerSession(request);
- if ( rollerSession.isUserAuthorizedToAdmin() )
+ RollerSession rses = RollerSession.getRollerSession(request);
+ if (rses.isUserAuthorizedToAdmin())
{
- UserData ud = RollerSession.getRollerSession(request).getAuthenticatedUser();
+ Roller roller = RollerFactory.getRoller();
+ UserManager umgr = roller.getUserManager();
+ WeblogManager wmgr = roller.getWeblogManager();
+ UserData ud = rses.getAuthenticatedUser();
request.setAttribute("user",ud);
- WebsiteData hd = RollerSession.getRollerSession(request).getCurrentWebsite();
- WebsiteForm wf = (WebsiteFormEx)actionForm;
- wf.copyFrom(hd, request.getLocale());
+ WebsiteData website =
+ umgr.retrieveWebsite(rses.getCurrentWebsite().getId());
+ WebsiteFormEx wf = (WebsiteFormEx)actionForm;
+ wf.copyFrom(website, request.getLocale());
- List cd = RollerFactory.getRoller().getWeblogManager()
- .getWeblogCategories(RollerSession.getRollerSession(request).getCurrentWebsite(), true);
+ List cd = wmgr.getWeblogCategories(website, true);
request.setAttribute("categories",cd);
- List bcd = RollerFactory.getRoller().getWeblogManager()
- .getWeblogCategories(RollerSession.getRollerSession(request).getCurrentWebsite(), true);
+ List bcd = wmgr.getWeblogCategories(website, true);
request.setAttribute("bloggerCategories",bcd);
- List pages = RollerFactory.getRoller().getUserManager().getPages(RollerSession.getRollerSession(request).getCurrentWebsite());
+ List pages = umgr.getPages(website);
request.setAttribute("pages",pages);
ServletContext ctx = request.getSession().getServletContext();
String editorPages =
RollerRuntimeConfig.getProperty("users.editor.pages");
- List epages = Arrays.asList(StringUtils.split(StringUtils.deleteWhitespace(editorPages), ","));
+ List epages = Arrays.asList(StringUtils.split(
+ StringUtils.deleteWhitespace(editorPages), ","));
request.setAttribute("editorPagesList", epages);
+
+ rses.setCurrentWebsite(website);
}
else
{
@@ -120,6 +126,8 @@
HttpServletResponse response)
throws IOException, ServletException
{
+ ActionErrors errors = new ActionErrors();
+ ActionMessages messages = new ActionMessages();
ActionForward forward = mapping.findForward("editWebsite");
try
{
@@ -130,22 +138,7 @@
if ( rollerSession.isUserAuthorizedToAdmin() )
{
WebsiteFormEx form = (WebsiteFormEx)actionForm;
-
- // checkboxes return no value when not checked
- if (form.getAllowComments() == null)
- {
- form.setAllowComments( Boolean.FALSE );
- }
- if (form.getEmailComments() == null)
- {
- form.setEmailComments( Boolean.FALSE );
- }
- if (form.getEnableBloggerApi() == null)
- {
- form.setEnableBloggerApi( Boolean.FALSE );
- }
-
- if(!form.getDefaultPageId().equals(form.getWeblogDayPageId()))
+ if (!form.getDefaultPageId().equals(form.getWeblogDayPageId()))
{
WebsiteData wd = umgr.retrieveWebsite(form.getId());
wd.save(); // should throw if save not permitted
@@ -153,31 +146,16 @@
// ensure isEnabled can't be changed
form.setIsEnabled(wd.getIsEnabled());
form.copyTo(wd, request.getLocale());
-
- if (form.getDefaultCategoryId() != null)
- {
- WeblogCategoryData defaultCat =
- wmgr.retrieveWeblogCategory(form.getDefaultCategoryId());
- wd.setDefaultCategory(defaultCat);
- }
-
- if (form.getBloggerCategoryId() != null)
- {
- WeblogCategoryData bloggerCat =
- wmgr.retrieveWeblogCategory(form.getBloggerCategoryId());
- wd.setBloggerCategory(bloggerCat);
- }
-
+
wd.save();
RollerFactory.getRoller().getRefererManager().applyRefererFilters(wd);
RollerFactory.getRoller().commit();
- request.getSession().setAttribute(
- RollerSession.STATUS_MESSAGE,
- "Successfully submitted new Weblog templates");
+ messages.add(null,
+ new ActionMessage("websiteSettings.savedChanges"));
request.getSession().setAttribute(
- RollerRequest.WEBSITEID_KEY,form.getId());
+ RollerRequest.WEBSITEID_KEY, form.getId());
// clear the page cache for this user
PageCacheFilter.removeFromCache(request, wd);
@@ -187,15 +165,15 @@
String editorPages =
RollerRuntimeConfig.getProperty("users.editor.pages");
- List epages = Arrays.asList(StringUtils.split(org.apache.commons.lang.StringUtils.deleteWhitespace(editorPages), ","));
+ List epages = Arrays.asList(StringUtils.split(
+ org.apache.commons.lang.StringUtils.deleteWhitespace(editorPages), ","));
request.setAttribute("editorPagesList", epages);
}
else
{
- request.getSession().setAttribute(
- RollerSession.ERROR_MESSAGE,
- "CHANGES REJECTED: Cannot set default page template "
- +"and day template to same template");
+ errors.add(null,
+ new ActionError("websiteSettings.error.sameTemplate"));
+ saveErrors(request, errors);
}
}
else
@@ -207,9 +185,7 @@
}
catch (RollerPermissionsException e)
{
- ActionErrors errors = new ActionErrors();
errors.add(null, new ActionError("error.permissions.deniedSave"));
- saveErrors(request, errors);
forward = mapping.findForward("access-denied");
}
catch (RollerException re)
@@ -222,6 +198,8 @@
mLogger.error("Unexpected exception",e);
throw new ServletException(e);
}
+ if (errors.size() > 0) saveErrors(request, errors);
+ if (messages.size() > 0) saveMessages(request, messages);
return forward;
}
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/WebsiteFormEx.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/WebsiteFormEx.java?rev=230512&r1=230511&r2=230512&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/WebsiteFormEx.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/website/formbeans/WebsiteFormEx.java Fri Aug 5 14:22:54 2005
@@ -3,10 +3,16 @@
*/
package org.roller.presentation.website.formbeans;
+import java.sql.Timestamp;
+import java.util.Date;
import org.apache.commons.lang.StringUtils;
import org.roller.RollerException;
+import org.roller.model.RollerFactory;
+import org.roller.model.WeblogManager;
+import org.roller.pojos.WeblogCategoryData;
import org.roller.pojos.WebsiteData;
import org.roller.presentation.forms.WebsiteForm;
+import org.roller.util.DateUtil;
/**
* @struts.form name="websiteFormEx"
@@ -86,13 +92,80 @@
}
}
+ /**
+ * Utility to convert from String to Date.
+ */
+ public void setDateCreatedAsString(String value)
+ {
+ if ( value == null || value.trim().length() == 0 )
+ {
+ this.setDateCreated(null);
+ }
+ else
+ {
+ try
+ {
+ Date pubDate = DateUtil.parse(
+ value, DateUtil.friendlyTimestampFormat());
+ this.setDateCreated(new Timestamp(pubDate.getTime()));
+ }
+ catch (java.text.ParseException pe)
+ {
+ // wasn't proper format, try others
+ Date pubDate = DateUtil.parseFromFormats(value);
+ this.setDateCreated( new Timestamp(pubDate.getTime()) );
+ }
+ }
+ }
+
+ /**
+ * Returns a formatted pubTime string.
+ */
+ public String getDateCreatedAsString()
+ {
+ return DateUtil.friendlyTimestamp(this.getDateCreated());
+ }
+
/**
* @see org.roller.presentation.forms.WebsiteForm#copyTo(org.roller.pojos.WebsiteData)
*/
public void copyTo(WebsiteData dataHolder, java.util.Locale locale) throws RollerException
{
+ Date dateCreated = dataHolder.getDateCreated();
+
super.copyTo(dataHolder, locale);
+
+ dataHolder.setDateCreated(dateCreated);
dataHolder.setDefaultPlugins( StringUtils.join(this.defaultPluginsArray,",") );
+
+ // checkboxes return no value when not checked
+ if (getAllowComments() == null)
+ {
+ dataHolder.setAllowComments(Boolean.FALSE);
+ }
+ if (getEmailComments() == null)
+ {
+ dataHolder.setEmailComments(Boolean.FALSE);
+ }
+ if (getEnableBloggerApi() == null)
+ {
+ dataHolder.setEnableBloggerApi(Boolean.FALSE);
+ }
+
+ WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ if (getDefaultCategoryId() != null)
+ {
+ WeblogCategoryData defaultCat =
+ wmgr.retrieveWeblogCategory(getDefaultCategoryId());
+ dataHolder.setDefaultCategory(defaultCat);
+ }
+
+ if (getBloggerCategoryId() != null)
+ {
+ WeblogCategoryData bloggerCat =
+ wmgr.retrieveWeblogCategory(getBloggerCategoryId());
+ dataHolder.setBloggerCategory(bloggerCat);
+ }
}
public void reset(
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties?rev=230512&r1=230511&r2=230512&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties Fri Aug 5 14:22:54 2005
@@ -99,7 +99,7 @@
comments.title=Comment
comments.header=Post a comment
comments.name=Name:
-comments.email=E-Mail:
+comments.email=Email:
comments.url=URL:
comments.rememberInfo=Remember Information?
comments.header2=Comments:
@@ -149,7 +149,7 @@
configForm.editorPages=Editor Pages
configForm.autoformatComments=Autoformat Comments?
configForm.escapeCommentHtml=Escape Comment HTML?
-configForm.emailComments=E-Mail Comments?
+configForm.emailComments=Email Comments?
configForm.fileUploadSettings=File Upload Settings
configForm.enableFileUploads=Enable File Uploads?
@@ -358,7 +358,9 @@
# ----------------------------------------------------------------- Invite member
inviteMember.title=Invite New Member
-inviteMember.description=You can invite any user to join this weblog
+inviteMember.description=Invite a user to join this weblog by selecting his or \
+her email address below, picking a permission for them and clicking the send \
+invitation button.
inviteMember.userName=Username
inviteMember.administrator=Admin
inviteMember.author=Author
@@ -375,6 +377,11 @@
inviteMemberDone.message=User [{0}] has been invited to join this weblog
inviteMemberDone.inviteAnother=Invite another
+inviteMember.notificationSubject=Roller: invitation to join weblog "{0}" ({1})
+inviteMember.notificationContent=You have been invited to join weblog "{0}" ({1}). \
+Click the following link and login as user [{2}] to accept or decline this \
+invitation <{3}>.
+
# ------------------------------------------------------------------------ Login
loginPage.userName=Username
@@ -912,7 +919,8 @@
# ------------------------------------------------------------------ Weblog edit
-weblogEntry.pendingEntrySubject=Roller [{0}] new post pending review
+weblogEntry.pendingEntrySubject=\
+Roller: new post pending review in weblog "{0}" ({1})
weblogEntry.pendingEntryContent=User [{0}] has submitted a new weblog entry \
for your review. Please review this post and either publish it or save it as a \
@@ -1089,12 +1097,12 @@
websiteSettings.homePage=Page to be used as the homepage
websiteSettings.editor=Weblog editor page to be used
websiteSettings.categories=Categories
-websiteSettings.defaultCategory=Default root category of weblog.
+websiteSettings.defaultCategory=Default root category of weblog
websiteSettings.formatting=Formatting
websiteSettings.allowComments=Allow Comments for your weblog?
-websiteSettings.emailComments=E-Mail Comments?
-websiteSettings.emailFromAddress=Default <em>from</em> e-mail address<br />for \
-Comment Notifications
+websiteSettings.emailComments=Email Comments?
+websiteSettings.emailAddress=Email address of weblog owner
+websiteSettings.emailFromAddress=Default <em>from</em> e-mail address for notifications
websiteSettings.autoformat=Autoformat new entries?
websiteSettings.bloggerApi=Blogger API
websiteSettings.enableBloggerApi=Enable Blogger API for your weblog?
@@ -1108,6 +1116,10 @@
websiteSettings.button.update=Update Weblog Settings
websiteSettings.button.rebuildIndex=Rebuild Search Index
+websiteSettings.savedChanges=Saved changes to weblog settings
+websiteSettings.error.sameTemplate=CHANGES REJECTED: cannot set default page \
+template and day template to same template
+
# ------------------------------------------------------------- Welcome new user
welcome.title=Welcome to Roller
@@ -1155,8 +1167,8 @@
yourWebsites.resign=Resign
yourWebsites.permissions=Permissions
yourWebsites.confirmResignation=Are you sure you wish to resign from weblog
-yourWebsites.youHaveNone=You have no weblogs.
-yourWebsites.youCanCreateOne=You may create one.
+yourWebsites.youHaveNone=You have no weblogs, would you like to
+yourWebsites.youCanCreateOne=create one
yourWebsites.youCannot=Ask your administrator to create one for you.
yourWebsites.notAllowed=Not allowed
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/blacklist.txt
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/blacklist.txt?rev=230512&r1=230511&r2=230512&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/blacklist.txt (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/blacklist.txt Fri Aug 5 14:22:54 2005
@@ -1,8 +1,8 @@
#
# MT-Blacklist Master Copy
#
-# Last update: 2004/10/09 00:05:33
-# Number of entries: 2311
+# Last update: 2005/08/02 09:08:55
+# Number of entries: 3101
#
# This is the master copy of the MT-Blacklist plugin
# spammer blacklist. You can import this file through
@@ -26,10 +26,14 @@
(online)[\w\-_.]*casino[\w\-_.]*\.[a-z]{2,} # Catchall regexp for a hundred online casino sites
(prozac|zoloft|xanax|valium|hydrocodone|vicodin|paxil|vioxx)[\w\-_.]*\.[a-z]{2,} # Super regexp for domains containing prozac, zoloft, xanax, valium, hydrocodone, vicodin, paxil, vioxx
(ragazze)-?\w+\.[a-z]{2,} # Catchall regexp for many spam sites
-(ultram\b|\btenuate|tramadol|pheromones|phendimetrazine|ionamin|ortho.?tricyclen|retin.?a)[\w\-_.]*\.[a-z]{2,} # Third drug super regexp
+(ultram\b|\btenuate|tramadol|pheromones|phendimetrazine|ionamin|ortho.?tricyclen|retin.?a\b)[\w\-_.]*\.[a-z]{2,} # Third drug super regexp
(valtrex|zyrtec|\bhgh\b|ambien\b|flonase|allegra|didrex|renova\b|bontril|nexium)[\w\-_.]*\.[a-z]{2,} # Fourth drug super regexp
+-4-you.info
+-4u.info
-mobile-phones.org
+-site.info
.gb.com
+.lycos.de
01-beltonen.com
01-klingeltoene.at
01-klingeltoene.de
@@ -85,20 +89,28 @@
1-klingeltone.com
1-online-poker.us
1-poker-games.biz
-1-texas-holdem.us
1-welivetogether.com
1-wholesale-distributor.com
100-sex.com
+100free.com
100hgh.com
101pills.com
108bikes.com
+123-home-improvement-equity-loans.com
123-sign-making-equipment-and-supplies.com
+123onlinepoker.com
123sessogratis.com
125mb.com
15668.com
+16pp.com
+1a1merchantaccounts.com
1asphost.com
1concerttickets.com
1footballtickets.com
+1freespot.com
+1on8.co.uk
+1on8.com
+1st-advantage-credit-repair.com
1st-auto-insurance-4u.com
1st-host.org
1st-payday-loans.net
@@ -106,47 +118,66 @@
1st-poker-online.com
1st-printer-ink-cartridge.com
1st-shemale-sex.com
+1stincomeracing.co.uk
1stindustrialdirectory.com
1stlookcd.com
1xp6z.com
20fr.com
216.130.167.230
24-hour-fitness-online.com
+247-rx.net
2ndmortgageinterestrates.com
+2teens.net
2twinks.com
+2y.net
+2zj.cn
3-day-diet-plan.com
321cigarettes.com
333-casino.com
333-poker.com
3333.ws
365jp.com
+38ha.com
3host.com
3sixtyfour.com
3yaoi.com
404host.com
+404servers.com
41b.net
42tower.ws
444-casino.com
444-poker.com
+4hs8.com
4mg.com
+4result.net
4u-topshelfpussy.com
4womenoftheworld.com
+51.net
51asa.com
555-poker.com
+5amateurs.com
65.217.108.182
666-casino.com
666-gambling.com
69.61.11.163
6p.org.uk
6x.to
+7host.com
7p.org.uk
+7yardsweb.com
888-online-poker.com
-888-texas-holdem.com
888cas.com
888jack.com
+88aabb.com
+8bit.co.uk
+8gold.com
8k.com
8th\S*street\S*latina\S*\.[a-z]{2,}
+8yardsweb.com
+911easymoney.com
+911pills.info
989888.com
+9p.org.uk
\bby\.ru\b
\bda\.ru\b
\bde\.gg\b
@@ -160,13 +191,27 @@
a-purfectdream-expression.com
a-stories.com
a1-mortgage-finder.com
+a1cellphoneaccessories.info
+a1digitalcameras.info
+a1metalbuildings.info
+a1steelbuildings.info
+a1timemanagement.info
abc3x.com
abnehmen-ganz-sicher.com
abocams.de
+aboutgrouphomes.com
abymetro.org.uk
+academyofmusic.us
+acceptcreditcardsonlineinternetmerchantaccountservices.com
+acceptcreditcardsrealtime.com
accompagnatrici.cc
+achtung.hopto.org
+acornfm.com
acornwebdesign.co.uk
+acrs.us
+activerx.com
acyclovir.net
+addictinggames.com
aducasher.spb.ru
adult-dvd-dot.com
adult-dvds-dot.com
@@ -183,45 +228,61 @@
adulthostpro.com
adultlingerieuk.com
adultnonstop.com
+adultporncentral.net
adultserviceproviders.com
adultshare.com
advantage-quotes.com
aektschen.de
aesthetics.co.il
+affilino.net
afreeserver.com
+ahbabe.com
+aimite.com
airfare-links.net
airshow-china.com.cn
alawna.blogspot.com
+all-calmortgage.com
all-debt-consolidation.org
all-fioricet.com
all-gay-porn.us
+all-poker-online
all-we-live-together.com
+allago.de
allfind.us
allinsurancetype.com
allmagic.ru
alloha.info
allohaweb.com
allthediets.com
+allthroating.com
almacenpc.com
+alphacarolinas.org
+alright.com.ru
+alumnicards.com
amateur-lesbian.us
amateur-movie.us
amateur-naked.us
amateur-porn-gallery.com
amateur-porno.us
amateur-site.us
+amateur-thumbnail.com
amateur-thumbs.net
+amateurjerkoff.org
amateurs-xxx.us
amateurs.r00m.com
amateursuite.com
+amazing-satellite-tv-deals.info
americacashfast.com
american-single-dating.com
americancdduplication.com
americanpaydayloans.net
+americastgp.com
amoxicillin-online.net
anal-sex-pictures.us
analloverz.com
andyedf.de
angenehmen-aufenthalt.de
+animal-fuck.org
animal-porn.ws
animalsex-movies-archive.com
animalsex-pics-gallery.com
@@ -238,11 +299,19 @@
annunci-sesso.org
annunci-sesso.us
annuncisesso.us
+anonsi.com
anonymous-blogger.com
+ansar-u-deen.org
anti-exploit.com
+anticlick.com.ru
+anuntisinmobiliaria.com
anxietydisorders.biz
+anylight4u.com
anything4health.com
+anzwers.org
+aol-com.us
ap8.com
+apecceosummit2003.com
apollopatch.com
apornhost.com
apply-to-green-card.org
@@ -255,17 +324,26 @@
argendrom.com
armor2net.com
aromacc.com
+artsculpture.org
+aseman.weblogs.us
asian-girls-porn-sex.com
asian-girls.name
asian-nude.blogspot.com
asian-sex-woman.com
asianbum.com
ass-picture.us
+assserver.com
+at-capstone.com
atkins-diet-center.com
atkinsexpert.com
+atkpremium.net
+atkpremium.org
+atlanta2000.org
atlas-pharmacy.com
auctionmoneymakers.com
auktions-uebersicht.de
+australia-online-travel.com
+austria-travels.info
auto-insurance-links.net
auto-loans-usa.biz
autodetailproducts.com
@@ -278,13 +356,17 @@
automotive.com
autumn-jade.com
avon-one.com
+azian.org
b-witchedcentral.co.uk
ba2000.com
babes-d.com
babes-plus.com
baby-perfekt.de
babymarktplatz-aktiv.de
+back-room-facials.angelcities.com
background-check.info
+backroom-facials.150m.com
+backseatbangers
bad-movies.net
bad-passion.com
bahraichfun.com
@@ -292,6 +374,7 @@
bali-hotels.co.uk
balidiscovery.org
balivillas.net
+balltaas.com
banialoba3w.150m.com
banned-pics.com
bannedhome.com
@@ -299,16 +382,22 @@
bare.org
barely-legal-teenb.com
barely-legald.com
+barelylegalgirlsex.com
+bargainfindsonebay.com
bargeld-tipp.de
basi-musicali.com
+basketball--betting.net
bast3.ru
batukaru\.[a-z]{2,}
+bbwclips.com
bccinet.org
bdsm-story.blogspot.com
beastiality-animal-sex-stories.com
beastiality-stories.net
beastsex-movies.com
beauty-farm.net
+bedding-etc.com
+belinking.com
belle-donne.biz
belle-ragazze.net
belle-ragazze.org
@@ -320,20 +409,36 @@
bellissimedonne.org
beltonen-logos-spel.com
benessere.us
+berwickfoundation.org
best-buy-cialis.com
+best-cell-phone-batteries.info
best-cialis-source.com
+best-deals-blackjack.info
+best-deals-casino.info
+best-deals-cheap-airline-tickets.info
+best-deals-diet.info
+best-deals-flowers.info
+best-deals-hotels.info
+best-deals-online-gambling.info
+best-deals-online-poker.info
+best-deals-poker.info
+best-deals-roulette.info
+best-deals-weight-loss.info
+best-e-site.com
best-gambling.biz
best-high-speed-internet.com
best-internet-bingo.com
best-pharmacy.us
best-result-fast.com
bestasianteens.com
+bestdims.com
bestdvdclubs.com
bestgamblinghouseonline.com
besthandever.com
bestiality-pics.org
bestialitylinks.org
bestits.net
+bestlowmortgagerates
bestonline-medication.com
bestonline-medication.net
bestonline-shopping.com
@@ -341,6 +446,7 @@
bet-on-horseracing.com
beverlyhillspimpandhos.com
beverlyhillspimpsandhos.com
+biexperience.org
big-black-butts.net
big-breast-success.com
big-hooters.net
@@ -351,10 +457,13 @@
bigmag.com.ua
bigmoms.com
bigtitchaz.com
+bigyonet.com
bildmitteilung.us
billigfluege-billige-fluege.de
+bingo-net.com
bio-snoop.com
birth-control-links.com
+bizhat.com
bj-cas.cn
bj-fyhj.com
bj-hchy.com
@@ -362,12 +471,18 @@
bjgift.com
bjkhp.com
bjxhjy.com
+bla5.com
black-amateur-cock.net
+black-dick-white-slut.com
+black-girls.blowsearch.ws
black-jack-4u.net
+black-jack-trx.com
blackbusty.com
blackjack-123.com
+blackjack-21.ws
blackjack-4u.net
blackjack-777.net
+blackjack-8.com
blackjack-dot.com
blackjack-homepage.com
blackjack-p.com
@@ -387,8 +502,10 @@
blonde-pussy.us
blonde-video.us
blonde-xxx.us
+blondes2fuck.com
blumengruss-onlineshop.de
blumenshop-versand.de
+bnetsol.com
body-jewelry.reestr.net
body-piercing.softinterop.com
bodyjock.com
@@ -396,24 +513,35 @@
bondage-story.blogspot.com
boobmorning.com
boobspost.com
+booktextone.com
boom.ru
+borindonaragara.com
+boysgonebad.net
+brazilbang.biz
breast-augmentation.top-big-tits.com
briana-banks-dot.com
british-hardcore.net
+bszz.com
bueroversand-xxl.de
bugaboo-stroller.com
build-penis.com
bulkemailsoft.com
burningcar.net
+burundonamagara.com
business-grants.org
+business-web-site.net
+businessgrants.biz
busty-models.us
bustyangelique.com
bustydustystash.com
bustykerrymarie.com
butalbital.org
+buy-2005-top.com
+buy-2005.com
buy-adult-sex-toys.com
buy-adult-toys.biz
buy-car-insurance-4-us.com
+buy-ceramics.com
buy-cheapest-lexapro-side-effects-noprescription.biz
buy-cialis.ws
buy-computer-memory.net
@@ -422,9 +550,17 @@
buy-laptop.biz
buy-rx-usa.com
buy-sex-toys.net
+buycheapcialis
buycheappills.net
+buyhgh
+buylipitor
+buyprilosec
buystuffpayless.com
+buyzocor
byronbayinternet.com
+c-start.net
+ca-america.com
+ca-s-ino.com
calendari-donne.com
calendari-donne.net
calendaridonne.com
@@ -432,6 +568,7 @@
callingcardchoice.com
cambridgetherapynotebook.co.uk
camemberts.org
+canadianlabels.net
cantwell2000.com
canzoni-italiane.com
canzoni-italiane.net
@@ -444,6 +581,7 @@
canzonisanremo.com
canzonistraniere.com
capital-credit-cards.com
+capquella.com
captain-stabbin-4u.com
captain-stabbin.blogspot.com
car-financing-low-rates.biz
@@ -451,6 +589,7 @@
car-rental-links.com
car-rental-search.com
car-rentals-2go.com
+card-games-tfx.com
cardsloansmortgages.com
caribbean-poker-web.com
carnalhost.com
@@ -465,27 +604,36 @@
cartonigiapponesi.com
cartonihentai.net
cartopia.com
+cas7.net
cash-advance-quick.com
cashadvanceclub.com
+casino-bet-casino.com
+casino-cash.net
casino-en-ligne.fr.vu
+casino-game-trx.com
casino-games-4-us.com
casino-games-i.com
+casino-gaming-trx.com
casino-in-linea.it.st
casino-jp.com
casino-on-net.com
casino-online-i.com
casino-online-on-line.com
casino-onnet-bonus.com
+casino-slot.ws
casino-wins.net
casino.150m.com
casino.menegum.co.uk
casino747.net
casinochique.com
+casinoequipmentsalesandrental.com
casinolasvegas-online.com
casinoplaces.net
+casinos-8.com
casinos-jp.com
casinos-plus.com
castingagentur2004.de
+catchathief.org
cbitech.com
ccie-ccnie.com
ccie130.com
@@ -495,32 +643,49 @@
ccnp130.com
cds-xxl.de
cdshop-guenstig.de
+celebrexonline.us
celebritylust.blog-city.com
celebritypics.ws
celebskin.com
celebtastic.com
cell-phone-accessories-dot.com
+ceramics-store.com
certificationking.net
certified-new-autos.com
certified-new-cars.com
certified-new-suvs.com
certified-used-cars.com
certified-used-suvs.com
+cesew.org
+charisma.dyndns.dk
chat-l.de
chatten.bilder-j.de
chauffeurtours.co.uk
cheap-adult-sex-toys.com
+cheap-airfare-airline-ticket.com
+cheap-celebrex-prescriptions.com
+cheap-christmas-gifts.co.uk
cheap-cigarettes.com
+cheap-laptop-notebook.netdims.com
cheap-online-pharmacy.org
cheap-pills-online.com
cheap-web-hosting-companies.com
+cheapacyclovir.com
+cheapcodeine.biz
cheapdrugpharmacy.com
cheaper-digital-cameras.uk.com
+cheaper-loans.eu.com
cheapest-pills-online.com
+cheapgenericsoma.info
+cheapsomaonline.biz
+cheaptabs.envy.nu
+checkmeds.com
cherrybrady.com
chickz.com
+chillout.bpa.nu
chinaaircatering.com
chinagoldcoininc.com
+chineseapesattack
chloesworld.com
choose-online-university.com
chrislaker.co.uk
@@ -531,6 +696,7 @@
cialis-weekend-pills.com
cialis.homeip.net
cialisapcalis.com
+cialisnetwork.com
cialisusa.bravehost.com
ciscochina.com
clamber.de
@@ -541,17 +707,25 @@
classifiche-musicali.org
classifichemusicali.com
claudiachristian.co.uk
+claypokerchips-claypokerchips.com
+cleanadulthost.com
cleannbright.co.uk
click-or-not.de
+click-poker.com
clophillac.org.uk
closed-network.com
+club-online-poker
club69.net
clubatlantiscasino.com
cmeontv.de
cnbjflower.com
+cngangqiu.com
cntoplead.com
+coed-girls.com
+coffee-delivered.com
college-girl-pic.com
college-links.net
+college-scholarships-grants.biz
combaltec.com
comeback.com
cometojapan.com
@@ -564,20 +738,39 @@
computer-onlinebestellung.de
computer-und-erotische-spiele-download.com
computerversand-xxl.de
+condodream.com
+condosee.com
+conjuratia.com
+consolidate-debt-usa.net
+consolidation-loans.com
container-partner.de
cool-extreme.com
+cool-mix.com
+cool-poker.com
coolp.biz
coolp.net
coolp.org
coresleep.com
+cosmeticsurgery.us
+cosmeticsurgery.us.com
couponmountain.com
cover-your-feet.com
+crazyfrog.wtf.la
+creamfilledholes.biz
+credit-cards-credit-cards-credit-cards.net
credit-factor.com
credit-links.net
+credit-loans-2005.com
credit-report-links.net
creditcardpost.com
+creditrepairsoft.com
+creditsharpie.com
+crepesuzette.com
+crescentarian.net
cum-facials.us
cumfiesta-4u.com
+cumfietavideos.com
+cumlogin.com
customer-reviews.org
cutpricepills.com
cyberfreehost.com
@@ -585,42 +778,59 @@
cyclo-cross.co.uk
cykanax.com
dad-daughter-incest.com
+daiiuvwx.com
dailyliving.info
+dallmayr.de
damianer.top-100.pl
danni.com
darest.de
+darkangelclan.com
+darzgx.com
datestop.net
dating-choice.com
dating-harmony.com
dating-online-dating.org
dating-service-dating.com
dating-services-dating-service.com
+dating999
dating999.com
davidtaylor.topcities.com
day4sex.com
de.hm
de\.sr
+debt-consolidation-i
+debt-consolidation-i.biz
debt-consolidation-kick-a.com
debt-consolidation-low-rates.biz
debt-consolidation-now-online.com
debt-disappear.com
+debt-help-bill-consolidation-elimination.com
debt-solution-tips.com
debtconsolidationfirm.net
+debtconsolidationloans
debtconsolidationusa.org
debtmanagementcompanyonline.com
dedichepersonali.com
deep-ice.com
deikmann.de
+dental-insurance-plan.freeservers.com
+dental-plan-source
dentalinsurancehealth.com
department-storez.com
+design4u.ws
desiraesworld.com
deutschlandweite-immobilienangebote.de
+devilofnights.net
+devilofnights.org
devon-daniels.com
devonanal.com
+dia-host.com
dianepoppos.com
diarypeople.com
+dick-deputy.com
diecastdot.com
diet-doctor.net
+diet-pills-now
dieta-dimagrante.net
dieta-mediterranea.net
dieta-zona.com
@@ -630,13 +840,18 @@
diethost.net
dieting-review.com
dietpage.net
+dietpatchformula.com
dietrest.com
diets-health.com
diets-plan.net
dietway.net
digital-projector.net
digitale-teile.de
+digitaltwist.co.uk
+direct-contact.com
+direct-deals-for-you.info
direct-tv-for-free.com
+direct-tv-online.com
directcarrental.com
directcti.com
directrape.com
@@ -647,10 +862,17 @@
discount-life-insurance.us
discountprinterrefill.com
discoveryofusa.com
+dish-network-w.com
+dish-network.org
+disigncn.com
disney-hentai.org
divorce-links.com
dlctc.com
+dnpose.com
dns110.com
+dns2008.cn
+dogfartmovieclips.com
+dogfartmovieclips.com
dogolz.de
domkino.com.ua
donne-belle.net
@@ -676,6 +898,8 @@
donnevogliose.net
donnevogliose.org
doo.pl
+doobu.com
+doorway-page-software
dostweb.com
dotcomup.com
downloadzipcode.com
@@ -697,42 +921,67 @@
dunecliffesaunton.co.uk
dvd-copier.info
dvd-home-theatre.com
+dvd-top-shop.info
dvd2.us
dwoq.com
dzwonki-polifoniczne-motorola.webpark.pl
e--pics.com
+e-best-poker.com
e-bookszone.com
+e-casino-bonus.com
e-cialis.net
e-credit-card-debt.com
+e-debt-consolidation-loans.com
+e-dental-insurance-plans
+e-dental-plans.com
e-discus.com
e-fioricet.com
e-free-credit-reports.com
+e-hoodia-gordonii.com
+e-lemonlaw.com
e-news.host.sk
e-online-bingo.com
e-order-propecia.com
+e-personalinjurylawyers
+e-personalinjurylawyers.com
+e-pills-buy.com
e-play-bingo.com
+e-poker-games.info
e-southbeachdiet.com
+e-top-pharmacy.com
e-tutor.com
e-virtual-casino.com
e40.nl
+easy-application-credit-cards.com
+easygo.hn.org
easyrecorder.com
easyseek.us
+ebanking.info
ebaybusiness.net
+ebloggy.com
+ebony-girls.angelcities.com
ebony-xxx.us
ebookers.co.uk
ecblast.com
eccentrix.com/members/casinotips
echofourdesign.com
+eclexion.net
ecologix.co.uk
+eddiereva.com
edietplans.net
+edmontgomeryministries.org
+edpowerspasswords.com
edrugstore.md
+education-line.com
edwardbaskett.com
effexor-web.com
effexor.cc
eggesfordhotel.co.uk
+egygift.com
einfach-wunschgewicht.com
elcenter-s.ru
eldorado.com.ua
+electricscooterland.com
electromark-uk.co.uk
electronics-info.com
elegant-candles.com
@@ -742,9 +991,11 @@
emmasarah.com
emmss.com
enacre.net
+enjoy-blackjack.com
enlargement-for-penis.com
envoyer-des-fleurs.com
eonsystems.com
+epaycash.com
erbium12.com
erosway.com
erotic-free.com
@@ -762,25 +1013,32 @@
event-kalendarium.de
everyvoice.net
evromaster.ru
+exclaim4creditcardprocessingmerchantaccount.com
exdrawings.com
exoticdvds.co.uk
exoticmoms.com
+expoze.com
extrasms.de
extreme-rape.org
extreme-sex.org
+f-z-a.com
f2g.net
f2s.be
fabida.net
fabulos.de
fabuloussextoys.com
facial-skin-care-center.com
+family-incest-stories.com
family-incest.us
familydiet.org
+famousppl.me.uk
fantasyfootballsportsbook.com
farm-beastiality.com
farmsx.com
+fast-cash-quick-money-easy-loan.com
fast-fioricet.com
fast-mortgage-4-u.com
+fasthost.tv
fat-cash.com
fat-lesbians.net
fat-pussy-sex.net
@@ -789,16 +1047,23 @@
fatwarfare.com
favilon.net
fda.com.cn
+fearcrow.com
+federalgovernmentgrants.net
+feidenfurniture.com
female-orgasms.org
+fidelityfunding.net
fielit.de
figa.nu
film-porno.us
+film456.com
+filthserver.com
final-fantasy-hentai.org
finance-world.net
finanzen-marktplatz.de
find-cheap-dental-plans.com
find-lesbian-porn.com
find-u-that-mortgage.com
+findbestpills
findbestpills.com
findbookmakers.com
finddatingsites.com
@@ -806,35 +1071,52 @@
findyouruni.com
finger-bobs.com
fioricet-dot.com
+fioricet-online-here.com
fioricet-web.com
fioricet.batcave.net
fioricet.bravehost.com
fioricet.st
+fioricet4u
+first-poker.com
first-time-story.blogspot.com
+firstchoicebanksandpremiercredit.com
+firsttimeaddition.com
fishoilmiracle.com
fitness-links.net
fitnessx.net
+flafeber.com
flatbedshipping.com
fleshlight.org
+fleshlight.ro
flexeril-web.com
flirt08.de
flowertobj.com
fly-sky.com
+football--betting.net
football-betting-nfl.com
forceful.de
+foreskin-restoration.net
forex-online-now.com
forex.inc.ru
+forexintroducer.com
forlovedones.com
+fortisenterprises.co.uk
foto-gay.us
foto-porno.us
foto-porno.ws
frangelicasplace.org
frankpictures.com
+freak-view.com
+freakycheats.com
+free--online--poker
free--online-poker.com
free--online-poker.us
free-adult-chat-room.com
free-adult-check.com
+free-blackjack-game.us
free-britney-spears-nude.biz
+free-casino-games
+free-casino-games-000
free-debt-consolidation-online.us
free-fast.net
free-games-links.com
@@ -843,19 +1125,25 @@
free-horoscopes.biz
free-incest-stories-site.com
free-net-sex.com
+free-online-poker
free-paris-nikki-hilton.blogspot.com
free-poker-download-i.com
+free-poker-great-value.com
free-poker-rooms.us
free-satellite-tv-directv-nocable.com
free-satellite-tv-now.com
free-teens-galleries.com
-free-texas-hold-em.biz
-free-texas-holdem-poker.us
free-texashold-em.us
free-texasholdem.us
+free-traffic-generation.com
+freeadult.de
freedvdplayer.cjb.net
freeeads.co.uk
+freegovmoney.net
+freegovmoney.us
freehostingpeople.com
+freehustlersex.com
+freeminimacs.com
freenetshopper.com
freenudegallery.org
freepicsdaily.com
@@ -867,23 +1155,35 @@
freewhileshopping.com
freshsexhosting.com
friko.pl
+fsearch.dtdns.net
fuck-animals.com
+full-access.net
fumetti-porno.org
fumettiporno.org
furrios.de
furry-kinks-looking.com
furry-kinks-looking.net
+future-2000.net
+g4h5.com
+gaggingwhores.net
+gaggingwhores.org
gagnerargent.com
+gainmoresize.com
gals4all.com
galsonbed.com
gamble-on-football-online.com
+gambleguru.net
gambling-a.us
+gambling-card.ws
+gambling-casinos-trx.com
gambling-homepage.com
gambling\Sgames.cc
gamblingguidance.co.uk
gamefinder.de
games-advanced.de
gang-rape.org
+gangbangbusgallery.com
+gargzdai.net
garment-china.com
gartenshopper.de
garthfans.co.uk
@@ -894,10 +1194,13 @@
gay-nude.us
gay-sex-videos.com
gay-twinks-sex.com
+gay1ncest.com
+gayfamilyincest.net
gayfunplaces.com
gays-porno-men-twinks-boys-sex.biz
gays-sex-gay-sex-gays.us
gayx.us
+gb.com
gdgc.org
gelago.de
gem2.de
@@ -912,6 +1215,9 @@
geocities.com/constpolonskaalniko7
geocities.com/forestavmiagdust
geocities.com/free_satellite_tv_dish_system
+geocities.com/gehentaiqrst
+geocities.com/gematureqrst
+geocities.com/gerapeqrst
geocities.com/ofconvbdemikqfolium
geocities.com/pashkabandtvcom
geocities.com/pautovalexasha_kagal
@@ -925,6 +1231,7 @@
get-hardcore-sex.com
get-insurance-quotes.com
get-satellite-tv-dish.com
+get-your-dish-tv.info
get-zoo.com
getaprescription.net
getdomainsandhosting.com
@@ -933,12 +1240,14 @@
getrxscripts.biz
getstarted24x7.net
getyourlyrics.com
+gfind.de
ghettoinc.com
giantipps.de
gifs-clipart-smiley.de
giochi-hentai.com
giochi-online.us
giochix.com
+girls-get-crazy.org
girlshost.net
give-u-the-perfect-mortgage.com
giveramp.com
@@ -946,36 +1255,63 @@
global-verreisen.de
globalwebbrain.com
glory-vision.com
+gloryhole-girls.angelcities.com
glucophagepharmacy.com
+goapplyonline.com
godere.org
+godwebdesign.com
gogito.com
+gogof-ck.com
gojerk.com
goldpills.net
gomvents.com
gongi.pl
goodlife2000-geheimtipp.com
goodsexy.com
+goodtv.cn
+google163.net
google8.net
+gorilka.atspace.com
gotooa.com
+gotsw.net
+gourmondo.de
+govermentgrants.net
+government--grant.com
+government-federal-grants.com
government-grants.org
government-grants.ws
+governmentalgrants.com
+governmentfederalgrants.com
+governmentgrants.tv
+governmentgrants.ws
+governmentgrantsresources.com
grannypictgp.com
grannysexthumbs.com
+grants.biz
+grantseekerpro
great-cialis.com
+great-dish-tv-deals.info
greatnow.com
greecehotels-discount.com
green-tx.com
+greenwood.ddns.ms
group-eurosex.com
+growtech.cn
guardami.org
guenstige-krankenversicherung.com
guenstige-onlineshops.de
guenstige-sportartikel.de
guenstige-versicherungstarife.de
+gunit.gotdns.com
guttermag.com
+hair-loss-cure-x.com
hair-loss-cure.net
hairy-pussy-sex.net
hallo-tierfreund.de
hand-job.us
+handjoblessons.org
+handmade2000.co.uk
+handsm.servehttp.com
handwerksartikel-xxl.de
handy-klingeltoene.eu.tp
handysprueche.de
@@ -993,14 +1329,20 @@
hardcore-sex.bz
hardcore-video.us
hardcorecash.net
+hasslerenterprises.net
+hasslerenterprises.org
hautesavoieimmobilier.com
hchcinc.com
+hdic.net
+hdic.org
headachetreatment.net
health-pills-online.com
health-pills.net
healthmore.net
healthrules.org
heartbeatofhealing.org
+helpful-forum.com
+helpful-pills-blog.com
hentai-anime.us
hentai-gratis.us
hentai-hard.com
@@ -1012,10 +1354,16 @@
hentaix.net
hentaixxx.us
hentay.us
+herbal-source.net
+hermosa.us
herpies.net
heydo.com
+hghadvisor.com
+hghplanet.com
hgxweb.de
+hi-finder.com
high-risk-merchant-account.org
+highprofitclub.com
hilton-nicky-paris.blogspot.com
hion.cn
hit-logo-klingelton.com
@@ -1028,19 +1376,32 @@
hits-logos-games.com
hits-logos-klingeltone.com
hitslogosgames.com
+hlopci.w5.pl
hobbs-farm.com
hold-em-big.com
hold-pok.com
+holdem-texaspoker.com
+holding.errorworld.org
+home-design.ws
+home-equity-loans-mortgage-refinancing.com
+home-loans-inc.com
+home-style.ws
home-videos.net
+home.pages.at
home\.ro\b
homelivecams.com
homenetworkingsolutions.co.uk
+hometeaminspection.net
+hometeaminspection.org
+hoodia--gardonii.com
+hoodia.belleity.com
horny-honey.com
horny-world.com
hornymoms.net
hornypages.com
horoskop-auswertung.de
horse-racebetting.com
+horse-racing--betting.net
horse-sex.ws
hostingplus.com
hostultra.com
@@ -1055,15 +1416,23 @@
hotfunsingles.com
hotsexys.com
hotusa.org
+houseofsevengables.com
how-quit-smoking.com
+how-to-play-poker-quick.com
+hq-pictures.org
hs168.com
+hswin.com
+htmldiff.com
huazhangmba.com
humangrowthhormone.org
hunksandbabes.com
hustler.bz
+hustlerbarelylegalteen.com
hustlerw.com
+hxlll.net
hyper-sex.com
hypnobabies.co.uk
+i--cialis.net
i-black-jack.com
i-butalbital-fioricet.com
i-buy-mortgage.com
@@ -1085,23 +1454,18 @@
i-play-poker.com
i-skelaxin.com
i-soma.net
-i-texas-hold-em.biz
-i-texas-hold-em.com
-i-texas-hold-em.info
-i-texas-hold-em.us
-i-texas-holdem.biz
-i-texas-holdem.com
-i-texas-holdem.info
-i-texas-holdem.us
i-university-guide.com
i-wellbutrin.com
i-will-find-the-best-mortgage-lead.com
i-win-bingo.com
idebtconsolidation.org
+idp4u.com
ifreepages.com
+iipgoulkdfghj.com
illegalhome.com
illegalspace.com
im-naked.com
+imagenes-tops.com.mx
imess.net
imitrex-web.com
immagini-hentai.org
@@ -1111,6 +1475,7 @@
immobilienmakler-l.de
immobilienmarkt-grundstuecke.de
immobilierdessavoie.com
+imobissimo.com
impotence-rx.biz
in-the-vip.org
inc-magazine.com
@@ -1127,6 +1492,7 @@
incest-videos-collection.com
inceststories.ws
incredishop.com
+incsx.com
indian-sex-porno-movies-stories.com
indiasilk.biz
indiasilktradition.com
@@ -1134,21 +1500,31 @@
industrialresource.biz
inescudna.com
inexpensiverx.net
+infocenter-crm.com
inforceable.com
inforceables.com
+ingyensms.net
+ingyensms.org
innfg.de
insatiablepussy.com
+inside.afraid.org
+instant-quick-money-cash-advance-personal-loans-until-pay-day.com
+instantsatellite.com
insurance-quotes-fast.com
+insurancecompanies4you.com
insurancehere.net
int-fed-aromatherapy.co.uk
inter-ross.ru
international-candle-shop.com
international-cheese-shop.com
+internet-meds.biz
+internet-merchant-account-pro.com
internet-poker-online-4-u.com
internette-anbieter.de
interracial-sex.ws
inthevip-4u.com
inthevip-sex.com
+intimplace.com
intymnie.com
inviare-mms.net
invio-mms.us
@@ -1156,26 +1532,40 @@
ipharmacy.com # Catchall for many spam sites
ipmotor.com
ipsnihongo.org
+ipupdater.com
irianjaya.co.uk
+irs-us.net
+isacommie.com
+iservice.eu.com
isparkl.com
-it.tt
itgo.com
iul-online.de
iwebbroker.com
jack-x.com
jade.bilder-i.de
japan-partner.com
+jenniferconnor.com
jewelry4navel.com
+jfcadvocacy.net
jinlong.co.uk
+jmsimonr.com
job-interview-questions-tips.com
+jobsearchlegal.com
johnhowesatty.com
+johnhuron.com
jokeria.de
jordanand.topcities.com
+josephlied.com
judahskateboards.com
+juega-al-casino.com
juliamiles.co.uk
jungfrauen-sex.com
+junyuan.com.cn
justasex.com
+jytouch.com
kantorg.h10.ru
+kapsociety.org
+kardtoons.co.uk
karibubaskets.com
karmicdebtconsolidation.com
kcufrecnac.com
@@ -1184,9 +1574,11 @@
kewl-links.com
kewler.net
kinggimp.org
+kinky-teen-videos.com
kinkyhosting.com
kiranthakrar.co.uk
kleinkinder-shop.de
+klik-search.com
klingeltoene-handylogos.de.be
klingeltone-logo.com
klitoris.ca
@@ -1196,6 +1588,7 @@
kontaktanzeigen-bild.de.ms
kontaktlinsen-partner.de
kostenlose-sexkontakte.org
+krantas.org
kraskidliavas.ru
kredit-ratenkredit-sofortkredit.de
kredite-online.de.ms
@@ -1203,8 +1596,10 @@
kredite-sofortzusage.de
kreditkarten-sofort.de.ms
kupibuket.ru
+kyed.com
kyfarmhouse.org
lablog.biz
+lacetongue.com
lach-ab.de
lakesideartonline.com
lambethcouncil.com
@@ -1217,18 +1612,23 @@
lasvegas-real-estate.net
lasvegasrealtor.com
lasvegastourfinder.com
+latina-hot-girls.com
latina-sex.ws
lavalifedating.com
leadbanx.com
+learnhowtoplay.com
+lebonpost.com
lechery-family.com
legalblonde.com
lesbian-girl.us
lesbian-sex-porn-pics-stories.com
lesbichex.com
+lesbo-rama.com
leseratten-wunderland.de
letemgo.de
leveltendesign.com
lexapro-web.com
+lexfinance.com
lgt-clan.ru
life-insurance-advisor.com
lifeinsurancefinders.com
@@ -1240,17 +1640,25 @@
linuxwaves.net
lipitordiscount.biz
lipitordiscount.com
+lir.dk
+lisaber.com
list1st.com
listbanx.com
live-casino.com
livetexasholdem.com
+livetexasholdem.com
+livetexasholdem.com
+livetexasholdem.com
livetreff.tv
livevents.de
+lizardofoz.com
+lizzie.dyndsl.com
lizziemills.com
loan-king.com
loan-superstore.com
loaninfotoday.com
loans-4all.com
+loans-no-fax.com
loans.de.vu
locationcorse.free.fr
logo-beltonen.com
@@ -1281,14 +1689,19 @@
logos-tone.com
logosik.pl
logotyper-mobil.com
+lolika.net
longslabofjoy.com
lookforukhotels.com
loraxe.com
+low-low-rates.com
lowclass.de
lowcost.us.com
lowest-rates-mortgages.com
+lowinterestratecreditcards.net
luffassociates.co.uk
luxus-gourmetartikel.de
+lvcpa.net
+lvcpa.org
lvrealty.net
lynskey-admiration.org.uk
lyriclovers.com
@@ -1299,12 +1712,21 @@
majorapplewhite.info
male-enlargement.com
mallorycoatings.co.uk
+maloylawn.com
+mandysdiary.biz
+mandysdiary.ws
manga-free.net
manga-free.org
manga-porn.us
manga-x.biz
manga-xxx.org
+manufacturers-blog.com
+march--madness.biz
+march--madness.info
+march--madness.org
+marcomdeal.com
marshallsupersoft.com
+marshallyachts.org
marteq-on.com
match-me-up.com
mature-big-tits.net
@@ -1312,13 +1734,21 @@
mature-sex-moms-porn.com
matureacts.com
maturefolk.com
+maturetours.com
maxigenweb.com
mbgeezers.com
+mcdortaklar.com
+mcfimortgage.com
medcenterstore.com
mediaaustralia.com.au
+mediavisor.com
+medical4order.com
medications-4all.com
medicine-supply.com
+medicinecheaper.com
+medicinetrail.org
meds-pill.com
+medweightloss
medyep.com
mega-spass.com
megapornstation.com
@@ -1332,12 +1762,20 @@
menguma.co.uk
menguma.com
mens-health-pills.com
+menservers.com
menzyme.com
merditer.com
+merseine.nu
mesothelioma-asbestos-help.com
mesothelioma-health.com
+mesothelioma.net
metroshopperguide.com
+mettle.com.cn
+michigan-attorney.lbgo.com
micrasci.com
+microsoft-com.us
+middlecay.net
+middlecay.org
midget-porn-sex.com
mietangebote-domain.de
migraine-relief.com
@@ -1346,33 +1784,46 @@
milf-hardcore.net
milf-rider.us
milfporn.org
+mingholee.com
misterwolf.net
mmorpg-headlines.com
mmsanimati.com
mneuron.com
mobile-repondeur-logo.com
mobile-repondeurs-logos.com
+mobilefamilydental.com
mobilequicksale.com
mobilesandringtones.com
mode-domain.de
mode-einkaufsbummel.de
moltobene.ru
+monavaletoys.com
+money-cash-loans.com
money-room.com
moneybg.com
montaguefineart.com
mookyong.com
+mor-lite.net
+mor-lite.org
+moris-dada.com
mortage-4all.com
mortgage-info-center.com
mortgage-rates-guide.net
+mortgagemarketinginc.com
+mortgagequestaz.com
+mortgagerates4all.com
mortgages-links.net
mortloan.com
mostika.us
mother-son-incest-sex.net
motonet.pl
movies6.com
+mp-forum.com
mp3download.bz
mp3x.biz
mpeg2pci.com
+mrgoicoechea.com
+mrn.vip.sina.com
mrpiercing.com
multipurpose-plants.net
multiservers.com
@@ -1383,6 +1834,7 @@
musica-karaoke.net
musica-mp3.biz
musicamp3.us
+musicbox1.com
musiccheap.us
musicenergy.com
muxa.ru
@@ -1395,12 +1847,14 @@
mybestcasinos.net
mybestclick.com
mycasinohome.com
+mycheapcigstore.com
mycialispharmacy.com
mydatingagency.com
mydietdoctor.com
myeuropehotels.com
myfavlinks.de
mygenericrx.com
+myrice.com
myrtlejones.com
myslimpatch.com
mystify2001.com
@@ -1411,6 +1865,7 @@
naked-pussy.us
naked-womens-wrestling-league-dvds.com
naked-womens-wrestling-league-videos.com
+nakedboysfirsttime.com
nancyflowerswilson.com
narod.ru
nasty-pages.com
@@ -1418,18 +1873,24 @@
natural-barleygreen.com
natural-breasts-enhancement.net
naturalknockers.net
+nehrucollege.org
neiladams.org.uk
net-mature.com
net-von-dir.de
-netfirms.com
+netdims.com
netizen.org
+netleih.de
netlogo.us
netsx.org
neurogenics.co.uk
new-cialis.com
+neweighweb.net
+neweighweb.org
newfurnishing.com
newgallery.co.uk
+newmail.ru
newsnewsmedia.com
+newtruths.com
newxwave.com
nfl-football-tickets.biz
nice-pussy.us
@@ -1441,6 +1902,7 @@
nicolepeters.com
nieruchomosci.biz.pl
nifty-erotic-story-archive.blogspot.com
+niibacca.afraid.org
nikkiwilliams.info
njhma.com
njunite.net
@@ -1457,73 +1919,109 @@
noslip-picks.com
notsure.de
novacspacetravel.com
+now-hiringsluts.com
nr-challenges.org
nude-black.us
+nude-celebrity-dvd.com
nude-movies.us
nude-teens.name
nude-video.us
nudevol.us
nutritional-supplements.ws
nutritionalsupplementstoday.com
+nutzu.com
nwwl-dvds.com
nwwl-videos.com
+nylonex.com
nz.com.ua
+odrducmibedfghj.com
+officexl.de
+officezl.com
officialdarajoy.com/wwwboard
officialdentalplan.com
officialsatellitetv.com
offseasonelves.com
ohamerica.org
okuk.org
+old-sexy-sluts.com
+olderr.4t.com
oldgrannyfucking.com
+oliviagadamer.com
omega-fatty-acid.com
+on-line-casino-deutsch.com
on-line-casinos-online.com
on-line-casinos-online.net
on-line-degree.org
on-line-kasino-de.com
on-pok.com
+one-blackjack.com
one-cialis.com
one-debt-consolidation.com
+one-poker-online.com
one-propecia.com
one-soma.com
onepiecex.net
oneseo.com
onexone.org
+online-----poker
+online--blackjack.info
online--pharmacy.us
+online--sports-betting.com
online-auction-tricks.com
+online-background-check.biz
+online-black-jack-download.com
online-blackjack-online.com
online-buy-plavix.com
online-credit-report-online.com
+online-dating-com.com
online-dating-singles-service.com
online-deals99.com
online-dot.com
online-escort-service.com
online-flexeril.com
+online-gambling-123.biz
+online-gambling-123.us
online-gambling-online.org
online-games-links.net
online-games24x7.com
online-games24x7.net
+online-generics-store
+online-job-source.com
online-medications24x7.com
online-pharmacy-24x7.net
+online-pharmacy-online-pharmacies.com
+online-pharmacy-order.com
online-photo-print.com
+online-poker--tips.com
+online-poker-200
+online-poker-333.com
online-poker-555.com
+online-poker-888
online-poker-a.com
online-poker-big.com
+online-poker-bonus.us
online-poker-free.com
online-poker-guide.info
online-poker-kick-butt.com
online-poker-net.com
+online-poker-online-poker
online-poker-special.com
+online-poker-top-rated.com
online-prescription-pharmacy.com
online-prescription.st
online-prescriptions-internet-pharmacy.com
-online-texas-hold-em.net
-online-texas-hold-em.us
-online-texasholdem.us
+online-propecia-buyer.com
+online-sports--betting
+online-sports-betting-source
+onlinedegreehq.com
+onlinegamingassociation.com
+onlinegamingassociation.com
onlinehgh.com
onlinepharmacy2004.net
onlinepoker-dot.com
onlinepoker-i.com
onlineshop.us.com
+onlineslotsarcade.com
onlinesmoker.com
opensorcerer.org
operazione-trionfo.net
@@ -1538,6 +2036,7 @@
ottawavalleyag.org
our-planet.org
ourhealthylife.net
+ourtownhelps.org
outoff.de
overseaspharmacy.com
ovulation-kit.com
@@ -1545,13 +2044,20 @@
ownsthis.com
p-reise.de
p5.org.uk
+p6.org.uk
p7.org.uk
p8.org.uk
p9.org.uk
+pacific-poker-top-place.com
pages4people.com
+pagetwo.org
pai-gow-keno.com
+painkillersonline.biz
paisleydevelopmentassociation.org
+paololinks.porkyhost.com
paperscn.com
+paramountseedfarms.net
+paramountseedfarms.org
paris-and-nicky-hilton-pictures.blogspot.com
paris-hilton-video-blog.com
paris-hilton-videos.biz
@@ -1559,29 +2065,47 @@
paris-naked-hilton.blogspot.com
paris-nicky-hilton.blogspot.com
paris-nikki-hilton.blogspot.com
+parkviewsoccer.net
+parkviewsoccer.org
partnersmanager.com
partnersuche-partnervermittlung.com
+party-poker-e.com
+party-poker-leading-site.com
+party-poker-ltd.com
party-poker-player.com
+party-poker-x
partybingo.com
+partypoker-i
+partypoker-i.us
partypoker.com
partypokeronline.org
passende-klamotten.de
passwordspussynudity.com
pastramisandwich.us
pasuquinio.com
+payday-cash-loans
+payday-loan
payday-loan-payday.com
+paydayl0an.com
+paylesspaydayloans.com
+payment-processing.com
paysites.info
pc-choices.com
pcdweb.com
peepissing.com
penelopeschenk.com
+penilestretch.com
penis-enlargment.net
penisimprovement.com
penisresearch.com
perfect-dedicated-server.com
perfect-mortgage-lead-4-u.com
+perkyoneplace.com
personal-finance-tips.com
+personal-injuries-law.com
+personal-injury-lawyer.us.com
personalads.us.com
+personales.com
personals-online-personals.com
petlesbians.com
petroglyphx.com
@@ -1590,28 +2114,43 @@
pharmacy-links.net
pharmacy2003.com
pharmacyprices.net
+philippestarckwatches.co.uk
phone-cards-globe.pushline.com
phono.co.il
photobloggy.buzznet.com
+php5.sk
phrensy.org
+picnic-basket.more.at
pics--movies.com
+pics-db.com
pics-porn.org
pics-stories.com
+pics-videos.net
picsfreesex.com
picsteens.com
+pictures-and-videos.com
+pictures-archive.com
pictures-movies.net
+pictures-movies.org
+pictures6.com
piercing-auswaehlen.de
piercing-magic.com
piercingx.com
+piggi.descom.es
pill-buy.com
pillblue.com
pillchart.com
+pillexchange.net
+pillfever.com
+pillgrowth.com
pillhub.com
pillhunt.com
pillinc.com
+pillmarket.net
pills-for-penis.com
pillsbestbuy.com
pillsdomain.com
+pillsking.com
pillslim.com
pillsupplier.com
pilltip.com
@@ -1620,16 +2159,19 @@
pimpspace.com
pinkzoo.com
piranho.com
+pisangrebus.com
pj-city.com
planetluck.com
+plasticmachinery.net.cn
play-7-card-stud-poker.com
play-7-card-stud-poker.us
play-cash-bingo-online.com
+play-online-poker-z.com
+play-partypoker.us
play-poker-i.com
play-poker-onlie-kick-ass.com
-play-texas-hold-em.us
-play-texas-holdem-today.net
-play-texas-holdem.us
+play-poker-online-z.com
+play.eu.com
playandwin777.com
playandwinit777.net
player-tech.com
@@ -1638,29 +2180,49 @@
playnowpoker.com
playweb.blogspot.com
plygms.de
+pocketsound.org
+pok7.com
pokemon-hentai.com
pokemon-hentai.org
pokemonhentai.net
pokemonx.biz
+poker-8.com
+poker-888-e.com
+poker-e-win.com
+poker-e-wins.com
poker-games-bonus.com
+poker-games-top-ranked.com
+poker-games.cjb.net
+poker-hands-secrets.com
poker-homepage.com
poker-magic.org
+poker-me-up.com
+poker-on-web.com
+poker-online-anytime.com
+poker-rooms-777
poker-rooms-777.com
-poker-texas-hold-em.biz
-poker-texas-hold-em.info
-poker-texas-hold-em.us
-poker-texas-holdem.us
+poker-rules-easy-4u.com
+poker-tables-best-deals.com
poker-w.com
+poker-wsop-2005.com
+poker777game
+poker79.com
+pokerorg.net
pokerpage.biz
pokerpartnership.com
+pokerqu.com
+pokerweb.be
polifoniczne.org
polyphone.us
pompini.nu
+popwow.com
+porevo.lookin.at
porn-4u.net
porn-dvds-dot.com
porn-house.us
porn-sites-list.com
porn-stars.org
+porn-stud-search.org
pornevalution.com
porngrub.com
pornlane.com
@@ -1683,21 +2245,27 @@
preteen-young.net
prettypiste.com
princeofprussia.org
+printerinkseller.com
prism-lupus.org
privacy-online.biz
private-krankenversicherung-uebersicht.com
private-network.net
privatediet.com
pro-collegefootballbetting.com
+pro-rolex-replica-watches
+pro-rolex-replica-watches.com
product-paradise.com
projector-me.com
prom-prepared.com
promindandbody.com
+propecia-depot.com
propecia-for-hair-loss.com
propecia-for-hair-loss.net
propecia-info.net
propecia-store.com
propecia.bravehost.com
+propeciaonline.biz
+propeciapower.com
prosearchs.com
pryporn.com
pseudobreccia60.tripod.com.ve
@@ -1705,62 +2273,104 @@
psites.net
psites.org
psites.us
+psxtreme.com
+psychexams.net
+psychexams.org
punksongslyrics.com
+puppyduk.com
pureteenz.com
pushline.com
pussy-cum.us
pussy-d.com
pussy-movies.us
+qinsi.com
qqba.com
quangoweb.com
quick-drugs.biz
quick-drugs.com
quickdomainnameregistration.com
quickie-quotes.com
+r-300.com
+r-3100.com
+r-400.com
+r-4100.com
+r00m.com
racconti-gay.org
radsport-artikel.de
raf-ranking.com
ragazze.bz
rampantrabbitvibrator.co.uk
+randyblue.info
randysrealtyreview.com
+rape--stories
rape-fantasy-pics.com
rape-stories.biz
+rapestoriespics
rapid-merchant-account.com
+rapid.myserver.org
ratenkredit-center.de
ratenkredit-shop.de
raw-pussy.us
rbfanz.com
+real-online-poker
real-sex.us
+realestateslaws.com
+realisticforeignpolicy.org
reality-xxx.biz
+reallyhot.org
+realmilfgangbang.biz
realtickling.com
rebjorn.co.uk
redcentre.org
+redi.tk
refinance-mortgage-home-equity-loan.com
reggaeboyzfanz.com
registerxonline.com
+registrarprice.com
reglament-np.ru
reisen-domain.de
relievepain.org
+rent-games-movies.com
+rental-2004.com
rentalcarsplus.com
+repair-restore-bad-credit-report-identity-theft.com
+repaircreditonline.net
repondeurs-logos-mobile.com
republika.pl
+reservedining.net
+reservedining.org
restaurant-l.de
+rethyassociates.net
+rethyassociates.org
reviewonlinedating.com
+rhinoslinks.com
+rhinosthumbs.com
ricettegolose.com
richshemales.com
+rifp.org
+rightdebt.com
ringsignaler-ikon-spel.com
ringtone-logo-game.com
ringtoner-logoer-spill.com
ringtonespy.com
rittenhouse.ca
+rmg.com.cn
+robinson-entertainment.com
+robosapiensource
+robosapiensource.com
roboticmilking.com
romane-buecher.de
romeo-ent.com
+ronnieazza.com
+rossmann.de
roulette---online.com
roulette-w.com
royaladult.com
royalfreehost.com/teen/amymiller
+royalmailhotel.com
ru21.to
+ruitai88.com
+rulo.biz
rx-central.net
rx-lexapro.biz
rx-pills-r.us
@@ -1771,6 +2381,7 @@
rydoncycles.co.uk
s-fuck.com
s-sites.net
+safecreditonline.com
sailor-moon-hentai.org
sailor-moon-hentai.us
salcia.co.uk
@@ -1781,16 +2392,23 @@
salute-igiene.com
salute-malattie.com
salute-malattie.net
+samiuls.com
+sandhillaudio.com
sandrabre.de
+sapphicerotica.biz
sarennasworld.com
+sat-direct.net
satellite-direct-for-you.com
satellite-network-tv.com
+satellite-tv.cjb.net
satellite.bravehost.com
satellitetv-reviewed.tripod.com
+satellitetvboutique.com
saveondentalplans.com
saveonpills.net
sbdforum.com
sbt-scooter.com
+sc10.net
scarica-mp3.biz
scarica-mp3.com
scarica-musica-mp3.org
@@ -1807,17 +2425,26 @@
schmuck-domain.de
scottneiss.net
se-traf.com
+se24h.com
search-1.info
search-engine-optimization-4-us.com
+search-milf.com
search722.com
+searchinsurance.net
+searchtypo.com
secureroot.org
security-result.com
+sedonaretreat.org
+seekartist.com
+seeker-milf.com
seitensprung-gratis.com
selectedsex.com
selena-u.ru
selten-angeklickt.de
sempo-tahoe.com
+senior.mine.nu
seoy.com
+servepics.com
sesso-gratis.cc
sesso-online.net
sessoanalex.com
@@ -1838,6 +2465,7 @@
sex-toys-next-day.com
sex4dollar.com
sexbrides.com
+sexchat.ccx
sexcia.com
sexe.vc
sexglory.com
@@ -1850,6 +2478,7 @@
sexshop-sexeshop.com
sexshop.tk
sextoysportal.com
+sextoyssexvideos.com
sexual-shemales.com
sexual-story.blogspot.com
sexushost.com
@@ -1868,11 +2497,14 @@
shadowbaneguides.net
shannon-e.co.uk
shareint-store.com
+shemale-cum-tgp.com
+shemale-girls.com
shemalesex.biz
shemalesland.com
shemalezhost.com
shemalki.com
shfx-bj.com
+shhilight.com
shirts-t-shirts.com
shop-opyt.com
shop.tc
@@ -1881,22 +2513,32 @@
shoppingideen-xxl.de
shoppyix.com
showsontv.com
+sicarrow.co.uk
+silky-smooth-pussy.com
+simon-scans.com
simple-pharmacy.com
simplemeds.com
simpsonowen.co.uk
+sindyhalliday.com
sinfree.net
site-mortgage.com
sitesarchive.com
siti-porno.us
ski-resorts-guide.com
skidman.com
+slatersdvds.co.uk
slng.de
slot-machines-slots.com
slotmachinesguide.net
+slots-8.com
slots-w.com
+slotsjockey.com
slowdownrelax.com
slut-wife-story.blogspot.com
slutcities.com
+small-business-grants.biz
+smallbusinessgrants.biz
+smart-debt-consolidation-and-credit-services.com
smartdot.com
smartonlineshop.com
smerfy.pl
@@ -1914,6 +2556,7 @@
software-einkaufsmarkt.de
software-linkliste.de
software-review-center.org
+software.thedir.net
softwaredevelopmentindia.com
soittoaanet-logot-peli.com
sol-web.de
@@ -1921,6 +2564,7 @@
soma-solution.com
soma-web.com
soma.st
+somacheap
somaspot.com
sommerreisen-2004.de
sonderpreis.de.com
@@ -1943,23 +2587,34 @@
sonneries.fr
sorglos-kredit.de
soulfulstencils.com
+southbeachdiet.us.com
southbeachdietrecipe.biz
spacige-domains.de
spannende-spiele.de
spassmaker.de
+speedsurf.to
speedy-insurance-quotes.com
spermincreasingpills.com
spiele-kostenlose.com
spiele-planet.com
+spoodles.com
sportartikel-auswahl.de
sportecdigital.com
+sportingcolors.org
sportlich-chic.de
sports---betting.com
+sports-betting-
+sports-betting-a.com
sports-inter-action.com
+sportsbettingexpert.com
+sportsorg.biz
+sportsparent.com
spp-net.de
spy-patrol.com
+spyshots.bpa.nu
spyware-links.com
staffordshires.net
+staplethis.de
starpills.com
statusforsale.de
steelstockholder.co.uk
@@ -1968,15 +2623,36 @@
stevespoliceequipment.com
stfc-isc.org
sting.cc
+stmaryonline.org
stock-power.com
stolb.net
stop-depression.com
+stop-snoring.crpublish.com
stopp-hier.de
stopthatfilthyhabit.com
stories--archive.com
stories-adult.net
stories-inc.com
+stories-on-cd.net
+stories-on-cd.org
+storiespics
+storiespics.game-host.org
+storiespics.game-server.cc
+storiespics.gotdns.com
+storiespics.gotdns.org
+storiespics.ham-radio-op.net
+storiespics.homedns.org
+storiespics.homeftp.net
+storiespics.homeftp.org
+storiespics.homeip.net
+storiespics.homelinux.com
+storiespics.homelinux.net
+storiespics.homelinux.org
+storiespics.homeunix.com
+storiespics.homeunix.net
+storiespics.homeunix.org
striemline.de
+stripclubexposed.info
strivectinsd.com
stunningsextoys.com
styrax-benzoin.com
@@ -1991,16 +2667,25 @@
suonerieloghix.com
suoneriex.net
suoyan.com
+super-bowl-bet.biz
super-celebs.com
super-cialis.com
+superbowl--betting.com
+superdolphins.org
superpornlist.com
surfe-und-staune.de
susiewildin.com
sutra-sex.com
+suttonjames.net
+suttonjames.org
svitonline.com
+swedenet.com
+swedenetwork.com
sweet-horny.com
sweethotgirls.com
+sweetteenbodies.com
swinger-story.blogspot.com
+swingersunidos.com
sydney-harbour.info
sylphiel.org
sylviapanda.com
@@ -2014,6 +2699,7 @@
tanganyikan-cichlids.co.uk
tapbuster.co.uk
taremociecall.com
+targetindustries.net
targetingpain.net
tattoo-entwuerfe.de
tatuaggi-gratis.com
@@ -2022,7 +2708,15 @@
tatuaggi.cc
tatuaggi.us
tatuaggitribali.com
+tclighting.net
+tclighting.org
tdk-n.com
+teambeck.org
+teamregules.com
+tecrep-inc.net
+tecrep-inc.org
+teddbot.com
+teddnetwork.com
teen-babes.us
teen-boys-fuck-paysite.com
teen-d.com
@@ -2032,10 +2726,17 @@
teen-sex-porn-models.com
teen-video.us
teen-xxx.us
+teenagerzone.com
+teenbrazil.info
+teenbrazil.ws
+teens.wox.org
teensluts.org
+teentopanga.name
teenxxxpix.net
telechargement-logiciel.com
terminator-sales.com
+terra.es/personal2/dee7boquo
+terra.es/personal2/markus69
testi-canzoni.com
testi-canzoni.net
testi-musicali.com
@@ -2044,29 +2745,25 @@
tests-shop.com
tette.bz
tettone.cc
-texas-hold-em-4u.com
-texas-hold-em-555.com
-texas-hold-em-w.com
-texas-hold-em-winner.net
-texas-holdem-0.com
-texas-holdem-a.com
-texas-holdem-big.com
-texas-holdem-now.com
-texas-holdem-online-poker.net
-texasholdem-flip-flop.com
-texasholdem-online.us
-texasholdem-poker.us
-texasholdem777.net
-texasholdemking.com
-texasholdemsite.net
+texas--hold--em
+texas--hold-em
+texas--holdem
+texas-hold-em
+texas-holdem
+texas-poker
+texasproptax.com
tgplist.us
+thatwhichis.com
+the-boys-first-time.net
the-boysfirsttime.com
the-date.com
+the-first-time-auditions
the-hun-site.com
the-hun-yellow-page-tgp.com
the-pill-bottle.com
the-proxy.com
the1930shome.co.uk
+thebans.com
theblackfoxes.com
theceleb.com
thecraftersgallery.com
@@ -2085,27 +2782,46 @@
tickets4events.de
tiere-futter.de
tiffany-towers.com
+tigerspice.com
tikattack.com
timescooter.com
+tina4re.com
tips-1a.de
tits-center.com
tits-cumshots.net
+tm258.com
+tmsathai.org
tofik.pl
tokyojoes.info
+tonos-celulares.com.mx
+tonos-nokia.com.mx
+top-blackjack-game
+top-blackjack.net
+top-casinos-net.com
top-cialis.com
+top-deals-online-pharmacy
+top-deals-pills
+top-deals-pills.info
+top-deals-viagra
top-dedicated-servers.com
top-des-rencontres.com
top-fioricet.com
top-internet-blackjack.com
top-milf.com
top-of-best.de
+top-online-poker-bonuses
top-online-slots.com
top-pharmacy.net
+top-poker-21.com
+top-sex-base.com
top-skelaxin.com
top-soma.com
top-the-best.de
top-video-poker.info
+top-wins-2005.com
topaktuelle-tattos.de
+topcialis.com
+topmeds.net
toques-logos-jogos.com
toshain.com
total-verspielt.de
@@ -2113,7 +2829,11 @@
touchwoodmagazine.org.uk
tournamentpoker.biz
training-one.co.uk
+trannies.angelcities.com
tranny-pic-free.com
+tranny-sex-clips.com
+tranny.150m.com
+trannys.blowsearch.ws
trannysexmovie.com
transbestporn.com
transestore.com
@@ -2121,17 +2841,27 @@
traum-pcs.de
treocat.com
triadindustries.co.uk
+trixieteen.org
troggen.de
troie.bz
trolliges.de
trucchi-giochi.us
trueuninstall.com
+trumpetmission.org
+tt33tt.com
tt7.org
+tubegator.com
tuff-enuff.fnpsites.com
+tvforum.org
+twinky.org
tygef.org
u-w-m.ru
+uaeecommerce.com
ufosearch.net
uk-virtual-office-solutions.com
+uk.net
+ukrainewife.net
+ultra-shop.info
ultracet-web.com
ultrampharmacy.com
unbeatablecellphones.com
@@ -2141,6 +2871,9 @@
underage-pussy.net
undonet.com
uni-card.ru
+united-cash.com
+unitedarchive.com
+unrisd.com
unscramble.de
unterm-rock.us
upsms.de
@@ -2150,13 +2883,17 @@
usa-birthday-flowers.com
usa-car-insurance.com
usa-car-loans.com
+usa-cash-advance.com
+usa-escorts-123.com
usbitches.com
uscashloan.com
+usedcarsforsale
v27.net
v29.net
v3.be
vacation-rentals-guide.com
valeofglamorganconservatives.org
+vcialis.com
venera-agency.com
veranstaltungs-tickets.de
vergleich-versicherungsangebote.de
@@ -2169,31 +2906,48 @@
viaggix.com
viapaxton.com
video-n.com
+video-poker
+video-poker-dot.com
video-poker-world.net
video-porno.nu
videohentai.org
videoportfolios.com
vilentium.de
villagesx.com
+vimax.lx.ro
vimax.topcities.com
vip-condom.com
+vip-online-pharmacy.com
vitamins-for-each.com
vivalatinmag.com
vivlart.com
vixensisland.com
+vladgorlum.gotdns.com
+vladstepanov.brunst.dk
vod-solutions.com
+voiphone.cn
+vonormytexas.us
+vpmt.com
+vpshs.com
+vrajitor.com
vtsae.org
w-ebony.com
+w5.pl
+wake.rlights.com
waldner-msa.co.uk
+wancheng.cn
warblog.net
washere.de
watches-sales.com
waterbeds-dot.com
+wayshell.co.uk
wblogs.com
wcgaaa.org
we-live-together-4u.com
weareconfused.org.uk
wearethechampions.com
+web-aks.com
+web-cam-101.com
web-cam-porn.net
web-cialis.com
web-revenue.com
@@ -2201,11 +2955,15 @@
webblogs.biz
webcam-erotiche.com
webcenter.pl
+webcindario.com
webcopywizard.net
+webhgh.com
+webpark.pl
webrank.cn
websitedesigningpromotion.com
weddings-info.com
weddings-links.com
+weekend-cialis
weighlessrx.com
weight-loss-central.org
weight-loss-links.net
@@ -2213,31 +2971,38 @@
weitere-stellenangebote.de
wellness-getraenk.de
wet-4all.com
+wet-pantie.net
wet-pussy.us
wethorny.com
+whackingpud.com
white-shadow-nasty-story.blogspot.com
whitehouse.com
whizzkidsuk.co.uk
wholesalepocketbike.com
wild-porno-girls.com
willcommen.de
+win-in-poker.com
wincmd.ru
wincrestal.com
windcomesdown.com
wirenorth.com
wiset-online.com
+wisskie.cx
witch-watch.com
witz-net.de
wizardsoul.com
+woodyracing.co.uk
workfromhome-homebasedbusiness.com
world-candle.com
world-cheese.com
+world-series-of-poker-1996.com
worldmusic.com
worldsexi.com
worldwide-deals.net
worldwide-games.net
worldwide-holdem.com
worldwide-online-pharmacy.net
+worldwide-sources.com
worldwidecasinosearch.com
wotcher.de
www-sesso # Catchall for many spam sites
@@ -2264,20 +3029,26 @@
x-stories.org
x-video-poker.com
x-video-poker.us
+xadulthosting.com
xaper.com
xdolar.com
xfreehosting.com
xgsm.org
+xgsmhlhc.com
xin-web.de
+xingzhiye.com
xlboobs.net
xmilf.us
+xmix.net
xnxxx.com
xpictx.com
xprescription.com
xprv.com
+xrated-midgets.com
xratedcities.com
xsesso.biz
xxshopadult.com
+xxuz.com
xxx-alt-sex-story.blogspot.com
xxx-database.com
xxx-dvd.biz
@@ -2297,31 +3068,50 @@
xxxseeker.com
xxxwashington.com
xz9.com
+yaboo.dk
yaninediaz.com
+ybuano.org
+yellowmonkey.com
+yellowmonkey2.com
+yellowmonkey55.com
+yelucie.com
+yisosky.vip.sina.com
ymf.name
+yoga-mats.freeservers.com
yoll.net
you-date.com
young-ass.us
your-tattoo.de
+yourcialis.info
yourdentalinsuranceonline.com
yourowncolours.co.uk
yourserver.com
+ypoker.net
yubatech.com
yukka.inc.ru
+zalaszentgrot.com
+zaotao.com
zazlibrary.com
+zenno.info
zfgfz.net
zipcodedownload.com
zipcodesmap.com
zithromax-online.net
+zj.com
+zone-b51.com
zoo-sex-pics.com
zoo-sex.biz
+zoo-sex.info
zoo-zone.com
zooeurope.com
zoofil.com
+zoofilia-fotos.com
+zoomaniz.flnet.org
zoosex-motion-videos.com
zoosex-pictures.com
zoosx.net
zpics.net
zt148.com
zum-bestpreis.de
+zweree.com
zxyzxy.com
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties?rev=230512&r1=230511&r2=230512&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/roller.properties Fri Aug 5 14:22:54 2005
@@ -28,7 +28,13 @@
# user management settings
+# True to allow users to register themselves via a "register" link on the main
+# page. False to disable user self-registration entirely, allowing only global
+# admins to create new users.
users.registration.enabled=true
+
+# True to enable group blogging. False to prevent users from creating more
+# than one weblog and from joining other weblogs.
groupblogging.enabled=true
#----------------------------------
@@ -91,9 +97,10 @@
# scheduled tasks, each is comma separated list of classes
-tasks.daily=org.roller.presentation.BlacklistUpdateTask\
-,org.roller.presentation.TurnoverReferersTask\
+tasks.daily=\
+org.roller.presentation.TurnoverReferersTask\
+#,org.roller.presentation.BlacklistUpdateTask\
#,org.roller.presentation.planet.SyncWebsitesTask
tasks.hourly=\
Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp?rev=230512&r1=230511&r2=230512&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Fri Aug 5 14:22:54 2005
@@ -35,8 +35,8 @@
<%-- Choose appropriate prompt at start of page --%>
<br />
<c:choose>
- <c:when test="${empty model.permissions}">
- <p><fmt:message key="yourWebsites.noBlog" />
+ <c:when test="${empty model.permissions && !model.groupBloggingEnabled}">
+ <p><fmt:message key="yourWebsites.noBlogs" />
<roller:link page="/editor/createWebsite.do">
<fmt:message key="yourWebsites.createAWeblog" />
</roller:link></p>
@@ -130,11 +130,11 @@
<c:when test="${empty model.permissions}">
<h1><fmt:message key="yourWebsites.title" /></h1>
- <p><fmt:message key="yourWebsites.youHaveNone" /></p>
<p>
+ <fmt:message key="yourWebsites.youHaveNone" />
<roller:link page="/editor/createWebsite.do">
<fmt:message key="yourWebsites.youCanCreateOne" />
- </roller:link>
+ </roller:link>?
</p>
</c:when>
@@ -143,7 +143,7 @@
</html:form>
<br />
-<c:if test="${model.groupBloggingEnabled}">
+<c:if test="${model.groupBloggingEnabled && !empty model.permissions}">
<div class="helptext">
<img src="../images/TipOfTheDay16.gif" alt="info-icon" align="bottom" />
<fmt:message key="createWebsite.whyCreateMore" />
Modified: incubator/roller/branches/roller_2.0/web/website/edit-website.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-website.jsp?rev=230512&r1=230511&r2=230512&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-website.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-website.jsp Fri Aug 5 14:22:54 2005
@@ -2,7 +2,7 @@
<roller:StatusMessage/>
-<h1><fmt:message key="websiteSettings.title" /></h1>
+<h1><fmt:message key="websiteSettings.title" /></h1>
<html:form action="/editor/website" method="post">
<html:hidden property="method" value="update"/></input>
@@ -10,10 +10,11 @@
<html:hidden property="id"/></input>
<html:hidden property="weblogDayPageId" />
<html:hidden property="locale"/></input>
+ <html:hidden property="handle"/></input>
<html:hidden property="timeZone"/></input>
<html:hidden property="editorTheme"/></input>
- <html:hidden property="isEnabled"/></input>
- <html:hidden property="defaultCategoryId"/></input>
+ <html:hidden property="isEnabled"/></input>
+ <html:hidden property="defaultCategoryId"/></input>
<table>
@@ -28,6 +29,16 @@
</tr>
<tr>
+ <td class="propname"><fmt:message key="websiteSettings.emailAddress" />
+ <td><html:text property="emailAddress" size="40"/></input></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.emailFromAddress" />
+ <td><html:text property="emailFromAddress" size="40"/></input></td>
+ </tr>
+
+ <tr>
<td class="propname"><fmt:message key="websiteSettings.homePage" /></td>
<td>
<html:select property="defaultPageId" size="1">
@@ -37,11 +48,11 @@
</td>
</tr>
- <tr>
- <td><h2><fmt:message key="websiteSettings.commentSettings" /></h2></td>
- <td></td>
- </tr>
-
+ <tr>
+ <td><h2><fmt:message key="websiteSettings.commentSettings" /></h2></td>
+ <td></td>
+ </tr>
+
<tr>
<td class="propname"><fmt:message key="websiteSettings.allowComments" /></td>
<td><html:checkbox property="allowComments" /></input></td>
@@ -59,10 +70,10 @@
<td><html:text size="50" property="emailFromAddress" /></input></td>
</tr>
- <tr>
- <td><h2><fmt:message key="websiteSettings.formatting" /></h2></td>
- <td></td>
- </tr>
+ <tr>
+ <td><h2><fmt:message key="websiteSettings.formatting" /></h2></td>
+ <td></td>
+ </tr>
<% } %>
<% if (org.roller.presentation.velocity.ContextLoader.hasPlugins()) { %>
@@ -84,25 +95,25 @@
<html:hidden property="defaultPlugins" />
<% } %>
- <tr>
- <td><h2><fmt:message key="websiteSettings.editorSettings" /></h2></td>
- <td></td>
- </tr>
-
- <tr>
- <td class="propname"><fmt:message key="websiteSettings.editor" /></td>
- <td>
- <html:select property="editorPage" size="1">
- <html:options name="editorPagesList" />
- </html:select></p>
- </td>
- </tr>
-
- <tr>
- <td><h2><fmt:message key="websiteSettings.bloggerApi" /></h2></td>
- <td></td>
- </tr>
-
+ <tr>
+ <td><h2><fmt:message key="websiteSettings.editorSettings" /></h2></td>
+ <td></td>
+ </tr>
+
+ <tr>
+ <td class="propname"><fmt:message key="websiteSettings.editor" /></td>
+ <td>
+ <html:select property="editorPage" size="1">
+ <html:options name="editorPagesList" />
+ </html:select></p>
+ </td>
+ </tr>
+
+ <tr>
+ <td><h2><fmt:message key="websiteSettings.bloggerApi" /></h2></td>
+ <td></td>
+ </tr>
+
<tr>
<td class="propname"><fmt:message key="websiteSettings.enableBloggerApi" /></td>
<td><html:checkbox property="enableBloggerApi" /></input></td>
@@ -127,16 +138,13 @@
<td class="propname"><fmt:message key="websiteSettings.ignoreUrls" /></td>
<td><html:textarea property="ignoreWords" rows="7" cols="40"/></td>
</tr>
- <tr>
- <td> </td>
- </tr>
- <tr>
- <td class="buttonBox" colspan="2">
- <input type="submit" value='<fmt:message key="websiteSettings.button.update" />' />
- </td>
- </tr>
+
</table>
+<div class="control">
+ <input type="submit" value='<fmt:message key="websiteSettings.button.update" />' />
+</div>
+
</html:form>
<%@ include file="/theme/footer.jsp" %>