Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@

import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -53,10 +51,6 @@
import org.apache.roller.weblogger.util.MediacastException;
import org.apache.roller.weblogger.util.MediacastResource;
import org.apache.roller.weblogger.util.MediacastUtil;
import org.apache.roller.weblogger.util.RollerMessages;
import org.apache.roller.weblogger.util.RollerMessages.RollerMessage;
import org.apache.roller.weblogger.util.Trackback;
import org.apache.roller.weblogger.util.TrackbackNotAllowedException;
import org.apache.struts2.convention.annotation.AllowedMethods;
import org.apache.struts2.interceptor.validation.SkipValidation;

Expand All @@ -74,9 +68,6 @@ public final class EntryEdit extends UIAction {
// the entry we are adding or editing
private WeblogEntry entry = null;

// url to send trackback to
private String trackbackUrl = null;

public EntryEdit() {
this.desiredMenu = "editor";
}
Expand Down Expand Up @@ -359,70 +350,6 @@ public String getPreviewURL() {
getEntry().getAnchor(), true);
}

public String getTrackbackUrl() {
return trackbackUrl;
}

public void setTrackbackUrl(String trackbackUrl) {
this.trackbackUrl = trackbackUrl;
}

/**
* Send trackback to a specific url.
*/
@SkipValidation
public String trackback() {

// make sure we have an entry to edit and it belongs to the action
// weblog
if (getEntry() == null) {
return ERROR;
} else if (!getEntry().getWebsite().equals(getActionWeblog())) {
return DENIED;
}

if (!StringUtils.isEmpty(getTrackbackUrl())) {
RollerMessages results = null;
try {
Trackback trackback = new Trackback(getEntry(),
getTrackbackUrl());
results = trackback.send();
} catch (TrackbackNotAllowedException ex) {
addError("error.trackbackNotAllowed");
} catch (Exception e) {
log.error("Error sending trackback", e);
// TODO: error handling
addError("error.general", e.getMessage());
}

if (results != null) {
for (Iterator<RollerMessage> mit = results.getMessages(); mit.hasNext();) {
RollerMessage msg = mit.next();
if (msg.getArgs() == null) {
addMessage(msg.getKey());
} else {
addMessage(msg.getKey(), Arrays.asList(msg.getArgs()));
}
}

for (Iterator<RollerMessage> eit = results.getErrors(); eit.hasNext();) {
RollerMessage err = eit.next();
if (err.getArgs() == null) {
addError(err.getKey());
} else {
addError(err.getKey(), Arrays.asList(err.getArgs()));
}
}
}

// reset trackback url
setTrackbackUrl(null);

}

return INPUT;
}

/**
* Get the list of all categories for the action weblog
*/
Expand Down
201 changes: 0 additions & 201 deletions app/src/main/java/org/apache/roller/weblogger/util/Trackback.java

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,6 @@ site.bannedwordslist.enable.trackbacks=true
# enables partial bannedwordslist check (not including bannedwordslist.txt) for each incoming referrer
site.bannedwordslist.enable.referrers=false

# Trackback protection. Set this only if you need to limit the URLs to
# which users may send trackbacks. Regex expressions are allowed, for example:
# trackback.allowedURLs=http://w3.ibm.com/.*||http://another.example.com/.*
trackback.allowedURLs=


#----------------------------------
# Planet Aggregator settings

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/resources/struts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@
<param name="weblog">${weblog}</param>
<param name="bean.id">${bean.id}</param>
</result>
<allowed-methods>execute,firstSave,publish,saveDraft,trackback</allowed-methods>
<allowed-methods>execute,firstSave,publish,saveDraft</allowed-methods>
</action>

<action name="entryEdit"
Expand All @@ -371,7 +371,7 @@
<param name="actionName">menu</param>
<param name="namespace">/roller-ui</param>
</result>
<allowed-methods>execute,firstSave,publish,saveDraft,trackback</allowed-methods>
<allowed-methods>execute,firstSave,publish,saveDraft</allowed-methods>
</action>

<action name="entryRemove"
Expand Down
13 changes: 0 additions & 13 deletions app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -297,19 +297,6 @@
</span>
</s:if>


<%-- Trackback control
<s:if test="actionName == 'entryEdit' && userAnAuthor">
<br/>
<h2><s:text name="weblogEdit.trackback"/></h2>
<s:text name="weblogEdit.trackbackUrl"/>
<br/>
<s:textfield name="trackbackUrl" size="80" maxlength="255" style="width:35%"/>
<s:submit value="%{getText('weblogEdit.sendTrackback')}" action="entryEdit!trackback"/>
</s:if>
--%>

</s:form>


Expand Down
Loading
Loading