fixed a few bugs

Application.cfc

@@ -29,7 +29,7 @@ component persistent="false" accessors="true" output="false" extends="includes.f
 		include this.muraAppConfigPath & 'appcfc/applicationSettings.cfm';
 	} else {
 		// Pre 7.1
-		this.muraAppConfigPath = local.includeroot & 'config';
+		this.muraAppConfigPath = local.includeroot & 'config/';
 		include local.includeroot & 'config/applicationSettings.cfm';
 
 		try {

admin/views/news/default.cfm

@@ -28,7 +28,7 @@ http://www.apache.org/licenses/LICENSE-2.0
 				<select name="newsSource">
 					<option value="">Pick One</option>
 					<cfloop query="#rc.feedlist#">
-						<option value="#rc.feedlist.feedid[currentrow]#" <cfif rc.gsmsettings.get('newssource') eq rc.feedlist.feedid[currentrow]>selected="selected"</cfif>>#rc.feedlist.siteid[currentrow]# - #rc.feedlist.name[currentrow]#</option>
+						<option value="#rc.feedlist.feedid[currentrow]#" <cfif rc.gsmsettings.get('newssource') eq rc.feedlist.feedid[currentrow]>selected="selected"</cfif>>#rc.feedlist.name[currentrow]#</option>
 					</cfloop>
 				</select>
 			</div>

includes/fw1config.cfm

@@ -18,7 +18,7 @@ http://www.apache.org/licenses/LICENSE-2.0
 
 	// !important: enter the plugin packageName here. must be the same as found in '{context}/plugin/config.xml.cfm'
 	variables.framework.package = 'MuraGoogleSitemaps';
-	variables.framework.packageVersion = '4.2.0';
+	variables.framework.packageVersion = '5.0.1';
 
 	// If true, then each subsystem is treated as its own, individual application, unaware of any other subsystem, and will not respond to requests for any other subsystem. For example, if a link in App2 points to 'buildURL('app3:main.form') as a 'href' tag and is clicked, then App2 will maintain its state and not respond. Only App3 will respond to that request. If false, then it is assumed that you will only have ONE display object on any page at any given time. If you have more than one, then as you interact with it, all of them will respond with the same view. You have been warned!
 	variables.framework.siloSubsystems = true;

model/manager/googlesitemapsmanager.cfc

@@ -14,7 +14,7 @@
 		<cfset qFeedList = "" />
 
 		<cfquery name="qFeedList" datasource="#$.GlobalConfig().get('datasource')#" username="#$.GlobalConfig().get('dbusername')#" password="#$.GlobalConfig().get('dbpassword')#">
-			SELECT * from tcontentfeeds
+			SELECT * from tcontentfeeds WHERE siteID = <cfqueryparam value="#siteID#" cfsqltype="cf_sql_varchar" maxlength="25">
 		</cfquery>
 
 		<cfreturn qFeedList />
@@ -29,7 +29,8 @@
 		<cfset var pluginConfig = arguments.$.getPlugin("MuraGoogleSitemaps") />
 		<cfset var timeOfDay			= createDateTime(2011,1,1,3,0,0) />
 
-		<cfset var processURL		= "http://#arguments.$.siteConfig('domain')##arguments.$.globalConfig().getServerPort()##arguments.$.globalConfig('context')#/plugins/#pluginConfig.getDirectory()#/?gsm=process:&site=#siteID#" />
+		<cfset var siteProtocol = $.getBean('settingsManager').getSite(arguments.siteID).getUseSSL() ? 'https://' : 'http://'>
+		<cfset var processURL = "#siteProtocol##arguments.$.siteConfig('domain')##arguments.$.globalConfig().getServerPort()##arguments.$.globalConfig('context')#/plugins/#pluginConfig.getDirectory()#/?gsm=process:&site=#siteID#" />
 
 		<cfif arguments.enable>
 			<cfschedule
@@ -150,6 +151,8 @@
 				tcontent.approved = 1
 			AND
 				tcontent.active = 1
+			AND
+				tcontent.isNav = 1
 			AND
 				(
 				tcontent.display = 1

plugin/config.xml.cfm

@@ -61,7 +61,7 @@ http://www.apache.org/licenses/LICENSE-2.0
 						label="Priority"
 						hint="The relative importance of the page to the site"
 						type="SelectBox"
-						defaultValue="0.1"
+						defaultValue="0.5"
 						required="false"
 						validation=""
 						regex=""

process/controllers/main.cfc

@@ -31,11 +31,11 @@ component persistent="false" accessors="true" output="false" extends="controller
 
 		if(rc.gsmsettings.getValue('location') eq "web") {
 			filename = "#expandPath(application.configBean.getContext() & '/')#sitemap.xml";
-			rc.fileURL	= "http://#siteConfig.getDomain()##rc.$.globalConfig().getServerPort()##rc.$.globalConfig().getContext()#/sitemap.xml";
+			rc.fileURL	= "#$.siteConfig().getWebPath(complete=1)#/sitemap.xml";
 		}
 		else {
-			filename ="#expandPath(application.configBean.getContext() & '/')##siteid#/sitemap.xml";
-			rc.fileURL	= "http://#siteConfig.getDomain()##rc.$.globalConfig().getServerPort()##rc.$.globalConfig().getContext()#/#siteid#/sitemap.xml";
+			filename ="#application.configBean.getSiteDir()#/#siteid#/sitemap.xml";
+			rc.fileURL	= "#$.siteConfig().getWebPath(complete=1)##application.configBean.getSiteAssetPath()#/#siteid#/sitemap.xml";
 		}
 		try {
 			fileWrite(filename,sitemapXML);
@@ -46,7 +46,7 @@ component persistent="false" accessors="true" output="false" extends="controller
 				filename = expandPath("../../sitemap.xml");
 			}
 			else {
-				filename = expandPath("../../#siteid#/sitemap.xml");
+				filename = expandPath("../..#application.configBean.getSiteAssetPath()#/#siteid#/sitemap.xml");
 			}
 			fileWrite(filename,sitemapXML);
 		}