AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #259 from wrongecho/misc 

Misc - small changes to document tagging/files
This commit is contained in:
Johnny 2022-01-09 12:55:59 -05:00 committed by GitHub
parent 41d2a0e327 b27edc9d38
commit c4d2334759
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
add_asset_csv_modal.php
View File

@ -8,12 +8,12 @@
</button> </button>
</div> </div>
<div class="modal-body bg-white"> <div class="modal-body bg-white">
<p>Format: name, type, make, model, serial, os</p> <p>Format: CSV file with headings & data: name, type, make, model, serial, os</p>
<form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off"> <form action="post.php" method="post" enctype="multipart/form-data" autocomplete="off">
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>"> <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<div class="form-group"> <div class="form-group">
<input type="file" class="form-control-file" name="file"> <input type="file" class="form-control-file" name="file" accept=".csv">
</div> </div>
</div> </div>

2
add_file_modal.php
View File

@ -16,7 +16,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<input type="file" class="form-control-file" name="file"> <input type="file" class="form-control-file" name="file" accept=".jpg, .gif, .png, .pdf, .txt, .doc, .docx, .csv, .xls, .xlsx, .zip, .tar, .gz">
</div> </div>
</div> </div>

47
post.php
View File

@ -4135,14 +4135,35 @@ if(isset($_POST['add_asset'])){
if(isset($_POST["import_client_assets_csv"])){ if(isset($_POST["import_client_assets_csv"])){
$client_id = intval($_POST['client_id']); $client_id = intval($_POST['client_id']);
$file_name = $_FILES["file"]["tmp_name"]; $file_name = $_FILES["file"]["tmp_name"];
$error = FALSE;
if($_FILES["file"]["size"] > 0){ //Check file is CSV
$file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
$allowed_file_extensions = array('csv');
if(in_array($file_extension,$allowed_file_extensions) === false){
$error = TRUE;
$_SESSION['alert_message'] = "Bad file extension";
}
//Need to put a CSV file check and maybe a format check so it doesnt just import anything //Check file isn't empty
elseif($_FILES["file"]["size"] < 1){
$error = TRUE;
$_SESSION['alert_message'] = "Bad file size (empty?)";
}
//(Else)Check column count (name, type, make, model, serial, os)
$f = fopen($file_name, "r");
$f_columns = fgetcsv($f, 1000, ",");
if(!$error & count($f_columns) != 6) {
$error = TRUE;
$_SESSION['alert_message'] = "Bad column count.";
}
//Else, parse the file
if(!$error){
$file = fopen($file_name, "r"); $file = fopen($file_name, "r");
fgetcsv($file, 1000, ","); // Skip first line fgetcsv($file, 1000, ","); // Skip first line
$count = 0; $asset_count = 0;
while(($column = fgetcsv($file, 1000, ",")) !== FALSE){ while(($column = fgetcsv($file, 1000, ",")) !== FALSE){
if(isset($column[0])){ if(isset($column[0])){
$name = trim(strip_tags(mysqli_real_escape_string($mysqli, $column[0]))); $name = trim(strip_tags(mysqli_real_escape_string($mysqli, $column[0])));
@ -4167,20 +4188,21 @@ if(isset($_POST["import_client_assets_csv"])){
//Add //Add
mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_created_at = NOW(), asset_client_id = $client_id, company_id = $session_company_id"); mysqli_query($mysqli,"INSERT INTO assets SET asset_name = '$name', asset_type = '$type', asset_make = '$make', asset_model = '$model', asset_serial = '$serial', asset_os = '$os', asset_created_at = NOW(), asset_client_id = $client_id, company_id = $session_company_id");
$count = $count + 1; $asset_count = $asset_count + 1;
} }
fclose($file); fclose($file);
//Logging //Logging
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Asset', log_action = 'Import', log_description = '$session_name imported $count asset(s) via CSV file', log_created_at = NOW(), company_id = $session_company_id, log_client_id = $client_id, log_user_id = $session_user_id"); mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Asset', log_action = 'Import', log_description = '$session_name imported $asset_count asset(s) via CSV file', log_created_at = NOW(), company_id = $session_company_id, log_client_id = $client_id, log_user_id = $session_user_id");
$_SESSION['alert_message'] = "$count Asset(s) added"; $_SESSION['alert_message'] = "$asset_count Asset(s) added";
}else{ header("Location: " . $_SERVER["HTTP_REFERER"]);
// The file was empty }
$_SESSION['alert_type'] = "warning"; //Check for any errors, if there are notify user and redirect
$_SESSION['alert_message'] = "Something went wrong"; if($error) {
$_SESSION['alert_type'] = "warning";
header("Location: " . $_SERVER["HTTP_REFERER"]);
} }
header("Location: " . $_SERVER["HTTP_REFERER"]);
} }
if(isset($_POST['edit_asset'])){ if(isset($_POST['edit_asset'])){
@ -5201,6 +5223,9 @@ if(isset($_GET['delete_document'])){
mysqli_query($mysqli,"DELETE FROM documents WHERE document_id = $document_id AND company_id = $session_company_id"); mysqli_query($mysqli,"DELETE FROM documents WHERE document_id = $document_id AND company_id = $session_company_id");
// Delete the tag associations to documents
mysqli_query($mysqli, "DELETE FROM documents_tagged WHERE document_id = '$document_id'");
//Logging //Logging
mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Deleted', log_description = '$document_id', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id"); mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Document', log_action = 'Deleted', log_description = '$document_id', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id");