Version 4.3.6

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

@@ -43,6 +43,24 @@ class _Databases
 			'sitemap_databases_priority' => new \IPS\Helpers\Form\Select( 'sitemap_databases_priority', \IPS\Settings::i()->sitemap_databases_priority, FALSE, array( 'options' => \IPS\Sitemap::$priorities, 'unlimited' => '-1', 'unlimitedLang' => 'sitemap_dont_include' ), NULL, NULL, NULL, 'sitemap_databases_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_databases_count' => $this->recommendedSettings['sitemap_databases_count'], 'sitemap_databases_priority' => $this->recommendedSettings['sitemap_databases_priority'] ) );
+		}
+		else
+		{
+			\IPS\Settings::i()->changeValues( array( 'sitemap_databases_count' => $values['sitemap_databases_count'], 'sitemap_databases_priority' => $values['sitemap_databases_priority'] ) );
+		}
+	}
 	
 	/**
 	 * Get the sitemap filename(s)
@@ -115,6 +133,12 @@ class _Databases
 	 */
 	public function generateSitemap( $filename, $sitemap )
 	{
+		/* We have elected to not add databases to the sitemap */
+		if ( ! \IPS\Settings::i()->sitemap_databases_count )
+		{
+			return NULL;
+		}
+		
 		$tmp = explode( '_', $filename );
 		$databaseId = intval( array_shift( $tmp ) );
 		$database   = \IPS\cms\Databases::load( $databaseId );
@@ -165,7 +189,14 @@ class _Databases
 			$totalLimit = \IPS\Settings::i()->sitemap_databases_count;
 			if ( $totalLimit > -1 and ( $offset + $limit ) > $totalLimit )
 			{
-				$limit = $totalLimit - $offset;
+				if ( $totalLimit < $limit )
+				{
+					$limit = $totalLimit;
+				}
+				else
+				{
+					$limit = $totalLimit - $offset;
+				}
 			}
 			
 			foreach ( $class::getItemsWithPermission( $class::sitemapWhere(), NULL, array( $offset, $limit ), 'read', \IPS\Content\Hideable::FILTER_PUBLIC_ONLY, 0, new \IPS\Member, TRUE ) as $item )