diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 22064242f..875b7bf4d 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -229,9 +229,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
 	$userfiletype = $_FILES["userfile"]["type"][$file_num];
 	$userfilename = $_FILES["userfile"]["name"][$file_num];
 	
-	$lastDotIndex = strrpos(basename($userfilename), ".");
-	if (is_bool($lastDotIndex) && !$lastDotIndex) $fileType = ".";
-	else $fileType = substr($userfilename, $lastDotIndex);
+	$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
 	if ((count($_FILES["userfile"]["tmp_name"])==1)&&($_POST["name"]!=""))
 		$name = $_POST["name"];
diff --git a/op/op.AddFile.php b/op/op.AddFile.php
index 255c9fed7..6955691c4 100644
--- a/op/op.AddFile.php
+++ b/op/op.AddFile.php
@@ -57,11 +57,7 @@ $userfiletmp = $_FILES["userfile"]["tmp_name"];
 $userfiletype = $_FILES["userfile"]["type"];
 $userfilename = $_FILES["userfile"]["name"];
 
-$lastDotIndex = strrpos(basename($userfilename), ".");
-if (is_bool($lastDotIndex) && !$lastDotIndex)
-	$fileType = ".";
-else
-	$fileType = substr($userfilename, $lastDotIndex);
+$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
 $res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, 
                                   basename($userfilename),$fileType, $userfiletype );
diff --git a/op/op.AddFile2.php b/op/op.AddFile2.php
index 9e3397f3a..8b0479a63 100644
--- a/op/op.AddFile2.php
+++ b/op/op.AddFile2.php
@@ -68,11 +68,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 			$name = $userfilename;
 		$comment  = $_POST["comment"];
 
-		$lastDotIndex = strrpos(basename($userfilename), ".");
-		if (is_bool($lastDotIndex) && !$lastDotIndex)
-			$fileType = ".";
-		else
-			$fileType = substr($userfilename, $lastDotIndex);
+		$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
 		$res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, 
 																			basename($userfilename),$fileType, $userfiletype );
diff --git a/op/op.AddMultiDocument.php b/op/op.AddMultiDocument.php
index 3de0805a4..6583a5fe7 100644
--- a/op/op.AddMultiDocument.php
+++ b/op/op.AddMultiDocument.php
@@ -172,9 +172,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 		$userfiletype = $_FILES[ $file_param_name ]["type"];
 		$userfilename = $_FILES[ $file_param_name ]["name"];
 
-		$lastDotIndex = strrpos(basename($userfilename), ".");
-		if (is_bool($lastDotIndex) && !$lastDotIndex) $fileType = ".";
-		else $fileType = substr($userfilename, $lastDotIndex);
+		$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
 		if(isset($_POST["name"]) && $_POST["name"] != "")
 			$name = $_POST["name"];
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index afe511e1f..3c3ed8b77 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -96,11 +96,7 @@ if ($_FILES['userfile']['error'] == 0) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("identical_version"));
 	}
 
-	$lastDotIndex = strrpos(basename($userfilename), ".");
-	if (is_bool($lastDotIndex) && !$lastDotIndex)
-		$fileType = ".";
-	else
-		$fileType = substr($userfilename, $lastDotIndex);
+	$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
 	// Get the list of reviewers and approvers for this document.
 	$reviewers = array();
diff --git a/op/op.UpdateDocument2.php b/op/op.UpdateDocument2.php
index 1c1948985..fa8ede591 100644
--- a/op/op.UpdateDocument2.php
+++ b/op/op.UpdateDocument2.php
@@ -71,11 +71,7 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
 		$userfiletype = $_FILES[ $file_param_name ]["type"];
 		$userfilename = $_FILES[ $file_param_name ]["name"];
 
-		$lastDotIndex = strrpos(basename($userfilename), ".");
-		if (is_bool($lastDotIndex) && !$lastDotIndex)
-			$fileType = ".";
-		else
-			$fileType = substr($userfilename, $lastDotIndex);
+		$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 
 		// Get the list of reviewers and approvers for this document.
 		$reviewers = array();
diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php
index a6663f032..63ed65b01 100644
--- a/op/op.UsrMgr.php
+++ b/op/op.UsrMgr.php
@@ -75,8 +75,7 @@ if ($action == "adduser") {
 		{
 			$userfiletype = $_FILES["userfile"]["type"];
 			$userfilename = $_FILES["userfile"]["name"];
-			$lastDotIndex = strrpos(basename($userfilename), ".");
-			$fileType = substr($userfilename, $lastDotIndex);
+			$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 			if ($fileType != ".jpg" && $filetype != ".jpeg") {
 				UI::exitError(getMLText("admin_tools"),getMLText("only_jpg_user_images"));
 			} else {
@@ -261,8 +260,7 @@ else if ($action == "edituser") {
 	{
 		$userfiletype = $_FILES["userfile"]["type"];
 		$userfilename = $_FILES["userfile"]["name"];
-		$lastDotIndex = strrpos(basename($userfilename), ".");
-		$fileType = substr($userfilename, $lastDotIndex);
+		$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
 		if ($fileType != ".jpg" && $filetype != ".jpeg") {
 			UI::exitError(getMLText("admin_tools"),getMLText("only_jpg_user_images"));
 		}