Version 4.3.6

applications/cms/extensions/core/Sitemap/Pages.php

@@ -43,6 +43,24 @@ class _Pages
 			'sitemap_pages_priority' => new \IPS\Helpers\Form\Select( 'sitemap_pages_priority', \IPS\Settings::i()->sitemap_pages_priority, FALSE, array( 'options' => \IPS\Sitemap::$priorities, 'unlimited' => '-1', 'unlimitedLang' => 'sitemap_dont_include' ), NULL, NULL, NULL, 'sitemap_pages_priority' )
 		);
 	}
+
+	/**
+	 * Save settings for ACP configuration
+	 *
+	 * @param	array	$values	Values
+	 * @return	void
+	 */
+	public function saveSettings( $values )
+	{
+		if ( $values['sitemap_configuration_info'] )
+		{
+			\IPS\Settings::i()->changeValues( array( 'sitemap_pages_count' => $this->recommendedSettings['sitemap_pages_count'], 'sitemap_pages_priority' => $this->recommendedSettings['sitemap_pages_priority'] ) );
+		}
+		else
+		{
+			\IPS\Settings::i()->changeValues( array( 'sitemap_pages_count' => $values['sitemap_pages_count'], 'sitemap_pages_priority' => $values['sitemap_pages_priority'] ) );
+		}
+	}
 	
 	/**
 	 * Get the sitemap filename(s)
@@ -82,6 +100,12 @@ class _Pages
 	 */
 	public function generateSitemap( $filename, $sitemap )
 	{
+		/* We have elected to not add databases to the sitemap */
+		if ( ! \IPS\Settings::i()->sitemap_pages_count )
+		{
+			return NULL;
+		}
+		
 		$class  = '\IPS\cms\Pages\Page';
 		$count  = 0;
 		$member = new \IPS\Member;
@@ -97,7 +121,14 @@ class _Pages
 		$totalLimit = \IPS\Settings::i()->sitemap_pages_count;
 		if ( $totalLimit > -1 and ( $offset + $limit ) > $totalLimit )
 		{
-			$limit = $totalLimit - $offset;
+			if ( $totalLimit < $limit )
+			{
+				$limit = $totalLimit;
+			}
+			else
+			{
+				$limit = $totalLimit - $offset;
+			}
 		}
 			
 		$where = array( array( '(' . \IPS\Db::i()->findInSet( 'perm_' . $class::$permissionMap[ $permissionCheck ], $member->groups ) . ' OR ' . 'perm_' . $class::$permissionMap[ $permissionCheck ] . '=? )', '*' ) );