From af0c31ec0ebbfabd3f6140b816752ccf96313225 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 12 Feb 2021 19:54:52 +0200 Subject: mimetype draft --- php/database.php | 2 +- php/file_type_recogniser.php | 2 +- php/upload.php | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/php/database.php b/php/database.php index fb3d35d..f5efec7 100644 --- a/php/database.php +++ b/php/database.php @@ -306,7 +306,7 @@ require_once "node.php"; } } /*returns the file name as it must be in the filesystem relative to the storage root*/ - function create_file_node(string $filename,string $note,int $dir_id,User $user): string + function create_file_node(string $filename,string $note,int $dir_id,string $mimetype,User $user): string { global $storage_root; /*checkout the directory*/ diff --git a/php/file_type_recogniser.php b/php/file_type_recogniser.php index f160fb7..d8e1d25 100644 --- a/php/file_type_recogniser.php +++ b/php/file_type_recogniser.php @@ -2,7 +2,7 @@ function file_type($path_to_file) { $file_type_database = new finfo(FILEINFO_SYMLINK|FILEINFO_MIME_TYPE); - return $file_type_database->file($path_to_file); + return $file_type_database->file($path_to_file); } diff --git a/php/upload.php b/php/upload.php index b22c3a8..ee5d1ae 100644 --- a/php/upload.php +++ b/php/upload.php @@ -1,6 +1,7 @@ home_directory; +$mimetype=file_type($file['tmp_name']); -$codename=$database->create_file_node($filename,"",$homedir,$user); +$codename=$database->create_file_node($filename,"",$homedir,$mimetype,$user); if($codename=="error") { error_log("could not create file_node in upload.php"); -- cgit v1.2.3 From 369de870ef6dbcd67ac9316bf714a6ded892eadc Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 12 Feb 2021 20:03:00 +0200 Subject: guesses mime types now --- php/database.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/php/database.php b/php/database.php index f5efec7..789ea86 100644 --- a/php/database.php +++ b/php/database.php @@ -347,11 +347,12 @@ require_once "node.php"; /*generate the node*/ $code=$this->get_random_node_name(""); if($filename==NULL)return "error"; - $prep=$this->pdo->prepare("insert into nodes(is_directory,relative_path,code) - values(false,:root,:code) + $prep=$this->pdo->prepare("insert into nodes(is_directory,relative_path,code,type) + values(false,:root,:code,:type) "); $prep->bindParam(':root',$code); $prep->bindParam(':code',$code); + $prep->bindParam(':type',$mimetype); if($prep->execute()==false) { -- cgit v1.2.3