You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/28 20:50:27 UTC
svn commit: r1614121 - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/ui/struts2/core/
java/org/apache/roller/weblogger/util/ resources/
resources/org/apache/roller/weblogger/config/ webapp/WEB-INF/
webapp/WEB-INF/jsps/core/ webapp/rol...
Author: gmazza
Date: Mon Jul 28 18:50:26 2014
New Revision: 1614121
URL: http://svn.apache.org/r1614121
Log:
Implemented site.allowUserWeblogCreation (how could we have missed that?)
Added:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/GenericError.jsp
Removed:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/RegisterDisabled.jsp
roller/trunk/app/src/main/webapp/roller-ui/authoring/images/
roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
roller/trunk/app/src/main/resources/struts.xml
roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java?rev=1614121&r1=1614120&r2=1614121&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/CreateWeblog.java Mon Jul 28 18:50:26 2014
@@ -44,7 +44,8 @@ import java.util.List;
public class CreateWeblog extends UIAction {
private static Log log = LogFactory.getLog(CreateWeblog.class);
-
+ private static final String DISABLED_RETURN_CODE = "disabled";
+
private CreateWeblogBean bean = new CreateWeblogBean();
@@ -61,9 +62,15 @@ public class CreateWeblog extends UIActi
@SkipValidation
public String execute() {
-
+
+ // check if blog administrator has enabled creation of new blogs
+ if(!WebloggerRuntimeConfig.getBooleanProperty("site.allowUserWeblogCreation")) {
+ addError("createWebsite.disabled");
+ return DISABLED_RETURN_CODE;
+ }
+
User user = getAuthenticatedUser();
-
+
try {
if (!WebloggerConfig.getBooleanProperty("groupblogging.enabled")) {
UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
@@ -72,11 +79,13 @@ public class CreateWeblog extends UIActi
// sneaky user trying to get around 1 blog limit that applies
// only when group blogging is disabled
addError("createWebsite.oneBlogLimit");
- return "menu";
+ return DISABLED_RETURN_CODE;
}
}
} catch (WebloggerException ex) {
log.error("error checking for existing weblogs count", ex);
+ addError("generic.system.error");
+ return DISABLED_RETURN_CODE;
}
// pre-populate with some logical defaults
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java?rev=1614121&r1=1614120&r2=1614121&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java Mon Jul 28 18:50:26 2014
@@ -86,10 +86,12 @@ public class Register extends UIAction i
if (!WebloggerRuntimeConfig.getBooleanProperty("users.registration.enabled")
// unless there are 0 users (need to allow creation of first user)
&& WebloggerFactory.getWeblogger().getUserManager().getUserCount() != 0) {
+ addError("Register.disabled");
return DISABLED_RETURN_CODE;
}
} catch (Exception e) {
log.error("Error checking user count", e);
+ addError("generic.system.error");
return DISABLED_RETURN_CODE;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java?rev=1614121&r1=1614120&r2=1614121&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/Blacklist.java Mon Jul 28 18:50:26 2014
@@ -50,7 +50,7 @@ import org.apache.roller.util.DateUtil;
* strings against the blacklist and (optionally) addition blacklists.
* <br />
* First looks for blacklist.txt in uploads directory, than in classpath
- * as /blacklist.txt. Download from web feature disabed.
+ * as /blacklist.txt. Download from web feature disabled.
* <br />
* Blacklist is formatted one entry per line.
* Any line that begins with # is considered to be a comment.
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1614121&r1=1614120&r2=1614121&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Mon Jul 28 18:50:26 2014
@@ -30,6 +30,7 @@ generic.save=Save
generic.edit=Edit
generic.delete=Delete
generic.tagline=Tagline
+generic.system.error=Roller system error - Have administrator check Roller logfiles for more information.
# ------------------------------------------------------------- BookmarkForm.jsp
@@ -380,6 +381,7 @@ createWebsite.weblogUrl=URL
createWebsite.button.save=Create Weblog
createWebsite.created=New weblog [{0}] has been successfully created.
createWebsite.oneBlogLimit=Sorry, only one weblog per user is allowed.
+createWebsite.disabled=Sorry, the blog administrator has disabled creation of new blogs.
# errors from validation
CreateWeblog.error.handleNull=Handle is a required field
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1614121&r1=1614120&r2=1614121&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties Mon Jul 28 18:50:26 2014
@@ -109,14 +109,14 @@ mail.hostname=
# The directory in which Roller will upload files
mediafiles.storage.dir=${user.home}/roller_data/mediafiles
-# The context path under which resoures will be made available
+# The context path under which resources will be made available
mediafile.resource.url=/resources
# The directory in which Roller 4.0 used to upload files
# (only set this if you want 4.0 to 5.0 migration of uploaded files to occur)
# uploads.dir=${user.home}/roller_data/uploads
-# Migrate old file resoures to Roller 5.0 Mediafile Storage automatically
+# Migrate old file resources to Roller 5.0 Mediafile Storage automatically
uploads.migrate.auto=false
# Directory in which search index is to be created
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml?rev=1614121&r1=1614120&r2=1614121&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml Mon Jul 28 18:50:26 2014
@@ -86,7 +86,6 @@
</property-def>
</display-group >
-
<!-- User Settings Group -->
<display-group name="userSettings" key="configForm.userSettings" >
Modified: roller/trunk/app/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/struts.xml?rev=1614121&r1=1614120&r2=1614121&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/struts.xml (original)
+++ roller/trunk/app/src/main/resources/struts.xml Mon Jul 28 18:50:26 2014
@@ -105,7 +105,7 @@
<action name="register!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.core.Register">
<result name="input" type="tiles">.Register</result>
- <result name="disabled" type="tiles">.RegisterDisabled</result>
+ <result name="disabled" type="tiles">.GenericError</result>
<result name="success" type="tiles">.Welcome</result>
</action>
@@ -129,6 +129,7 @@
<action name="createWeblog!*" method="{1}"
class="org.apache.roller.weblogger.ui.struts2.core.CreateWeblog">
<result name="input" type="tiles">.CreateWeblog</result>
+ <result name="disabled" type="tiles">.GenericError</result>
<result name="success" type="chain">menu</result>
</action>
Added: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/GenericError.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/GenericError.jsp?rev=1614121&view=auto
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/GenericError.jsp (added)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/GenericError.jsp Mon Jul 28 18:50:26 2014
@@ -0,0 +1,23 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. The ASF licenses this file to You
+ under the Apache License, Version 2.0 (the "License"); you may not
+ use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. For additional information regarding
+ copyright in this work, please see the NOTICE file in the top level
+ directory of this distribution.
+--%>
+<%--
+This JSP is intended for cannot proceed error messages, perhaps due to lack of system permissions.
+To use: addError() messages and they will appear here, also configure in struts.xml.
+See CreateWeblog.java and Register.java for examples of this JSP.
+--%>
+<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp?rev=1614121&r1=1614120&r2=1614121&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/core/MainMenuSidebar.jsp Mon Jul 28 18:50:26 2014
@@ -34,7 +34,7 @@
<p><s:text name="yourWebsites.oauthKeys.desc" /></p>
</s:if>
- <s:if test="getBooleanProp('groupblogging.enabled') || (existingPermissions.isEmpty && pendingPermissions.isEmpty)">
+ <s:if test="getBooleanProp('site.allowUserWeblogCreation') && (getBooleanProp('groupblogging.enabled') || (existingPermissions.isEmpty && pendingPermissions.isEmpty))">
<h3><a href="<s:url action="createWeblog" />"><s:text name="yourWebsites.createWeblog" /></a></h3>
<p><s:text name="yourWebsites.createWeblog.desc" /></p>
</s:if>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml?rev=1614121&r1=1614120&r2=1614121&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml Mon Jul 28 18:50:26 2014
@@ -94,10 +94,6 @@
<put-attribute name="content" value="/WEB-INF/jsps/core/Register.jsp" />
</definition>
- <definition name=".RegisterDisabled" extends=".tiles-simplepage" >
- <put-attribute name="content" value="/WEB-INF/jsps/core/RegisterDisabled.jsp" />
- </definition>
-
<definition name=".Welcome" extends=".tiles-simplepage" >
<put-attribute name="content" value="/WEB-INF/jsps/core/Welcome.jsp" />
</definition>
@@ -117,7 +113,11 @@
<definition name=".CreateWeblog" extends=".tiles-simplepage" >
<put-attribute name="content" value="/WEB-INF/jsps/core/CreateWeblog.jsp" />
</definition>
-
+
+ <definition name=".GenericError" extends=".tiles-simplepage" >
+ <put-attribute name="content" value="/WEB-INF/jsps/core/GenericError.jsp" />
+ </definition>
+
<definition name=".MainMenu" extends=".tiles-mainmenupage" >
<put-attribute name="content" value="/WEB-INF/jsps/core/MainMenu.jsp" />
<put-attribute name="sidebar" value="/WEB-INF/jsps/core/MainMenuSidebar.jsp" />