Version 5.0.0 beta 1
This commit is contained in:
1 parent
25ddeb65d6
commit
15c7beabc5
6736 files changed
+627902
-497943
No files matched your search
@@ -12,28 +12,46 @@
|
||||
namespace IPS\gallery\extensions\core\Sitemap;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
|
||||
use IPS\Content\Filter;
|
||||
use IPS\Content\Item;
|
||||
use IPS\core\extensions\core\Sitemap\Content;
|
||||
use IPS\DateTime;
|
||||
use IPS\Db;
|
||||
use IPS\Extensions\SitemapAbstract;
|
||||
use IPS\File;
|
||||
use IPS\gallery\Image;
|
||||
use IPS\Member;
|
||||
use IPS\Settings;
|
||||
use IPS\Sitemap;
|
||||
use UnderflowException;
|
||||
use function defined;
|
||||
use function intval;
|
||||
use function is_array;
|
||||
use const IPS\SITEMAP_MAX_PER_FILE;
|
||||
|
||||
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
{
|
||||
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
|
||||
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
|
||||
exit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Support Images in sitemaps
|
||||
*/
|
||||
class _Images
|
||||
class Images extends SitemapAbstract
|
||||
{
|
||||
/**
|
||||
* @brief Recommended Settings
|
||||
*/
|
||||
public $recommendedSettings = array();
|
||||
public array $recommendedSettings = array();
|
||||
|
||||
/**
|
||||
* Add settings for ACP configuration to the form
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function settings()
|
||||
public function settings(): array
|
||||
{
|
||||
return array();
|
||||
}
|
||||
@@ -43,9 +61,9 @@ class _Images
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getFilenames()
|
||||
public function getFilenames(): array
|
||||
{
|
||||
$settings = \IPS\Settings::i()->sitemap_content_settings ? json_decode( \IPS\Settings::i()->sitemap_content_settings, TRUE ) : array();
|
||||
$settings = Settings::i()->sitemap_content_settings ? json_decode( Settings::i()->sitemap_content_settings, TRUE ) : array();
|
||||
$class = 'IPS\\gallery\\Image';
|
||||
$limit = ( isset( $settings["sitemap_{$class::$title}_count"] ) ) ? $settings["sitemap_{$class::$title}_count"] : -1;
|
||||
|
||||
@@ -54,10 +72,10 @@ class _Images
|
||||
return array();
|
||||
}
|
||||
|
||||
$count = \IPS\gallery\Image::getItemsWithPermission( array( 'image_media=?', 0 ), NULL, 10, 'read', \IPS\Content\Hideable::FILTER_AUTOMATIC, 0, new \IPS\Member, FALSE, FALSE, FALSE, TRUE );
|
||||
$count = Image::getItemsWithPermission( array( 'image_media=?', 0 ), NULL, 10, 'read', Filter::FILTER_AUTOMATIC, 0, new Member, FALSE, FALSE, FALSE, TRUE );
|
||||
$files = array();
|
||||
|
||||
$count = ceil( $count / \IPS\SITEMAP_MAX_PER_FILE );
|
||||
$count = ceil( $count / SITEMAP_MAX_PER_FILE );
|
||||
|
||||
for( $i=1; $i <= $count; $i++ )
|
||||
{
|
||||
@@ -71,21 +89,21 @@ class _Images
|
||||
* Generate the sitemap
|
||||
*
|
||||
* @param string $filename The sitemap file to build (should be one returned from getFilenames())
|
||||
* @param \IPS\Sitemap $sitemap Sitemap object reference
|
||||
* @return void
|
||||
* @param Sitemap $sitemap Sitemap object reference
|
||||
* @return int|null
|
||||
*/
|
||||
public function generateSitemap( $filename, $sitemap )
|
||||
public function generateSitemap( string $filename, Sitemap $sitemap ) : ?int
|
||||
{
|
||||
$entries = array();
|
||||
$lastId = 0;
|
||||
$settings = \IPS\Settings::i()->sitemap_content_settings ? json_decode( \IPS\Settings::i()->sitemap_content_settings, TRUE ) : array();
|
||||
$settings = Settings::i()->sitemap_content_settings ? json_decode( Settings::i()->sitemap_content_settings, TRUE ) : array();
|
||||
$class = 'IPS\\gallery\\Image';
|
||||
|
||||
$exploded = explode( '_', $filename );
|
||||
$block = (int) array_pop( $exploded );
|
||||
$totalLimit = ( isset( $settings["sitemap_{$class::$title}_count"] ) AND $settings["sitemap_{$class::$title}_count"] ) ? $settings["sitemap_{$class::$title}_count"] : \IPS\core\extensions\core\Sitemap\Content::RECOMMENDED_ITEM_LIMIT;
|
||||
$offset = ( $block - 1 ) * \IPS\SITEMAP_MAX_PER_FILE;
|
||||
$limit = \IPS\SITEMAP_MAX_PER_FILE;
|
||||
$totalLimit = ( isset( $settings["sitemap_{$class::$title}_count"] ) AND $settings["sitemap_{$class::$title}_count"] ) ? $settings["sitemap_{$class::$title}_count"] : Content::RECOMMENDED_ITEM_LIMIT;
|
||||
$offset = ( $block - 1 ) * SITEMAP_MAX_PER_FILE;
|
||||
$limit = SITEMAP_MAX_PER_FILE;
|
||||
|
||||
if ( ! $totalLimit )
|
||||
{
|
||||
@@ -106,7 +124,7 @@ class _Images
|
||||
/* Try to fetch the highest ID built in the last sitemap, if it exists */
|
||||
try
|
||||
{
|
||||
$lastId = \IPS\Db::i()->select( 'last_id', 'core_sitemap', array( array( 'sitemap=?', implode( '_', $exploded ) . '_' . ( $block - 1 ) ) ) )->first();
|
||||
$lastId = Db::i()->select( 'last_id', 'core_sitemap', array( array( 'sitemap=?', implode( '_', $exploded ) . '_' . ( $block - 1 ) ) ) )->first();
|
||||
|
||||
if( $lastId > 0 )
|
||||
{
|
||||
@@ -114,12 +132,12 @@ class _Images
|
||||
$limitClause = $limit;
|
||||
}
|
||||
}
|
||||
catch( \UnderflowException $e ){}
|
||||
catch( UnderflowException ){}
|
||||
|
||||
$idColumn = $class::$databaseColumnId;
|
||||
foreach ( $class::getItemsWithPermission( $where, $class::$databasePrefix . $class::$databaseColumnId .' ASC', $limitClause, 'read', \IPS\Content\Hideable::FILTER_PUBLIC_ONLY, \IPS\Content\Item::SELECT_IDS_FIRST, new \IPS\Member, TRUE ) as $item )
|
||||
foreach ( $class::getItemsWithPermission( $where, $class::$databasePrefix . $class::$databaseColumnId .' ASC', $limitClause, 'read', Filter::FILTER_PUBLIC_ONLY, Item::SELECT_IDS_FIRST, new Member, TRUE ) as $item )
|
||||
{
|
||||
if( !$item->canView( new \IPS\Member ) )
|
||||
if( !$item->canView( new Member ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@@ -130,16 +148,16 @@ class _Images
|
||||
if ( isset( $item::$databaseColumnMap['last_comment'] ) )
|
||||
{
|
||||
$lastCommentField = $item::$databaseColumnMap['last_comment'];
|
||||
if ( \is_array( $lastCommentField ) )
|
||||
if ( is_array( $lastCommentField ) )
|
||||
{
|
||||
foreach ( $lastCommentField as $column )
|
||||
{
|
||||
$lastMod = \IPS\DateTime::ts( $item->$column );
|
||||
$lastMod = DateTime::ts( $item->$column );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$lastMod = \IPS\DateTime::ts( $item->$lastCommentField );
|
||||
$lastMod = DateTime::ts( $item->$lastCommentField );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,11 +168,11 @@ class _Images
|
||||
|
||||
/* Image sitemap data */
|
||||
$data['image:image'] = array(
|
||||
'image:loc' => (string) \IPS\File::get( 'gallery_Images', $item->masked_file_name )->url->setScheme( ( mb_substr( \IPS\Settings::i()->base_url, 0, 5 ) === 'https' ) ? 'https' : 'http' ),
|
||||
'image:loc' => (string) File::get( 'gallery_Images', $item->masked_file_name )->url->setScheme( ( mb_substr( Settings::i()->base_url, 0, 5 ) === 'https' ) ? 'https' : 'http' ),
|
||||
'image:title' => $item->mapped('title')
|
||||
);
|
||||
|
||||
$priority = ( $item->sitemapPriority() ?: ( \intval( isset( $settings["sitemap_{$class::$title}_priority"] ) ? $settings["sitemap_{$class::$title}_priority"] : \IPS\core\extensions\core\Sitemap\Content::RECOMMENDED_ITEM_PRIORITY ) ) );
|
||||
$priority = ( $item->sitemapPriority() ?: ( intval($settings["sitemap_{$class::$title}_priority"] ?? Content::RECOMMENDED_ITEM_PRIORITY) ) );
|
||||
if ( $priority !== -1 )
|
||||
{
|
||||
$data['priority'] = $priority;
|
||||
@@ -165,7 +183,18 @@ class _Images
|
||||
$lastId = $item->$idColumn;
|
||||
}
|
||||
|
||||
$sitemap->buildSitemapFile( $filename, $entries, $lastId, array( 'image' => 'http://www.google.com/schemas/sitemap-image/1.1' ) );
|
||||
$sitemap->buildSitemapFile( $filename, $entries, $lastId, array( 'image' => 'https://www.google.com/schemas/sitemap-image/1.1' ) );
|
||||
return $lastId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Save settings for ACP configuration
|
||||
*
|
||||
* @param array $values Values
|
||||
* @return void
|
||||
*/
|
||||
public function saveSettings( array $values ): void
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user