Version 4.1.19
This commit is contained in:
1 parent
28bd025b35
commit
2bd5025018
2674 files changed
+233518
-77766
No files matched your search
@@ -2,9 +2,10 @@
|
||||
/**
|
||||
* @brief Support Pages Databases in sitemaps
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - SVN_YYYY Invision Power Services, Inc.
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Social Suite
|
||||
* @package IPS Community Suite
|
||||
* @subpackage Content
|
||||
* @since 1 April 2015
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
@@ -28,7 +29,7 @@ class _Databases
|
||||
*/
|
||||
public $recommendedSettings = array(
|
||||
'sitemap_databases_count' => -1,
|
||||
'sitemap_databases_priority' => -1
|
||||
'sitemap_databases_priority' => 1
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -81,7 +82,7 @@ class _Databases
|
||||
}
|
||||
|
||||
/* And however many for the content items */
|
||||
$count = ceil( max( (int) $class::getItemsWithPermission( $class::sitemapWhere(), NULL, 10, 'read', 10, \IPS\Db::SELECT_SQL_CALC_FOUND_ROWS, new \IPS\Member )->count( TRUE ), \IPS\Settings::i()->sitemap_databases_count ) / \IPS\Sitemap::MAX_PER_FILE );
|
||||
$count = ceil( max( (int) $class::getItemsWithPermission( $class::sitemapWhere(), NULL, 10, 'read', \IPS\Content\Hideable::FILTER_PUBLIC_ONLY, \IPS\Db::SELECT_SQL_CALC_FOUND_ROWS, new \IPS\Member )->count( TRUE ), \IPS\Settings::i()->sitemap_databases_count ) / \IPS\Sitemap::MAX_PER_FILE );
|
||||
for( $i=1; $i <= $count; $i++ )
|
||||
{
|
||||
$files[] = $database->id . '_sitemap_database_records_' . $i;
|
||||
@@ -134,9 +135,8 @@ class _Databases
|
||||
if ( $priority !== -1 )
|
||||
{
|
||||
$data['priority'] = $priority;
|
||||
$entries[] = $data;
|
||||
}
|
||||
|
||||
$entries[] = $data;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -154,16 +154,15 @@ class _Databases
|
||||
$limit = $totalLimit - $offset;
|
||||
}
|
||||
|
||||
foreach ( $class::getItemsWithPermission( $class::sitemapWhere(), NULL, array( $offset, $limit ), 'read', FALSE, 0, new \IPS\Member, TRUE ) as $item )
|
||||
foreach ( $class::getItemsWithPermission( $class::sitemapWhere(), NULL, array( $offset, $limit ), 'read', \IPS\Content\Hideable::FILTER_PUBLIC_ONLY, 0, new \IPS\Member, TRUE ) as $item )
|
||||
{
|
||||
$data = array( 'url' => $item->url() );
|
||||
$priority = ( $item->sitemapPriority() ?: ( intval( \IPS\Settings::i()->sitemap_databases_priority ) ) );
|
||||
if ( $priority !== -1 )
|
||||
{
|
||||
$data['priority'] = $priority;
|
||||
$entries[] = $data;
|
||||
}
|
||||
|
||||
$entries[] = $data;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
/**
|
||||
* @brief Support Pages in sitemaps
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - SVN_YYYY Invision Power Services, Inc.
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Social Suite
|
||||
* @package IPS Community Suite
|
||||
* @subpackage Content
|
||||
* @since 1 April 2015
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
@@ -28,7 +29,7 @@ class _Pages
|
||||
*/
|
||||
public $recommendedSettings = array(
|
||||
'sitemap_pages_count' => -1,
|
||||
'sitemap_pages_priority' => -1
|
||||
'sitemap_pages_priority' => 1
|
||||
);
|
||||
|
||||
/**
|
||||
@@ -86,6 +87,7 @@ class _Pages
|
||||
$count = 0;
|
||||
$member = new \IPS\Member;
|
||||
$permissionCheck = 'view';
|
||||
$entries = array();
|
||||
|
||||
$exploded = explode( '_', $filename );
|
||||
$block = (int) array_pop( $exploded );
|
||||
@@ -101,7 +103,7 @@ class _Pages
|
||||
|
||||
$where = array( array( '(' . \IPS\Db::i()->findInSet( 'perm_' . $class::$permissionMap[ $permissionCheck ], $member->groups ) . ' OR ' . 'perm_' . $class::$permissionMap[ $permissionCheck ] . '=? )', '*' ) );
|
||||
|
||||
$select = \IPS\Db::i()->select( '*', $class::$databaseTable, NULL, 'page_id ASC', array( $offset, $limit ) )
|
||||
$select = \IPS\Db::i()->select( '*', $class::$databaseTable, $where, 'page_id ASC', array( $offset, $limit ) )
|
||||
->join( 'core_permission_index', array( "core_permission_index.app=? AND core_permission_index.perm_type=? AND core_permission_index.perm_type_id=" . $class::$databaseTable . "." . $class::$databasePrefix . $class::$databaseColumnId, $class::$permApp, $class::$permType ) );
|
||||
|
||||
foreach( $select as $row )
|
||||
@@ -113,9 +115,8 @@ class _Pages
|
||||
if ( $priority !== -1 )
|
||||
{
|
||||
$data['priority'] = $priority;
|
||||
$entries[] = $data;
|
||||
}
|
||||
|
||||
$entries[] = $data;
|
||||
}
|
||||
|
||||
$sitemap->buildSitemapFile( $filename, $entries );
|
||||
|
||||
Reference in new issue
Block a user