Version 4.7.23
This commit is contained in:
1 parent
7124a02564
commit
25ddeb65d6
1791 files changed
+76990
-44452
No files matched your search
@@ -216,7 +216,7 @@ class _browse extends \IPS\Content\Controller
|
||||
$new = array();
|
||||
if( \IPS\Settings::i()->gallery_show_new_images )
|
||||
{
|
||||
$new = iterator_to_array( \IPS\gallery\Image::getItemsWithPermission( \IPS\gallery\Image::clubImageExclusion(), NULL, \IPS\Settings::i()->gallery_new_images_count, 'read', \IPS\Content\Hideable::FILTER_AUTOMATIC, 0, NULL, !\IPS\Settings::i()->club_nodes_in_apps ) );
|
||||
$new = iterator_to_array( \IPS\gallery\Image::getItemsWithPermission( \IPS\gallery\Image::clubImageExclusion(), NULL, \IPS\Settings::i()->gallery_new_images_count, 'read', \IPS\Content\Hideable::FILTER_AUTOMATIC, 0, NULL, !\IPS\Settings::i()->club_nodes_in_apps, false, false, false, null, false, false, false ) );
|
||||
}
|
||||
|
||||
/* Recently updated albums */
|
||||
@@ -232,7 +232,7 @@ class _browse extends \IPS\Content\Controller
|
||||
{
|
||||
$commentWhere = \IPS\gallery\Image::clubImageExclusion();
|
||||
$commentWhere[] = array( 'image_comments > 0' );
|
||||
$recentComments = \IPS\gallery\Image::getItemsWithPermission( $commentWhere, 'image_last_comment DESC', 10, 'read', \IPS\Content\Hideable::FILTER_PUBLIC_ONLY, 0, NULL, !\IPS\Settings::i()->club_nodes_in_apps );
|
||||
$recentComments = \IPS\gallery\Image::getItemsWithPermission( $commentWhere, 'image_last_comment DESC', 10, 'read', \IPS\Content\Hideable::FILTER_PUBLIC_ONLY, 0, NULL, !\IPS\Settings::i()->club_nodes_in_apps, false, false, false, null, false, false, false );
|
||||
}
|
||||
|
||||
/* Online User Location */
|
||||
|
||||
@@ -734,6 +734,7 @@ class _submit extends \IPS\Dispatcher\Controller
|
||||
}
|
||||
|
||||
/* Get the total number of images now as it will decrease each cycle moving forward */
|
||||
/* @note SELECT_FROM_WRITE_SERVER added in pull #5011 */
|
||||
$totalImages = \IPS\Db::i()->select( 'count(*)', 'gallery_images_uploads', array( 'upload_session=?', session_id() ), NULL, NULL, NULL, NULL, \IPS\Db::SELECT_FROM_WRITE_SERVER )->first();
|
||||
|
||||
$url = $url->setQueryString( 'totalImages', $totalImages );
|
||||
@@ -763,7 +764,8 @@ class _submit extends \IPS\Dispatcher\Controller
|
||||
function( $offset ) use ( $url )
|
||||
{
|
||||
$offset = \intval( $offset );
|
||||
|
||||
|
||||
/* @note SELECT_FROM_WRITE_SERVER added in pull #5011 */
|
||||
$existing = \IPS\Db::i()->select( '*', 'gallery_images_uploads', array( 'upload_session=?', session_id() ), 'upload_order ASC', array( 0, 1 ), NULL, NULL, \IPS\Db::SELECT_FROM_WRITE_SERVER )->setKeyField( 'upload_location' );
|
||||
|
||||
/* Get category and album data */
|
||||
|
||||
@@ -394,6 +394,7 @@ class _view extends \IPS\Content\Controller
|
||||
|
||||
\IPS\Output::i()->sendHeader( "Content-Security-Policy: default-src 'none'; sandbox" );
|
||||
\IPS\Output::i()->sendHeader( "X-Content-Security-Policy: default-src 'none'; sandbox" );
|
||||
\IPS\Output::i()->sendHeader( "Cross-Origin-Opener-Policy: same-origin" );
|
||||
|
||||
if( $image !== NULL )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user