Version 4.7.13

applications/gallery/extensions/core/EditorMedia/Images.php

@@ -36,12 +36,25 @@ class _Images
 		$where = array(
 			array( "image_member_id=? AND image_approved=?", $member->member_id, 1 ),
 		);
-		
+
 		if ( $search )
 		{
-			$where[] = array( "image_caption LIKE ( CONCAT( '%', ?, '%' ) )", $search );
+			$albumIds = [];
+			foreach( \IPS\Db::i()->select( 'album_id', 'gallery_albums', array( "album_owner_id=? AND album_name LIKE ( CONCAT( '%', ?, '%' ) )", $member->member_id, $search ), NULL, 250 ) as $album )
+			{
+				$albumIds[] = $album;
+			}
+
+			if ( count( $albumIds ) )
+			{
+				$where[] = array( "( image_caption LIKE ( CONCAT( '%', ?, '%' ) ) OR ( " . \IPS\Db::i()->in( 'image_album_id', $albumIds ) . " ) )", $search );
+			}
+			else
+			{
+				$where[] = array( "image_caption LIKE ( CONCAT( '%', ?, '%' ) )", $search );
+			}
 		}
-						
+
 		return \IPS\Db::i()->select( 'COUNT(*)', 'gallery_images', $where )->first();
 	}
 	
@@ -60,17 +73,31 @@ class _Images
 		$where = array(
 			array( "image_member_id=? AND image_approved=?", $member->member_id, 1 ),
 		);
-		
+
 		if ( $search )
 		{
-			$where[] = array( "image_caption LIKE ( CONCAT( '%', ?, '%' ) )", $search );
+			$albumIds = [];
+			foreach( \IPS\Db::i()->select( 'album_id', 'gallery_albums', array( "album_owner_id=? AND album_name LIKE ( CONCAT( '%', ?, '%' ) )", $member->member_id, $search ), NULL, 250 ) as $album )
+			{
+				$albumIds[] = $album;
+			}
+
+			if ( count( $albumIds ) )
+			{
+				$where[] = array( "( image_caption LIKE ( CONCAT( '%', ?, '%' ) ) OR ( " . \IPS\Db::i()->in( 'image_album_id', $albumIds ) . " ) )", $search );
+			}
+			else
+			{
+				$where[] = array( "image_caption LIKE ( CONCAT( '%', ?, '%' ) )", $search );
+			}
 		}
-		
+
 		$return = array();
 		foreach ( \IPS\Db::i()->select( '*', 'gallery_images', $where, 'image_date DESC', array( ( $page - 1 ) * $limit, $limit ) ) as $row )
 		{
 			$image = \IPS\gallery\Image::load( $row['image_id'] );
-			$obj = \IPS\File::get( 'gallery_Images', $image->masked_file_name );
+			$fileName = $image->masked_file_name ?: $image->original_file_name;
+			$obj = \IPS\File::get( 'gallery_Images', $fileName );
 			$obj->contextInfo = $image->caption;
 			$return[ (string) $image->url() ] = $obj;
 		}

applications/gallery/extensions/core/Statistics/Bandwidth.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * @brief		Statistics Chart Extension
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @subpackage	Gallery
+ * @since		26 Jan 2023
+ */
+
+namespace IPS\gallery\extensions\core\Statistics;
+
+/* To prevent PHP errors (extending class does not exist) revealing path */
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+{
+	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
+	exit;
+}
+
+/**
+ * Statistics Chart Extension
+ */
+class _Bandwidth extends \IPS\core\Statistics\Chart
+{
+	/**
+	 * @brief	Controller
+	 */
+	public $controller = 'gallery_stats_bandwidth';
+	
+	/**
+	 * Render Chart
+	 *
+	 * @param	\IPS\Http\Url	$url	URL the chart is being shown on.
+	 * @return \IPS\Helpers\Chart
+	 */
+	public function getChart( \IPS\Http\Url $url ): \IPS\Helpers\Chart
+	{
+		$chart = new \IPS\Helpers\Chart\Database( \IPS\Http\Url::internal( "app=gallery&module=stats&controller=bandwidth" ), 'gallery_bandwidth', 'bdate', '', array( 
+			'backgroundColor' 	=> '#ffffff',
+			'colors'			=> array( '#10967e' ),
+			'hAxis'				=> array( 'gridlines' => array( 'color' => '#f5f5f5' ) ),
+			'lineWidth'			=> 1,
+			'areaOpacity'		=> 0.4,
+			'chartArea'			=> array( 'left' => 120, 'width' => '75%' ),
+			'vAxis' 			=> array( 
+				'title' => \IPS\Member::loggedIn()->language()->addToStack( 'filesize_raw_k' ) 
+			)
+		), 'AreaChart', 'daily', array( 'start' => 0, 'end' => 0 ), array( 'member_id', 'image_id', 'bdate', 'bsize' ) );
+		$chart->setExtension( $this );
+		
+		$chart->addSeries( \IPS\Member::loggedIn()->language()->addToStack('bandwidth'), 'number', 'ROUND((SUM(bsize)/1024),2)', FALSE );
+		
+		$chart->tableParsers = array(
+			'member_id'	=> function( $val )
+			{
+				$member = \IPS\Member::load( $val );
+
+				if( $member->member_id )
+				{
+					$url = \IPS\Http\Url::internal( "app=gallery&module=stats&controller=member&do=images&id={$member->member_id}" );
+					return \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->basicUrl( $url, FALSE, $member->name );
+				}
+				else
+				{
+					return \IPS\Member::loggedIn()->language()->addToStack('deleted_member');
+				}
+			},
+			'image_id'	=> function( $val )
+			{
+				try
+				{
+					$image = \IPS\gallery\Image::load( $val );
+					return \IPS\Theme::i()->getTemplate( 'global', 'core', 'global' )->basicUrl( $image->url(), TRUE, $image->caption );
+				}
+				catch ( \OutOfRangeException $e )
+				{
+					return \IPS\Member::loggedIn()->language()->addToStack('deleted_image');
+				}
+			},
+			'bdate'	=> function( $val )
+			{
+				return (string) \IPS\DateTime::ts( $val );
+			},
+			'bsize'	=> function( $val )
+			{
+				return \IPS\Output\Plugin\Filesize::humanReadableFilesize( $val );
+			}
+		);
+		
+		$chart->availableTypes = array( 'AreaChart', 'ColumnChart', 'BarChart' );
+		
+		return $chart;
+	}
+}