@@ -844,7 +844,7 @@ public static function expire($user) {
844844 $ dirContent = Helper::getTrashFiles ('/ ' , $ user , 'mtime ' );
845845
846846 // delete all files older then $retention_obligation
847- [$ delSize , $ count ] = self ::deleteExpiredFiles ($ dirContent , $ user, $ availableSpace <= 0 );
847+ [$ delSize , $ count ] = self ::deleteExpiredFiles ($ dirContent , $ user );
848848
849849 $ availableSpace += $ delSize ;
850850
@@ -906,18 +906,17 @@ protected static function deleteFiles(array $files, string $user, int|float $ava
906906 *
907907 * @param array $files list of files sorted by mtime
908908 * @param string $user
909- * @param bool $quotaExceeded
910909 * @return array{int|float, int} size of deleted files and number of deleted files
911910 */
912- public static function deleteExpiredFiles ($ files , $ user, bool $ quotaExceeded = false ) {
911+ public static function deleteExpiredFiles ($ files , $ user ) {
913912 /** @var Expiration $expiration */
914913 $ expiration = Server::get (Expiration::class);
915914 $ size = 0 ;
916915 $ count = 0 ;
917916 foreach ($ files as $ file ) {
918917 $ timestamp = $ file ['mtime ' ];
919918 $ filename = $ file ['name ' ];
920- if ($ expiration ->isExpired ($ timestamp, $ quotaExceeded )) {
919+ if ($ expiration ->isExpired ($ timestamp )) {
921920 try {
922921 $ size += self ::delete ($ filename , $ user , $ timestamp );
923922 $ count ++;
0 commit comments