diff --git a/classes/FileItem.php b/classes/FileItem.php
index 6375051..17f73c5 100644
--- a/classes/FileItem.php
+++ b/classes/FileItem.php
@@ -4,7 +4,7 @@
  *
  * @copyright Copyright (C) 2002-2004 Justin Hagstrom, 2019-2023 Florin C Bodin aka orynider at github.com
  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License (GPL)
- *
+ * @version $Id: FileItem.php, v 2.2.6 2023/11/15 08:08:08 orynider Exp $
  * @link http://autoindex.sourceforge.net
  */
 
@@ -82,42 +82,42 @@ class FileItem extends Item
 	public function __construct($parent_dir, $filename)
 	{
 		parent::__construct($parent_dir, $filename);
-		if (!is_file($this -> parent_dir . $filename))
+		if (!is_file($this->parent_dir . $filename))
 		{
 			throw new ExceptionDisplay('File <em>' . Url::html_output($this->parent_dir . $filename) . '</em> does not exist.');
 		}
-		global $config, $words, $downloads;
+		global $config, $words, $downloads, $request;
 		$this->filename = $filename;
 		$this->size = new Size(filesize($this->parent_dir . $filename));
 		if (ICON_PATH)
 		{
 			$file_icon = new Icon($filename);
-			$this -> icon = $file_icon->__toString();
+			$this->icon = $file_icon->__toString();
 		}
-		$this->downloads = (DOWNLOAD_COUNT && $downloads -> is_set($parent_dir . $filename) ? (int)($downloads -> __get($parent_dir . $filename)) : 0);
-		$this->link = Url::html_output($_SERVER['PHP_SELF']) . '?dir=' . Url::translate_uri(substr($this->parent_dir, strlen($config->__get('base_dir')))) . '&amp;file=' . Url::translate_uri($filename);
+		$this->downloads = (DOWNLOAD_COUNT && $downloads->is_set($parent_dir . $filename) ? (int)($downloads->__get($parent_dir . $filename)) : 0);
+		$this->link = Url::html_output($request->server('PHP_SELF')) . '?dir=' . Url::translate_uri(substr($this->parent_dir, strlen($config->__get('base_dir')))) . '&amp;file=' . Url::translate_uri($filename);
 		
 		if (THUMBNAIL_HEIGHT && in_array(self::ext($filename), array('png', 'jpg', 'jpeg', 'jfif', 'gif', 'bmp')))
 		{
-			$this->thumb_link = ' <img src="' . Url::html_output($_SERVER['PHP_SELF'])
+			$this->thumb_link = ' <img src="' . Url::html_output($request->server('PHP_SELF'))
 			. '?thumbnail='. Url::translate_uri($this->parent_dir . $filename) . '"' 
-			. ' alt="' . $words -> __get('thumbnail of') . ' ' . $filename . '"' 
+			. ' alt="' . $words->__get('thumbnail of') . ' ' . $filename . '"' 
 			. ' />';
-			$this->thumb_link .= ' <a href="' . Url::html_output($_SERVER['PHP_SELF'])
-			. '?thm='. Url::translate_uri($this -> parent_dir . $filename) . '"' 
-			. ' alt="' . $words -> __get('thumbnail of') . ' ' . $filename . '"' 
-			. ' >' . $words -> __get('view') . ' ' . $words->__get('file') . '</a>';
+			$this->thumb_link .= ' <a href="' . Url::html_output($request->server('PHP_SELF'))
+			. '?thm='. Url::translate_uri($this->parent_dir . $filename) . '"' 
+			. ' alt="' . $words->__get('thumbnail of') . ' ' . $filename . '"' 
+			. ' >' . $words->__get('view') . ' ' . $words->__get('file') . '</a>';
 		}
 		elseif (THUMBNAIL_HEIGHT && in_array(self::ext($filename), array('thm', 'thm')))
 		{
-			$this->thumb_link = ' <img src="' . Url::html_output($_SERVER['PHP_SELF'])
+			$this->thumb_link = ' <img src="' . Url::html_output($request->server('PHP_SELF'))
 			. '?thm='. Url::translate_uri($this->parent_dir . $filename) . '"' 
-			. ' alt="' . $words -> __get('thumbnail of') . ' ' . $filename . '"' 
+			. ' alt="' . $words->__get('thumbnail of') . ' ' . $filename . '"' 
 			. ' />';
-			$this -> thumb_link .= ' <a href="' . Url::html_output($_SERVER['PHP_SELF'])
-			. '?thm='. Url::translate_uri($this -> parent_dir . $filename) . '"' 
-			. ' alt="' . $words -> __get('thumbnail of') . ' ' . $filename . '"' 
-			. ' >' . $words -> __get('view') . ' ' . $words->__get('file') . '</a>';
+			$this->thumb_link .= ' <a href="' . Url::html_output($request->server('PHP_SELF'))
+			. '?thm='. Url::translate_uri($this->parent_dir . $filename) . '"' 
+			. ' alt="' . $words->__get('thumbnail of') . ' ' . $filename . '"' 
+			. ' >' . $words->__get('view') . ' ' . $words->__get('file') . '</a>';
 		}
 		
 		if (THUMBNAIL_HEIGHT && in_array(self::ext($filename), array('avi', 'divx', 'xvid', 'mkv', 'asf', 'mov', 'wmv', '3gp', 'mp3', 'mp4', 'mpv', 'ogg', 'ogv','mpg', 'mpeg', 'flv', 'FLV', 'flvjs')))
@@ -125,21 +125,21 @@ class FileItem extends Item
 			$mime = new MimeType($filename);
 			$finfo = finfo_open(FILEINFO_MIME_TYPE);
 			//Display correct headers for media file
-			$mimetype = finfo_file($finfo, $this -> parent_dir . $filename);
-			$file_size = function_exists('getvideosize') ? getvideosize($this -> parent_dir . $filename) : array();
-			$file_mime = function_exists('getvideosize') ? $file_size['mime'] : $mime -> __toString();
-			$this -> thumb_link = '';
+			$mimetype = finfo_file($finfo, $this->parent_dir . $filename);
+			$file_size = function_exists('getvideosize') ? getvideosize($this->parent_dir . $filename) : array();
+			$file_mime = function_exists('getvideosize') ? $file_size['mime'] : $mime->__toString();
+			$this->thumb_link = '';
 
 			if (function_exists('imagecreatefromavi') && in_array(self::ext($filename), array('avi', 'divx', 'xvid')))
 			{
 				$this->thumb_link .= ' <video controls="play" src="' . Url::translate_uri($this->parent_dir . $filename) . '"'  
-				. ' poster="' . Url::html_output($_SERVER['PHP_SELF'])  . '"' 
+				. ' poster="' . Url::html_output($request->server('PHP_SELF'))  . '"' 
 				. ' type="' . $file_mime . ', ' . $mimetype . ', video/' . self::ext($filename) .'"' 
 				. ' />Your browser does not support the <code>video</code> element.'
-				. '<source src="' . Url::html_output($_SERVER['PHP_SELF']) . '" type="video/' . self::ext($filename) . '" />'
+				. '<source src="' . Url::html_output($request->server('PHP_SELF')) . '" type="video/' . self::ext($filename) . '" />'
 				. '</video> ';
 				 
-				$this->thumb_link .= '</br><img src="' . Url::html_output($_SERVER['PHP_SELF'])
+				$this->thumb_link .= '</br><img src="' . Url::html_output($request->server('PHP_SELF'))
 				. '?thumbnail='. Url::translate_uri($this->parent_dir . $filename) . '"' 
 				. ' alt="' . $words->__get('thumbnail of') . ' ' . $filename . '"' 
 				. ' />';
@@ -147,8 +147,8 @@ class FileItem extends Item
 			}
 			elseif (in_array(self::ext($filename), array('avi', 'divx', 'xvid', 'mkv', 'asf', 'mov', 'wmv', '3gp', 'mp4', 'mpv', 'ogv', 'mpg', 'mpeg')))
 			{				
-				$video_href = Url::html_output($_SERVER['PHP_SELF']) . '?thm='. Url::translate_uri($this->parent_dir . $filename);
-				$thumbnail = Url::html_output($_SERVER['PHP_SELF']) . '?thumbnail='. Url::translate_uri($this->parent_dir . $filename);
+				$video_href = Url::html_output($request->server('PHP_SELF')) . '?thm='. Url::translate_uri($this->parent_dir . $filename);
+				$thumbnail = Url::html_output($request->server('PHP_SELF')) . '?thumbnail='. Url::translate_uri($this->parent_dir . $filename);
 				
 				$this->thumb_link .= ' <video id="'.$filename.'" controls />'
 				. '<source src="' . $video_href . '" type="video/'. self::ext($filename) .'" />'
@@ -171,12 +171,12 @@ class FileItem extends Item
 					</script>';
 				//}
 				
-				$this -> thumb_link .= '</br><img src="' . Url::html_output($_SERVER['PHP_SELF'])
+				$this->thumb_link .= '</br><img src="' . Url::html_output($request->server('PHP_SELF'))
 				. '?thumbnail='. Url::translate_uri($this->parent_dir . $filename) . '"' 
-				. ' alt="' . $words -> __get('thumbnail of') . ' ' . $filename . '"' 
+				. ' alt="' . $words->__get('thumbnail of') . ' ' . $filename . '"' 
 				. ' />';
 				
-				$this -> thumb_link .= ' <a href="' . Url::html_output($_SERVER['PHP_SELF'])
+				$this->thumb_link .= ' <a href="' . Url::html_output($request->server('PHP_SELF'))
 				. '?thm='. Url::translate_uri($this->parent_dir . $filename) . '"' 
 				. ' alt="' . $words->__get('thumbnail of') . ' ' . $filename . '"' 
 				. ' >' . $words->__get('view') . ' ' . $words->__get('file') . '</a>';
@@ -184,8 +184,8 @@ class FileItem extends Item
 			}
 			elseif (in_array(self::ext($filename), array('flv', 'FLV', 'flvjs')))
 			{				
-				$video_href = Url::html_output($_SERVER['PHP_SELF']) . '?thm='. Url::translate_uri($this->parent_dir . $filename);
-				$thumbnail = Url::html_output($_SERVER['PHP_SELF']) . '?thumbnail='. Url::translate_uri($this->parent_dir . $filename);
+				$video_href = Url::html_output($request->server('PHP_SELF')) . '?thm='. Url::translate_uri($this->parent_dir . $filename);
+				$thumbnail = Url::html_output($request->server('PHP_SELF')) . '?thumbnail='. Url::translate_uri($this->parent_dir . $filename);
 				
 				$this->thumb_link .= '<script src="'.$config->__get('assets_path').'/javascript/flv.min.js"></script>';
 				$this->thumb_link .='<VIDEO controls="play" type="video/flv" id="videoElement" src="'.$video_href.'" loop="false" allowfullscreen="true" quality="high" width="425" height="360" scale="noscale" salign="lt" name="flvPlayer" align="center" bgcolor="#E3F0FB">
@@ -204,35 +204,35 @@ class FileItem extends Item
 				</script>
 				<source src="' . $video_href . '" type="video/'. self::ext($filename) .'" />
 				</VIDEO>';						
-				$this -> thumb_link .= ' <a href="' . Url::html_output($_SERVER['PHP_SELF'])
+				$this->thumb_link .= ' <a href="' . Url::html_output($request->server('PHP_SELF'))
 				. '?thm='. Url::translate_uri($this->parent_dir . $filename) . '"' 
-				. ' alt="' . $words -> __get('thumbnail of') . ' ' . $filename . '"' 
-				. ' >' . $words -> __get('view') . ' ' . $words->__get('file') . '</a>';
+				. ' alt="' . $words->__get('thumbnail of') . ' ' . $filename . '"' 
+				. ' >' . $words->__get('view') . ' ' . $words->__get('file') . '</a>';
 				
 			}
 			elseif (in_array(self::ext($filename), array('MP3', 'mp3', 'ogg')))
 			{
 				//<!-- audio tag starts here -->	
-				$this -> thumb_link .= ' <audio controls="play" src="' . Url::html_output($_SERVER['PHP_SELF'])
+				$this->thumb_link .= ' <audio controls="play" src="' . Url::html_output($request->server('PHP_SELF'))
 				. '?thm='. Url::translate_uri($this->parent_dir . $filename) . '"' 
-				. ' poster="' . Url::html_output($_SERVER['PHP_SELF'])  . '"' 
+				. ' poster="' . Url::html_output($request->server('PHP_SELF'))  . '"' 
 				. ' type="' . $file_mime . ', ' . $mimetype . ', audio/' . self::ext($filename) .'"'
 				. ' />Your browser does not support the <code>audio</code> element.'
-				.	'<source src="' . Url::html_output($_SERVER['PHP_SELF']) . '" type="audio/' . self::ext($filename) . '" />'
+				.	'<source src="' . Url::html_output($request->server('PHP_SELF')) . '" type="audio/' . self::ext($filename) . '" />'
 				. '</audio> ';
 				//<!-- audio tag ends here -->
 			}
 			else
 			{
-				$this -> thumb_link .= ' <video controls="play" src="' . Url::html_output($_SERVER['PHP_SELF'])
+				$this->thumb_link .= ' <video controls="play" src="' . Url::html_output($request->server('PHP_SELF'))
 				. '?thm='. Url::translate_uri($this->parent_dir . $filename) . '"' 
-				. ' poster="' . Url::html_output($_SERVER['PHP_SELF'])  . '"' 
+				. ' poster="' . Url::html_output($request->server('PHP_SELF'))  . '"' 
 				. ' type="' . $file_mime . ', ' . $mimetype . ', application/octet-stream"' 
 				. ' />Your browser does not support the <code>video</code> element.</video> ';
 				
-				$this -> thumb_link .= ' <a href="' . Url::html_output($_SERVER['PHP_SELF'])
+				$this->thumb_link .= ' <a href="' . Url::html_output($request->server('PHP_SELF'))
 				. '?thm='. Url::translate_uri($this->parent_dir . $filename) . '"' 
-				. ' alt="' . $words -> __get('thumbnail of') . ' ' . $filename . '"' 
+				. ' alt="' . $words->__get('thumbnail of') . ' ' . $filename . '"' 
 				. ' >' . $words->__get('view') . ' ' . $words->__get('file') . '</a>';
 				
 			}
@@ -241,25 +241,25 @@ class FileItem extends Item
 		{
 			$icon_svg = ICON_PATH ? Url::translate_uri($config->__get('icon_path') . 'svg.png') : Url::translate_uri($this->parent_dir . $filename);
 			$heightwidth = in_array(self::ext($filename), array('svg', 'xml')) ?  ' height="' . '150'  . '" width="' . '150'  . '" ' : ' '; 
-			$this -> thumb_link .= ' <img src="' . Url::html_output($_SERVER['PHP_SELF'])
+			$this->thumb_link .= ' <img src="' . Url::html_output($request->server('PHP_SELF'))
 			. '?thumbnail='. Url::translate_uri($icon_svg) . '"' 
 			. ' alt="' . $words->__get('thumbnail of') . ' ' . $filename . '"'
 			. ' />';
-			//. ' <img src="' . Url::html_output($_SERVER['PHP_SELF'])
-			//. '?thumbnail='. Url::translate_uri($this -> parent_dir . $filename) . '" srcset="' . Url::html_output($_SERVER['PHP_SELF'])
-			//. '?thumbnail='. Url::translate_uri($this -> parent_dir . $filename) . '"'  
-			//. ' alt="' . $words -> __get('thumbnail of') . ' ' . $filename . '"'
+			//. ' <img src="' . Url::html_output($request->server('PHP_SELF'))
+			//. '?thumbnail='. Url::translate_uri($this->parent_dir . $filename) . '" srcset="' . Url::html_output($request->server('PHP_SELF'))
+			//. '?thumbnail='. Url::translate_uri($this->parent_dir . $filename) . '"'  
+			//. ' alt="' . $words->__get('thumbnail of') . ' ' . $filename . '"'
 			//. $heightwidth . ' />';
 		}
 		
-		$size = $this -> size -> __get('bytes');
-		if (MD5_SHOW && $size > 0 && $size / 1048576 <= $config -> __get('md5_show'))
+		$size = $this->size->__get('bytes');
+		if (MD5_SHOW && $size > 0 && $size / 1048576 <= $config->__get('md5_show'))
 		{
-			$this -> md5_link = '<span class="autoindex_small">[<a class="autoindex_a" href="'
-			. Url::html_output($_SERVER['PHP_SELF']) . '?dir='
-			. Url::translate_uri(substr($this -> parent_dir, strlen($config -> __get('base_dir'))))
+			$this->md5_link = '<span class="autoindex_small">[<a class="autoindex_a" href="'
+			. Url::html_output($request->server('PHP_SELF')) . '?dir='
+			. Url::translate_uri(substr($this->parent_dir, strlen($config->__get('base_dir'))))
 			. '&amp;md5=' . Url::translate_uri($filename) . '">'
-			. $words -> __get('calculate md5sum') . '</a>]</span>';
+			. $words->__get('calculate md5sum') . '</a>]</span>';
 		}
 	}