Upload file size limit configuration & handling

This commit is contained in:
2022-08-06 22:46:32 -04:00
parent 1600fd4815
commit 1ba94a412b
3 changed files with 20 additions and 2 deletions
+1
View File
@@ -12,6 +12,7 @@ system:
profile_picture_size = "51200"; profile_picture_size = "51200";
site_apple_app = "https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls=1&mt=8"; site_apple_app = "https://itunes.apple.com/us/app/wrenchboard/id1435718367?ls=1&mt=8";
site_andriod_app = "https://play.google.com/store/apps/details?id=com.wrenchboard.users"; site_andriod_app = "https://play.google.com/store/apps/details?id=com.wrenchboard.users";
upload_size_limit = "3145728";
}; };
+18 -1
View File
@@ -304,6 +304,7 @@ class Proj extends Users_Controller {
$this->load->model('backend_model'); $this->load->model('backend_model');
if ($_POST && !isset($_POST['uploadForm'])) { if ($_POST && !isset($_POST['uploadForm'])) {
$msgArray = array(); $msgArray = array();
$msgArray['message'] = trim($this->input->post('jobmessage')); $msgArray['message'] = trim($this->input->post('jobmessage'));
@@ -325,6 +326,8 @@ class Proj extends Users_Controller {
$data = $this->load_files($data, $jobID); $data = $this->load_files($data, $jobID);
$data["sizeLimit"] = $this->backend_model->cfgReadChar("system.upload_size_limit");
$this->load->model('dash_model'); $this->load->model('dash_model');
$out = $this->dash_model->getDashData($data); $out = $this->dash_model->getDashData($data);
$data['active_task'] = $out['active_task']; $data['active_task'] = $out['active_task'];
@@ -415,6 +418,8 @@ class Proj extends Users_Controller {
$data = $this->load_files($data, $jobID); $data = $this->load_files($data, $jobID);
//$this->load_files($data, $jobID); //$this->load_files($data, $jobID);
$data["sizeLimit"] = $this->backend_model->cfgReadChar("system.upload_size_limit");
$this->load->model('dash_model'); $this->load->model('dash_model');
$out = $this->dash_model->getDashData($data); $out = $this->dash_model->getDashData($data);
$data['active_task'] = $out['active_task']; $data['active_task'] = $out['active_task'];
@@ -490,6 +495,8 @@ class Proj extends Users_Controller {
$data = $this->load_files($data, $jobID); $data = $this->load_files($data, $jobID);
$data["sizeLimit"] = $this->backend_model->cfgReadChar("system.upload_size_limit");
if ($_POST && !isset($_POST['uploadForm'])) { if ($_POST && !isset($_POST['uploadForm'])) {
$msgArray = array(); $msgArray = array();
$msgArray['message'] = trim($this->input->post('jobmessage')); $msgArray['message'] = trim($this->input->post('jobmessage'));
@@ -579,6 +586,8 @@ class Proj extends Users_Controller {
$data = $this->load_files($data, $jobID); $data = $this->load_files($data, $jobID);
$data["sizeLimit"] = $this->backend_model->cfgReadChar("system.upload_size_limit");
if ($_POST && !isset($_POST['uploadForm'])) { if ($_POST && !isset($_POST['uploadForm'])) {
$msgArray = array(); $msgArray = array();
$msgArray['message'] = trim($this->input->post('jobmessage')); $msgArray['message'] = trim($this->input->post('jobmessage'));
@@ -1051,6 +1060,7 @@ class Proj extends Users_Controller {
$result = ""; $result = "";
$d_txt = ""; $d_txt = "";
$is_live = $this->backend_model->cfgReadChar("system.live"); $is_live = $this->backend_model->cfgReadChar("system.live");
$sizeLimit = $this->backend_model->cfgReadChar("system.upload_size_limit");
if ($this->input->post('contractId') == "" || (int) $_SESSION['member_id'] < 1) { if ($this->input->post('contractId') == "" || (int) $_SESSION['member_id'] < 1) {
$result = "Invalid contract or member ID"; $result = "Invalid contract or member ID";
} else if (is_array($files)) { } else if (is_array($files)) {
@@ -1062,7 +1072,8 @@ class Proj extends Users_Controller {
foreach ($files["name"] as $key => $name) { foreach ($files["name"] as $key => $name) {
if ($files["error"][$key] == 0) { if ($files["error"][$key] == 0) {
$target_file = $target_dir . "/" . $name; $target_file = $target_dir . "/" . $name;
if (move_uploaded_file($files["tmp_name"][$key], $target_file)) { if ($files["size"][$key] <= $sizeLimit
&& move_uploaded_file($files["tmp_name"][$key], $target_file)) {
$msgArray['action'] = WRENCHBOARD_CONTRACT_MESSAGE; $msgArray['action'] = WRENCHBOARD_CONTRACT_MESSAGE;
$msgArray['message'] = $name; $msgArray['message'] = $name;
$msgArray['contract'] = $this->input->post('contractId'); $msgArray['contract'] = $this->input->post('contractId');
@@ -1096,6 +1107,10 @@ class Proj extends Users_Controller {
$jobID = $this->input->post('jobID'); $jobID = $this->input->post('jobID');
$contractId = $this->input->post('contractId'); $contractId = $this->input->post('contractId');
$this->load->model('backend_model');
$sizeLimit = $this->backend_model->cfgReadChar("system.upload_size_limit");
$files = array( $files = array(
"name" => array($_FILES["fileToUpload"]["name"]), "name" => array($_FILES["fileToUpload"]["name"]),
"error" => array($_FILES["fileToUpload"]["error"]), "error" => array($_FILES["fileToUpload"]["error"]),
@@ -1104,6 +1119,8 @@ class Proj extends Users_Controller {
"type" => array($_FILES["fileToUpload"]["type"]) "type" => array($_FILES["fileToUpload"]["type"])
); );
$is_live = $this->backend_model->cfgReadChar("system.live");
list ($message, $uploaded) = $this->process_files($files); list ($message, $uploaded) = $this->process_files($files);
if ($uploaded) { if ($uploaded) {
@@ -119,7 +119,7 @@
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
const sizeLimit = <?php echo '3145728'; ?>; const sizeLimit = <?php echo (isset($sizeLimit) && $sizeLimit > 0) ? $sizeLimit : '100000'; ?>;
function fileToUploadChanged(e) { function fileToUploadChanged(e) {
var fileList = $('#fileToUpload').prop("files"); // e.files; var fileList = $('#fileToUpload').prop("files"); // e.files;
$('#fileToUploadList').html(''); $('#fileToUploadList').html('');