[jboss-svn-commits] JBL Code SVN: r5126 - labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2006-07-17 18:24:02 -0400 (Mon, 17 Jul 2006)
New Revision: 5126

Removed:
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/move_topic.xhtml
Modified:
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
   labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
Log:
[JBFORUMS-43] Improving security on all moderator views.

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml	2006-07-17 22:20:34 UTC (rev 5125)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/delete_topic.xhtml	2006-07-17 22:24:02 UTC (rev 5126)
@@ -34,7 +34,8 @@
 
 <ui:composition template="/views/common/common.xhtml">
 <ui:define name="mainContent">
-<forums:isAllowed fragment="acl://moderateForum" contextData="#{moderator.forum}">
+<isAllowedChoose>
+<isAllowedWhen fragment="acl://moderateForum" contextData="#{moderator.forum}">
     <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0">
 	   <tr>
 	      <th class="thHead" height="25" valign="middle"><span class="tableTitle">${resource.Topic_delete_message}</span></th>
@@ -59,7 +60,29 @@
 	   </tr>
 	</table>
 
-</forums:isAllowed>
+</isAllowedWhen>
+<isAllowedOtherwise>
+    <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
+       <tr>
+          <td>
+             <table width="100%" cellspacing="0" cellpadding="1" border="0">
+                <tr>
+                   <td>&amp;nbsp;</td>
+                </tr>
+                <tr>
+                   <td align="center">
+                            <span class="gen">${resource.Not_Moderator}</span>
+                   </td>
+                </tr>
+                <tr>
+                   <td>&amp;nbsp;</td>
+                </tr>
+             </table>
+          </td>
+       </tr>
+   </table>
+</isAllowedOtherwise>
+</isAllowedChoose>
 </ui:define>
 </ui:composition>
 

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml	2006-07-17 22:20:34 UTC (rev 5125)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml	2006-07-17 22:24:02 UTC (rev 5126)
@@ -32,7 +32,9 @@
 <ui:composition template="/views/common/common.xhtml">
 <ui:define name="mainContent">
 <c:if test="#{moderator.initialized &amp;&amp; moderator.forum!=null &amp;&amp; moderator.forum.id!=-1}">
-   <forums:isAllowed fragment="acl://moderateForum" contextData="#{moderator.forum}">
+<isAllowedChoose>
+
+    <isAllowedWhen fragment="acl://moderateForum" contextData="#{moderator.forum}">
       <h:messages layout="table" infoStyle="color:green" warnStyle="color:red"/>
       <h:form>
          <input type="hidden" name="f" value="#{moderator.forum.id}"/>
@@ -259,7 +261,30 @@
             </td>
          </tr>
       </table>
-   </forums:isAllowed>
+    </isAllowedWhen>
+    <isAllowedOtherwise>
+        <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
+           <tr>
+              <td>
+                 <table width="100%" cellspacing="0" cellpadding="1" border="0">
+                    <tr>
+                       <td>&amp;nbsp;</td>
+                    </tr>
+                    <tr>
+                       <td align="center">
+                                <span class="gen">${resource.Not_Moderator}</span>
+                       </td>
+                    </tr>
+                    <tr>
+                       <td>&amp;nbsp;</td>
+                    </tr>
+                 </table>
+              </td>
+           </tr>
+       </table>
+    </isAllowedOtherwise>
+
+</isAllowedChoose>
 </c:if>
 </ui:define>
 </ui:composition>

Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml	2006-07-17 22:20:34 UTC (rev 5125)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml	2006-07-17 22:24:02 UTC (rev 5126)
@@ -31,7 +31,8 @@
      xmlns:forums="http://www.jboss.com/products/jbossportal/forums" class="bb">
 <ui:composition template="/views/common/common.xhtml">
 <ui:define name="mainContent">
-<forums:isAllowed fragment="acl://moderateForum" contextData="#{moderator.forum}">
+<isAllowedChoose>
+<isAllowedWhen fragment="acl://moderateForum" contextData="#{moderator.forum}">
 <h:form>
     <input type="hidden" name="f" value="#{moderator.forum.id}"/>
     <table width="100%" cellspacing="2" cellpadding="2" border="0"
@@ -117,7 +118,29 @@
        </tr>
     </table>
 </h:form>
-</forums:isAllowed>
+</isAllowedWhen>
+<isAllowedOtherwise>
+    <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
+       <tr>
+          <td>
+             <table width="100%" cellspacing="0" cellpadding="1" border="0">
+                <tr>
+                   <td>&amp;nbsp;</td>
+                </tr>
+                <tr>
+                   <td align="center">
+                            <span class="gen">${resource.Not_Moderator}</span>
+                   </td>
+                </tr>
+                <tr>
+                   <td>&amp;nbsp;</td>
+                </tr>
+             </table>
+          </td>
+       </tr>
+   </table>
+</isAllowedOtherwise>
+</isAllowedChoose>
 </ui:define>
 </ui:composition>
   

Deleted: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/move_topic.xhtml
===================================================================