garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

check the public url before importing

Browse Source
This commit is contained in:
Athou
2013-06-02 10:41:47 +02:00
parent c84294a258
commit 5604374691
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -337,6 +337,14 @@ public class FeedREST extends AbstractResourceREST {
@Consumes(MediaType.MULTIPART_FORM_DATA) @Consumes(MediaType.MULTIPART_FORM_DATA)
@ApiOperation(value = "OPML import", notes = "Import an OPML file, posted as a FORM with the 'file' name") @ApiOperation(value = "OPML import", notes = "Import an OPML file, posted as a FORM with the 'file' name")
public Response importOpml() { public Response importOpml() {
String publicUrl = applicationSettingsService.get().getPublicUrl();
if (StringUtils.isBlank(publicUrl)) {
throw new WebApplicationException(Response
.status(Status.INTERNAL_SERVER_ERROR)
.entity("Set the public URL in the admin section.").build());
}
if (StartupBean.USERNAME_DEMO.equals(getUser().getName())) { if (StartupBean.USERNAME_DEMO.equals(getUser().getName())) {
return Response.status(Status.UNAUTHORIZED) return Response.status(Status.UNAUTHORIZED)
.entity("Import is disabled for the demo account").build(); .entity("Import is disabled for the demo account").build();