Skip to content
Permalink
Browse files

Fixes for items outlined in issue #2577

  • Loading branch information...
mattlevine committed Apr 25, 2017
1 parent df88166 commit 0e387c9454b3c085fe5e7cd876ed746ca16d5308
@@ -793,7 +793,7 @@
<cfif isdefined('url.moduleid') and not isdefined('url.activetab')>
initSiteManagerTabContent(0);
<cfelse>
initSiteManagerTabContent(#rc.activeTab#);
initSiteManagerTabContent(#esapiEncode('javascript',rc.activeTab)#);
</cfif>
});
@@ -77,6 +77,9 @@ version 2 without this exception. You may, if you choose, apply this exception
$.event('sortby','lastupdate');
}
if(!structKeyExists(session.flatViewArgs,"#rc.siteID#")){
session.flatViewArgs["#rc.siteID#"]={};
}
session.flatViewArgs["#rc.siteID#"].moduleid=$.event("moduleid");
session.flatViewArgs["#rc.siteID#"].sortBy=$.event("sortby");
session.flatViewArgs["#rc.siteID#"].sortDirection=$.event("sortdirection");
@@ -404,7 +407,7 @@ if(len($.siteConfig('customTagGroups'))){
<cfset showingLabel = application.rbFactory.getKeyValue(session.rb,"sitemanager.reports.all")>
</cfif>
<span>#application.rbFactory.getKeyValue(session.rb,"sitemanager.reports")#:</span>
<a id="navReportsToggle" class="dropdown-toggle" data-toggle="dropdown">#showingLabel#<i class="mi-chevron-down"></i></a>
<a id="navReportsToggle" class="dropdown-toggle" data-toggle="dropdown">#esapiEncode('html',showingLabel)#<i class="mi-chevron-down"></i></a>
<ul id="navReports" class="dropdown-menu">
<li><a href="" data-report=""<cfif not len($.event("report"))> class="active"</cfif>>#application.rbFactory.getKeyValue(session.rb,"sitemanager.reports.all")#<!---<span class="badge">#$.getBean('contentGateway').getPageCount(siteid=session.siteid).counter#</span>---></a></li>
<cfset draftCount=$.getBean('contentManager').getMyDraftsCount(siteid=session.siteid, startdate=dateAdd('m',-3,now()))>
@@ -1,4 +1,4 @@
<!---
<!---
This file is part of Mura CMS.
Mura CMS is free software: you can redistribute it and/or modify
@@ -13,17 +13,17 @@
You should have received a copy of the GNU General Public License
along with Mura CMS. If not, see <http://www.gnu.org/licenses/>.
Linking Mura CMS statically or dynamically with other modules constitutes the preparation of a derivative work based on
Linking Mura CMS statically or dynamically with other modules constitutes the preparation of a derivative work based on
Mura CMS. Thus, the terms and conditions of the GNU General Public License version 2 ("GPL") cover the entire combined work.
However, as a special exception, the copyright holders of Mura CMS grant you permission to combine Mura CMS with programs
or libraries that are released under the GNU Lesser General Public License version 2.1.
In addition, as a special exception, the copyright holders of Mura CMS grant you permission to combine Mura CMS with
independent software modules (plugins, themes and bundles), and to distribute these plugins, themes and bundles without
Mura CMS under the license of your choice, provided that you follow these specific guidelines:
In addition, as a special exception, the copyright holders of Mura CMS grant you permission to combine Mura CMS with
independent software modules (plugins, themes and bundles), and to distribute these plugins, themes and bundles without
Mura CMS under the license of your choice, provided that you follow these specific guidelines:
Your custom code
Your custom code
• Must not alter any default objects in the Mura CMS database and
• May not alter the default display of the Mura CMS logo within Mura CMS and
@@ -37,12 +37,12 @@
/index.cfm
/MuraProxy.cfc
You may copy and distribute Mura CMS with a plug-in, theme or bundle that meets the above guidelines as a combined work
under the terms of GPL for Mura CMS, provided that you include the source code of that other code when and as the GNU GPL
You may copy and distribute Mura CMS with a plug-in, theme or bundle that meets the above guidelines as a combined work
under the terms of GPL for Mura CMS, provided that you include the source code of that other code when and as the GNU GPL
requires distribution of source code.
For clarity, if you create a modified version of Mura CMS, you are not obligated to grant this special exception for your
modified version; it is your choice whether to do so, or to make such modified version available under the GNU General Public License
For clarity, if you create a modified version of Mura CMS, you are not obligated to grant this special exception for your
modified version; it is your choice whether to do so, or to make such modified version available under the GNU General Public License
version 2 without this exception. You may, if you choose, apply this exception to your own modified versions of Mura CMS.
--->
<cfoutput>
@@ -72,10 +72,10 @@
</script>

<form id="frmNextN" action="" method="post">
<input type="hidden" name="muraAction" value="#rc.muraAction#">
<input type="hidden" name="siteid" value="#rc.siteid#">
<input type="hidden" name="ispublic" value="#rc.ispublic#">
<input type="hidden" name="unassigned" value="#rc.unassigned#">
<input type="hidden" name="muraAction" value="#esapiEncode('html_attr',rc.muraAction)#">
<input type="hidden" name="siteid" value="#esapiEncode('html_attr',rc.siteid)#">
<input type="hidden" name="ispublic" value="#esapiEncode('html_attr',rc.ispublic)#">
<input type="hidden" name="unassigned" value="#esapiEncode('html_attr',rc.unassigned)#">
<input type="hidden" name="recordsperpage" value="#rc.nextn.recordsperpage#">
<input type="hidden" name="startrow" value="#rc.nextn.startrow#">
</form>
@@ -115,7 +115,7 @@
<li class="#local.prevClass#">
<a href="##" data-pageno="#local.prevNo#" class="#local.prevClass#"><i class="mi-angle-left"></i></a>
</li>

<!--- Page Number Links --->
<cfloop from="#rc.nextn.firstpage#" to="#rc.nextn.lastpage#" index="local.pagenumber">
<li<cfif val(rc.it.getPageIndex()) eq local.pagenumber> class="active"</cfif>>
@@ -145,4 +145,4 @@
</div>
</div>
</cfif>
</cfoutput>
</cfoutput>
@@ -13,17 +13,17 @@
You should have received a copy of the GNU General Public License
along with Mura CMS. If not, see <http://www.gnu.org/licenses/>.
Linking Mura CMS statically or dynamically with other modules constitutes the preparation of a derivative work based on
Linking Mura CMS statically or dynamically with other modules constitutes the preparation of a derivative work based on
Mura CMS. Thus, the terms and conditions of the GNU General Public License version 2 ("GPL") cover the entire combined work.
However, as a special exception, the copyright holders of Mura CMS grant you permission to combine Mura CMS with programs
or libraries that are released under the GNU Lesser General Public License version 2.1.
In addition, as a special exception, the copyright holders of Mura CMS grant you permission to combine Mura CMS with
independent software modules (plugins, themes and bundles), and to distribute these plugins, themes and bundles without
Mura CMS under the license of your choice, provided that you follow these specific guidelines:
In addition, as a special exception, the copyright holders of Mura CMS grant you permission to combine Mura CMS with
independent software modules (plugins, themes and bundles), and to distribute these plugins, themes and bundles without
Mura CMS under the license of your choice, provided that you follow these specific guidelines:
Your custom code
Your custom code
• Must not alter any default objects in the Mura CMS database and
• May not alter the default display of the Mura CMS logo within Mura CMS and
@@ -37,12 +37,12 @@
/index.cfm
/MuraProxy.cfc
You may copy and distribute Mura CMS with a plug-in, theme or bundle that meets the above guidelines as a combined work
under the terms of GPL for Mura CMS, provided that you include the source code of that other code when and as the GNU GPL
You may copy and distribute Mura CMS with a plug-in, theme or bundle that meets the above guidelines as a combined work
under the terms of GPL for Mura CMS, provided that you include the source code of that other code when and as the GNU GPL
requires distribution of source code.
For clarity, if you create a modified version of Mura CMS, you are not obligated to grant this special exception for your
modified version; it is your choice whether to do so, or to make such modified version available under the GNU General Public License
For clarity, if you create a modified version of Mura CMS, you are not obligated to grant this special exception for your
modified version; it is your choice whether to do so, or to make such modified version available under the GNU General Public License
version 2 without this exception. You may, if you choose, apply this exception to your own modified versions of Mura CMS.
--->
<cfoutput>
@@ -62,4 +62,4 @@
<input type="hidden" name="muraAction" value="cUsers.search" />
</div>
</form>
</cfoutput>
</cfoutput>
@@ -93,7 +93,7 @@
<!--- Edit --->
<cfif local.canEdit>
<li>
<a href="#buildURL(action='cusers.edituser', querystring='userid=#local.item.getValue('userid')#&siteid=#rc.siteid#')#" rel="tooltip" onclick="actionModal(); window.location=this.href;">
<a href="#buildURL(action='cusers.edituser', querystring='userid=#local.item.getValue('userid')#&siteid=#esapiEncode('url',rc.siteid)#')#" rel="tooltip" onclick="actionModal(); window.location=this.href;">
<i class="mi-pencil"></i>#rbKey('user.edit')#
</a>
</li>
@@ -115,7 +115,7 @@
<!--- Delete --->
<cfif local.canEdit>
<li class="delete">
<a href="#buildURL(action='cusers.update', querystring='action=delete&ispublic=#local.item.getValue('ispublic')#&userid=#local.item.getValue('userid')#&siteid=#rc.siteid#&type=1#rc.$.renderCSRFTokens(context=local.item.getValue('userid'),format='url')#')#" onclick="return confirmDialog('#jsStringFormat(application.rbFactory.getKeyValue(session.rb,'user.deleteuserconfirm'))#',this.href)" rel="tooltip">
<a href="#buildURL(action='cusers.update', querystring='action=delete&ispublic=#local.item.getValue('ispublic')#&userid=#local.item.getValue('userid')#&siteid=#esapiEncode('url',rc.siteid)#&type=1#rc.$.renderCSRFTokens(context=local.item.getValue('userid'),format='url')#')#" onclick="return confirmDialog('#jsStringFormat(application.rbFactory.getKeyValue(session.rb,'user.deleteuserconfirm'))#',this.href)" rel="tooltip">
<i class="mi-trash"></i>#rbKey('user.delete')#
</a>
</li>
@@ -166,7 +166,7 @@
<!--- Last Name, First Name --->
<td class="var-width">
<cfif local.canEdit>
<a href="#buildURL(action='cusers.edituser', querystring='userid=#local.item.getValue('userid')#&siteid=#rc.siteid#')#" onclick="actionModal();">
<a href="#buildURL(action='cusers.edituser', querystring='userid=#local.item.getValue('userid')#&siteid=#esapiEncode('url',rc.siteid)#')#" onclick="actionModal();">
#esapiEncode('html', local.item.getValue('lname'))#, #esapiEncode('html', local.item.getValue('fname'))#
</a>
<cfelse>
@@ -139,14 +139,14 @@

<!--- Edit --->
<li class="edit">
<a href="#buildURL(action='cusers.editgroup', querystring='userid=#local.item.getValue('userid')#&siteid=#rc.siteid#')#" rel="tooltip" onclick="actionModal(); window.location=this.href;">
<a href="#buildURL(action='cusers.editgroup', querystring='userid=#local.item.getValue('userid')#&siteid=#esapiEncode('url',rc.siteid)#')#" rel="tooltip" onclick="actionModal(); window.location=this.href;">
<i class="mi-pencil"></i>#rbKey('user.edit')#
</a>
</li>

<!--- View Members --->
<li class="members">
<a href="#buildURL(action='cusers.editgroupmembers', querystring='userid=#local.item.getValue('userid')#&siteid=#rc.siteid#')#" rel="tooltip" onclick="actionModal(); window.location=this.href;">
<a href="#buildURL(action='cusers.editgroupmembers', querystring='userid=#local.item.getValue('userid')#&siteid=#esapiEncode('url',rc.siteid)#')#" rel="tooltip" onclick="actionModal(); window.location=this.href;">
<i class="mi-users"></i>#rbKey('user.members')#
</a>
</li>
@@ -160,7 +160,7 @@
) />

<li class="delete">
<a href="#buildURL(action='cusers.update', querystring='action=delete&isPublic=#local.item.getValue('isPublic')#&userid=#local.item.getValue('userid')#&siteid=#rc.siteid#&type=1#rc.$.renderCSRFTokens(context=local.item.getValue('userid'),format='url')#')#" onclick="return confirmDialog('#esapiEncode('javascript', msgDelete)#',this.href)" rel="tooltip">
<a href="#buildURL(action='cusers.update', querystring='action=delete&isPublic=#local.item.getValue('isPublic')#&userid=#local.item.getValue('userid')#&siteid=#esapiEncode('url',rc.siteid)#&type=1#rc.$.renderCSRFTokens(context=local.item.getValue('userid'),format='url')#')#" onclick="return confirmDialog('#esapiEncode('javascript', msgDelete)#',this.href)" rel="tooltip">
<i class="mi-trash"></i>#rbKey('user.delete')#
</a>
</li>
@@ -177,7 +177,7 @@

<!--- Group Name --->
<td class="var-width">
<a href="#buildURL(action='cusers.editgroup', querystring='userid=#local.item.getValue('userid')#&siteid=#rc.siteid#')#" onclick="actionModal();">
<a href="#buildURL(action='cusers.editgroup', querystring='userid=#local.item.getValue('userid')#&siteid=#esapiEncode('url',rc.siteid)#')#" onclick="actionModal();">
#esapiEncode('html',local.item.getValue('groupname'))#</a>
(#Val(local.membercount)#)
</td>
@@ -57,14 +57,14 @@
<ul id="viewTabs" class="mura-tab-links nav-tabs">
<!--- Site Members Tab --->
<li<cfif rc.ispublic eq 1> class="active"</cfif>>
<a href="#buildURL(action='cusers.listusers', querystring='siteid=#rc.siteid#&ispublic=1&unassigned=#rc.unassigned#')#" onclick="actionModal();">
<a href="#buildURL(action='cusers.listusers', querystring='siteid=#esapiEncode('url',rc.siteid)#&ispublic=1&unassigned=#esapiEncode('url',rc.unassigned)#')#" onclick="actionModal();">
#rbKey('user.sitemembers')#
</a>
</li>

<!--- System Users Tab --->
<li<cfif rc.ispublic eq 0> class="active"</cfif>>
<a href="#buildURL(action='cusers.listusers', querystring='siteid=#rc.siteid#&ispublic=0&unassigned=#rc.unassigned#')#" onclick="actionModal();">
<a href="#buildURL(action='cusers.listusers', querystring='siteid=#esapiEncode('url',rc.siteid)#&ispublic=0&unassigned=#esapiEncode('url',rc.unassigned)#')#" onclick="actionModal();">
#rbKey('user.systemusers')#
</a>
</li>
@@ -90,7 +90,7 @@
<div class="mura-control-group">

<!--- View All / Unassigned Only --->
<a class="btn" href="#buildURL(action='cusers.listusers', querystring='siteid=#URLEncodedFormat(rc.siteid)#&ispublic=#rc.ispublic#&unassigned=#rc.unassignedlink#')#" onclick="actionModal();">
<a class="btn" href="#buildURL(action='cusers.listusers', querystring='siteid=#URLEncodedFormat(rc.siteid)#&ispublic=#esapiEncode('url',rc.ispublic)#&unassigned=#esapiEncode('url',rc.unassigned)#')#" onclick="actionModal();">
<i class="mi-filter"></i>
<cfif rc.unassigned EQ 0>
#rbKey('user.viewunassignedonly')#
@@ -101,7 +101,7 @@

<!--- Download .CSV --->
<cfif rc.it.hasNext()>
<a class="btn" href="#buildURL(action='cusers.download', querystring='siteid=#URLEncodedFormat(rc.siteid)#&ispublic=#rc.ispublic#&unassigned=#rc.unassigned#')#">
<a class="btn" href="#buildURL(action='cusers.download', querystring='siteid=#URLEncodedFormat(rc.siteid)#&ispublic=#esapiEncode('url',rc.ispublic)#&unassigned=#esapiEncode('url',rc.unassigned)#')#">
<i class="mi-download"></i>
#rbKey('user.download')#
</a>

0 comments on commit 0e387c9

Please sign in to comment.
You can’t perform that action at this time.