Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java?rev=1516602&r1=1516601&r2=1516602&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Templates.java Thu Aug 22 20:50:31 2013 @@ -138,80 +138,81 @@ public class Templates extends UIAction // validation myValidate(); - if (!hasActionErrors()) - try { + if (!hasActionErrors()) { + try { - WeblogTemplate newTemplate = new WeblogTemplate(); - newTemplate.setWebsite(getActionWeblog()); - newTemplate.setAction(getNewTmplAction()); - newTemplate.setName(getNewTmplName()); - newTemplate.setDescription(newTemplate.getName()); - newTemplate.setContents(getText("pageForm.newTemplateContent")); - newTemplate.setHidden(false); - newTemplate.setNavbar(false); - newTemplate.setLastModified(new Date()); - - if (WeblogTemplate.ACTION_CUSTOM.equals(getNewTmplAction())) { - newTemplate.setLink(getNewTmplName()); - } - - // Make sure we have always have a Weblog main page. Stops - // deleting main page in custom theme mode also. - if (WeblogTemplate.ACTION_WEBLOG.equals(getNewTmplAction())) { - newTemplate.setName(WeblogTemplate.DEFAULT_PAGE); - } - - // all templates start out as velocity templates - newTemplate.setTemplateLanguage("velocity"); - - // for now, all templates just use _decorator - if (!"_decorator".equals(newTemplate.getName())) { - newTemplate.setDecoratorName("_decorator"); - } - - // save the new Template - WebloggerFactory.getWeblogger().getWeblogManager() - .savePage(newTemplate); - - // Create weblog template codes for available types. - WeblogThemeTemplateCode standardTemplCode = new WeblogThemeTemplateCode( - newTemplate.getId(), "standard"); - WeblogThemeTemplateCode mobileTemplCode = new WeblogThemeTemplateCode( - newTemplate.getId(), "mobile"); - - standardTemplCode.setTemplate(newTemplate.getContents()); - standardTemplCode.setTemplateLanguage("velocity"); - - mobileTemplCode.setTemplate(newTemplate.getContents()); - mobileTemplCode.setTemplateLanguage("velocity"); - - WebloggerFactory.getWeblogger().getWeblogManager() - .saveTemplateCode(standardTemplCode); - WebloggerFactory.getWeblogger().getWeblogManager() - .saveTemplateCode(mobileTemplCode); - - // if this person happened to create a Weblog template from - // scratch then make sure and set the defaultPageId. What does - // this do???? - if (WeblogTemplate.DEFAULT_PAGE.equals(newTemplate.getName())) { - getActionWeblog().setDefaultPageId(newTemplate.getId()); - WebloggerFactory.getWeblogger().getWeblogManager() - .saveWeblog(getActionWeblog()); - } - - // flush results to db - WebloggerFactory.getWeblogger().flush(); - - // reset form fields - setNewTmplName(null); - setNewTmplAction(null); - - } catch (WebloggerException ex) { - log.error("Error adding new template for weblog - " - + getActionWeblog().getHandle(), ex); - // TODO: i18n - addError("Error adding new template"); - } + WeblogTemplate newTemplate = new WeblogTemplate(); + newTemplate.setWebsite(getActionWeblog()); + newTemplate.setAction(getNewTmplAction()); + newTemplate.setName(getNewTmplName()); + newTemplate.setDescription(newTemplate.getName()); + newTemplate.setContents(getText("pageForm.newTemplateContent")); + newTemplate.setHidden(false); + newTemplate.setNavbar(false); + newTemplate.setLastModified(new Date()); + + if (WeblogTemplate.ACTION_CUSTOM.equals(getNewTmplAction())) { + newTemplate.setLink(getNewTmplName()); + } + + // Make sure we have always have a Weblog main page. Stops + // deleting main page in custom theme mode also. + if (WeblogTemplate.ACTION_WEBLOG.equals(getNewTmplAction())) { + newTemplate.setName(WeblogTemplate.DEFAULT_PAGE); + } + + // all templates start out as velocity templates + newTemplate.setTemplateLanguage("velocity"); + + // for now, all templates just use _decorator + if (!"_decorator".equals(newTemplate.getName())) { + newTemplate.setDecoratorName("_decorator"); + } + + // save the new Template + WebloggerFactory.getWeblogger().getWeblogManager() + .savePage(newTemplate); + + // Create weblog template codes for available types. + WeblogThemeTemplateCode standardTemplCode = new WeblogThemeTemplateCode( + newTemplate.getId(), "standard"); + WeblogThemeTemplateCode mobileTemplCode = new WeblogThemeTemplateCode( + newTemplate.getId(), "mobile"); + + standardTemplCode.setTemplate(newTemplate.getContents()); + standardTemplCode.setTemplateLanguage("velocity"); + + mobileTemplCode.setTemplate(newTemplate.getContents()); + mobileTemplCode.setTemplateLanguage("velocity"); + + WebloggerFactory.getWeblogger().getWeblogManager() + .saveTemplateCode(standardTemplCode); + WebloggerFactory.getWeblogger().getWeblogManager() + .saveTemplateCode(mobileTemplCode); + + // if this person happened to create a Weblog template from + // scratch then make sure and set the defaultPageId. What does + // this do???? + if (WeblogTemplate.DEFAULT_PAGE.equals(newTemplate.getName())) { + getActionWeblog().setDefaultPageId(newTemplate.getId()); + WebloggerFactory.getWeblogger().getWeblogManager() + .saveWeblog(getActionWeblog()); + } + + // flush results to db + WebloggerFactory.getWeblogger().flush(); + + // reset form fields + setNewTmplName(null); + setNewTmplAction(null); + + } catch (WebloggerException ex) { + log.error("Error adding new template for weblog - " + + getActionWeblog().getHandle(), ex); + // TODO: i18n + addError("Error adding new template"); + } + } return execute(); }
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java?rev=1516602&r1=1516601&r2=1516602&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java Thu Aug 22 20:50:31 2013 @@ -64,7 +64,7 @@ public class TemplatesRemove extends UIA public void myPrepare() { - if (getIdSelections() != null) { + if (getIdSelections() != null) { // query for templates list try { @@ -124,87 +124,87 @@ public class TemplatesRemove extends UIA */ public String remove() { - if (getIds() != null) + if (getIds() != null) { + try { - try { + String[] idsToDelete = Utilities.stringToStringArray(getIds(), + ","); + if (idsToDelete != null && idsToDelete.length > 0) { - String[] idsToDelete = Utilities.stringToStringArray(getIds(), - ","); - if (idsToDelete != null && idsToDelete.length > 0) { + WeblogManager mgr = WebloggerFactory.getWeblogger() + .getWeblogManager(); - WeblogManager mgr = WebloggerFactory.getWeblogger() - .getWeblogManager(); + Weblog weblog = getActionWeblog(); + WeblogTemplate template = null; - Weblog weblog = getActionWeblog(); - WeblogTemplate template = null; + for (int i = 0; i < idsToDelete.length; i++) { + if (!idsToDelete[i].equals("")) { - for (int i = 0; i < idsToDelete.length; i++) { - if (!idsToDelete[i].equals("")) { + template = mgr.getPage(idsToDelete[i]); + if (!template.isRequired() + || !WeblogTemplate.ACTION_CUSTOM + .equals(getActionWeblog() + .getEditorTheme())) { - template = mgr.getPage(idsToDelete[i]); - if (!template.isRequired() - || !WeblogTemplate.ACTION_CUSTOM - .equals(getActionWeblog() - .getEditorTheme())) { - - // if weblog template remove custom style sheet - // also - if (template.getName().equals( - WeblogTemplate.DEFAULT_PAGE)) { - - ThemeTemplate stylesheet = getActionWeblog() - .getTheme().getStylesheet(); - - // Delete style sheet if the same name - if (stylesheet != null - && getActionWeblog().getTheme() - .getStylesheet() != null - && stylesheet.getLink().equals( - getActionWeblog() - .getTheme() - .getStylesheet() - .getLink())) { - // Same so OK to delete - WeblogTemplate css = mgr.getPageByLink( - getActionWeblog(), - stylesheet.getLink()); - - if (css != null) { - mgr.removePage(css); - } - } - - // Clear for next custom theme - weblog.setCustomStylesheetPath(null); - weblog.setDefaultPageId(null); + // if weblog template remove custom style sheet + // also + if (template.getName().equals( + WeblogTemplate.DEFAULT_PAGE)) { - } + ThemeTemplate stylesheet = getActionWeblog() + .getTheme().getStylesheet(); - mgr.removePage(template); + // Delete style sheet if the same name + if (stylesheet != null + && getActionWeblog().getTheme() + .getStylesheet() != null + && stylesheet.getLink().equals( + getActionWeblog() + .getTheme() + .getStylesheet() + .getLink())) { + // Same so OK to delete + WeblogTemplate css = mgr.getPageByLink( + getActionWeblog(), + stylesheet.getLink()); - } - } - } + if (css != null) { + mgr.removePage(css); + } + } - // Save for changes - mgr.saveWeblog(weblog); + // Clear for next custom theme + weblog.setCustomStylesheetPath(null); + weblog.setDefaultPageId(null); - WebloggerFactory.getWeblogger().flush(); + } - // notify caches - CacheManager.invalidate(getActionWeblog()); + mgr.removePage(template); - } + } + } + } - return SUCCESS; + // Save for changes + mgr.saveWeblog(weblog); - } catch (Exception e) { - log.error("Error deleting templates for weblog - " - + getActionWeblog().getHandle(), e); + WebloggerFactory.getWeblogger().flush(); - addError("error.unexpected"); + // notify caches + CacheManager.invalidate(getActionWeblog()); - } + } + + return SUCCESS; + + } catch (Exception e) { + log.error("Error deleting templates for weblog - " + + getActionWeblog().getHandle(), e); + + addError("error.unexpected"); + + } + } return "confirm"; } @@ -241,14 +241,14 @@ public class TemplatesRemove extends UIA * Select check boxes for deleting records */ public String[] getIdSelections() { - return idSelections; + return idSelections.clone(); } /** * Select check boxes for deleting records */ public void setIdSelections(String[] idSelections) { - this.idSelections = idSelections; + this.idSelections = idSelections.clone(); } /** Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java?rev=1516602&r1=1516601&r2=1516602&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java Thu Aug 22 20:50:31 2013 @@ -123,55 +123,57 @@ public class WeblogConfig extends UIActi // run validation myValidate(); - if(!hasActionErrors()) try { - WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); - - Weblog weblog = getActionWeblog(); - - getBean().copyTo(weblog); - - // if blogger category changed then lookup new cat and set it - if(getBean().getBloggerCategoryId() != null && - !weblog.getBloggerCategory().getId().equals(getBean().getBloggerCategoryId())) { - weblog.setBloggerCategory(wmgr.getWeblogCategory(getBean().getBloggerCategoryId())); + if(!hasActionErrors()) { + try { + WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); + + Weblog weblog = getActionWeblog(); + + getBean().copyTo(weblog); + + // if blogger category changed then lookup new cat and set it + if(getBean().getBloggerCategoryId() != null && + !weblog.getBloggerCategory().getId().equals(getBean().getBloggerCategoryId())) { + weblog.setBloggerCategory(wmgr.getWeblogCategory(getBean().getBloggerCategoryId())); + } + + // ROL-485: comments not allowed on inactive weblogs + if(!weblog.getActive()) { + weblog.setAllowComments(Boolean.FALSE); + addMessage("websiteSettings.commentsOffForInactiveWeblog"); + } + + // if blog has unchecked 'show all langs' then we must make sure + // the multi-language blogging option is enabled. + // TODO: this should be properly reflected via the UI + if(!weblog.isShowAllLangs() && !weblog.isEnableMultiLang()) { + weblog.setEnableMultiLang(true); + } + + // save config + WebloggerFactory.getWeblogger().getWeblogManager().saveWeblog(weblog); + + // ROL-1050: apply comment defaults to existing entries + if(getBean().getApplyCommentDefaults()) { + wmgr.applyCommentDefaultsToEntries(weblog); + } + + // apply referer filters + WebloggerFactory.getWeblogger().getRefererManager().applyRefererFilters(weblog); + + // flush + WebloggerFactory.getWeblogger().flush(); + + addMessage("websiteSettings.savedChanges"); + + // Clear cache entries associated with website + CacheManager.invalidate(weblog); + + } catch (Exception ex) { + log.error("Error updating weblog config", ex); + // TODO: i18n + addError("Error updating configuration"); } - - // ROL-485: comments not allowed on inactive weblogs - if(!weblog.getActive()) { - weblog.setAllowComments(Boolean.FALSE); - addMessage("websiteSettings.commentsOffForInactiveWeblog"); - } - - // if blog has unchecked 'show all langs' then we must make sure - // the multi-language blogging option is enabled. - // TODO: this should be properly reflected via the UI - if(!weblog.isShowAllLangs() && !weblog.isEnableMultiLang()) { - weblog.setEnableMultiLang(true); - } - - // save config - WebloggerFactory.getWeblogger().getWeblogManager().saveWeblog(weblog); - - // ROL-1050: apply comment defaults to existing entries - if(getBean().getApplyCommentDefaults()) { - wmgr.applyCommentDefaultsToEntries(weblog); - } - - // apply referer filters - WebloggerFactory.getWeblogger().getRefererManager().applyRefererFilters(weblog); - - // flush - WebloggerFactory.getWeblogger().flush(); - - addMessage("websiteSettings.savedChanges"); - - // Clear cache entries associated with website - CacheManager.invalidate(weblog); - - } catch (Exception ex) { - log.error("Error updating weblog config", ex); - // TODO: i18n - addError("Error updating configuration"); } return INPUT; Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java?rev=1516602&r1=1516601&r2=1516602&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/LinkbackExtractor.java Thu Aug 22 20:50:31 2013 @@ -59,20 +59,22 @@ public class LinkbackExtractor private String mPermalink = null; private int mStart = 0; private int mEnd = 0; - private int mMaxExcerpt = 500; // characters private String mRequestURL = null; private String mRequestURLWWW = null; private String mRefererURL; + private static final int MAX_EXCERPT_CHARS = 500; + private static final int DESIRED_TITLE_LENGTH = 50; + //------------------------------------------------------------------------ /** * Extract referring page title, excerpt, and permalink. * - * @param refererUrl - * @param requestUrl + * @param refererURL + * @param requestURL */ public LinkbackExtractor(String refererURL, String requestURL) - throws MalformedURLException, IOException + throws IOException { try { @@ -93,7 +95,7 @@ public class LinkbackExtractor //------------------------------------------------------------------------ private void extractByParsingHtml(String refererURL, String requestURL) - throws MalformedURLException, IOException + throws IOException { URL url = new URL(refererURL); InputStream is = url.openStream(); @@ -146,9 +148,9 @@ public class LinkbackExtractor mExcerpt = sb.toString().substring(mStart, mEnd); mExcerpt = Utilities.removeHTML(mExcerpt); - if (mExcerpt.length() > mMaxExcerpt) + if (mExcerpt.length() > MAX_EXCERPT_CHARS) { - mExcerpt = mExcerpt.substring(0, mMaxExcerpt) + "..."; + mExcerpt = mExcerpt.substring(0, MAX_EXCERPT_CHARS) + "..."; } } @@ -160,7 +162,7 @@ public class LinkbackExtractor //------------------------------------------------------------------------ private void extractByParsingRss(String rssLink, String requestURL) - throws IllegalArgumentException, MalformedURLException, FeedException, IOException + throws IllegalArgumentException, FeedException, IOException { SyndFeedInput feedInput = new SyndFeedInput(); SyndFeed feed = feedInput.build( @@ -193,9 +195,9 @@ public class LinkbackExtractor } mExcerpt = item.getDescription().getValue(); mExcerpt = Utilities.removeHTML(mExcerpt); - if (mExcerpt.length() > mMaxExcerpt) + if (mExcerpt.length() > MAX_EXCERPT_CHARS) { - mExcerpt = mExcerpt.substring(0, mMaxExcerpt) + "..."; + mExcerpt = mExcerpt.substring(0, MAX_EXCERPT_CHARS) + "..."; } break; } @@ -298,8 +300,9 @@ public class LinkbackExtractor else if (tag.equals(Tag.A)) { String href = (String) atts.getAttribute(HTML.Attribute.HREF); - if (href == null) + if (href == null) { return; + } int hashPos = href.lastIndexOf('#'); if (hashPos != -1) { @@ -311,13 +314,6 @@ public class LinkbackExtractor { mFound = true; } - else - { - /* - * if (mLogger.isDebugEnabled()) { mLogger.debug("No match: - * "+href); } - */ - } } mCurrentTag = tag; } @@ -414,7 +410,7 @@ public class LinkbackExtractor if (mCurrentTag != null && mCurrentTag.equals(Tag.TITLE)) { String newText = new String(data); - if (mTitle.length() < 50) + if (mTitle.length() < DESIRED_TITLE_LENGTH) { mTitle += newText; } Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java?rev=1516602&r1=1516601&r2=1516602&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java Thu Aug 22 20:50:31 2013 @@ -50,11 +50,6 @@ import com.sun.syndication.propono.atom. */ public class RollerAtomService extends AtomService { - //private Map workspaceMap = new TreeMap(); - //private Map collectionMap = new TreeMap(); - //private static Properties cacheProps = new Properties(); - //private boolean firstTime = true; - /** * Creates a new instance of FileBasedAtomService. */ @@ -148,8 +143,10 @@ public class RollerAtomService extends A Map config = roller.getPropertiesManager().getProperties(); String allows = ((RuntimeConfigProperty)config.get("uploads.types.allowed")).getValue(); String[] rules = StringUtils.split(StringUtils.deleteWhitespace(allows), ","); - for (int i=0; i<rules.length; i++) { - if (rules[i].indexOf('/') == -1) continue; + for (int i = 0; i < rules.length; i++) { + if (rules[i].indexOf('/') == -1) { + continue; + } accepts.add(rules[i]); } return accepts; Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/oauth/AuthorizationServlet.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/oauth/AuthorizationServlet.java?rev=1516602&r1=1516601&r2=1516602&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/oauth/AuthorizationServlet.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/oauth/AuthorizationServlet.java Thu Aug 22 20:50:31 2013 @@ -151,8 +151,9 @@ public class AuthorizationServlet extend out.close(); } else { // if callback is not passed in, use the callback from config - if(callback == null || callback.length() <=0 ) + if(callback == null || callback.length() <=0 ) { callback = accessor.consumer.callbackURL; + } String token = accessor.requestToken; if (token != null && callback != null) { callback = OAuth.addParameters(callback, "oauth_token", token); Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java?rev=1516602&r1=1516601&r2=1516602&view=diff ============================================================================== --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java (original) +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/BloggerAPIHandler.java Thu Aug 22 20:50:31 2013 @@ -88,7 +88,9 @@ public class BloggerAPIHandler extends B WeblogEntry entry = weblogMgr.getWeblogEntry(postid); // Return false if entry not found - if (entry == null) return false; + if (entry == null) { + return false; + } validate(entry.getWebsite().getHandle(), userid, password);
