X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fattachments.php;h=801d9628eb2357b10f995399ca6f606265582d14;hb=e991002080c10bc5172a4a1fd18ca634ae81c1b3;hp=2f41d80c14cc15cef973f5dedb2e4b3b0b1232e9;hpb=14f56ab219f12c3e2b1dec21f356505f1f8292bd;p=fa-stable.git diff --git a/admin/attachments.php b/admin/attachments.php index 2f41d80c..801d9628 100644 --- a/admin/attachments.php +++ b/admin/attachments.php @@ -20,6 +20,7 @@ include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/admin/db/attachments_db.inc"); include_once($path_to_root . "/admin/db/transactions_db.inc"); +include_once($path_to_root . "/inventory/includes/db/items_db.inc"); if (isset($_GET['vw'])) $view_id = $_GET['vw']; @@ -36,10 +37,7 @@ if ($view_id != -1) $type = ($row['filetype']) ? $row['filetype'] : 'application/octet-stream'; header("Content-type: ".$type); header('Content-Length: '.$row['filesize']); - //if ($type == 'application/octet-stream') - // header('Content-Disposition: attachment; filename='.$row['filename']); - //else - header("Content-Disposition: inline"); + header("Content-Disposition: inline"); echo file_get_contents(company_path(). "/attachments/".$row['unique_name']); exit(); } @@ -61,7 +59,7 @@ if ($download_id != -1) $type = ($row['filetype']) ? $row['filetype'] : 'application/octet-stream'; header("Content-type: ".$type); header('Content-Length: '.$row['filesize']); - header('Content-Disposition: attachment; filename='.$row['filename']); + header('Content-Disposition: attachment; filename="'.$row['filename'].'"'); echo file_get_contents(company_path()."/attachments/".$row['unique_name']); exit(); } @@ -69,7 +67,7 @@ if ($download_id != -1) } $js = ""; -if ($use_popup_windows) +if ($SysPrefs->use_popup_windows) $js .= get_js_open_window(800, 500); page(_($help_context = "Attach Documents"), false, false, "", $js); @@ -82,11 +80,25 @@ if (isset($_GET['trans_no'])) if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM') { + + $filename = basename($_FILES['filename']['name']); + if ($_POST['filterType'] == ST_ITEM && $Mode == 'ADD_ITEM') + $_POST['trans_no'] = get_item_code_id($_POST['trans_no']); if (!transaction_exists($_POST['filterType'], $_POST['trans_no'])) display_error(_("Selected transaction does not exists.")); - elseif ($Mode == 'ADD_ITEM' && (!isset($_FILES['filename']) || $_FILES['filename']['size'] == 0)) + elseif ($Mode == 'ADD_ITEM' && !in_array(strtoupper(substr($filename, strlen($filename) - 3)), array('JPG','PNG','GIF', 'PDF', 'DOC', 'ODT'))) + { + display_error(_('Only graphics,pdf,doc and odt files are supported.')); + } elseif ($Mode == 'ADD_ITEM' && !isset($_FILES['filename'])) display_error(_("Select attachment file.")); - else { + elseif ($Mode == 'ADD_ITEM' && ($_FILES['filename']['error'] > 0)) { + if ($_FILES['filename']['error'] == UPLOAD_ERR_INI_SIZE) + display_error(_("The file size is over the maximum allowed.")); + else + display_error(_("Select attachment file.")); + } elseif ( strlen($filename) > 60) { + display_error(_("File name exceeds maximum of 60 chars. Please change filename and try again.")); + } else { //$content = base64_encode(file_get_contents($_FILES['filename']['tmp_name'])); $tmpname = $_FILES['filename']['tmp_name']; @@ -94,13 +106,12 @@ if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM') if (!file_exists($dir)) { mkdir ($dir,0777); - $index_file = ""; + $index_file = "activate('_page_body'); - $Mode = 'RESET'; } if ($Mode == 'Delete') @@ -147,11 +158,15 @@ if ($Mode == 'Delete') unlink($dir."/".$row['unique_name']); delete_attachment($selected_id); display_notification(_("Attachment has been deleted.")); - $Mode = 'RESET'; + reset_form(); } if ($Mode == 'RESET') + reset_form(); + +function reset_form() { + global $selected_id; unset($_POST['trans_no']); unset($_POST['description']); $selected_id = -1; @@ -166,7 +181,15 @@ function viewing_controls() start_row(); systypes_list_cells(_("Type:"), 'filterType', null, true); if (list_updated('filterType')) - $selected_id = -1;; + reset_form(); + + if(get_post('filterType') == ST_CUSTOMER ){ + customer_list_cells(_("Select a customer: "), 'trans_no', null, false, true, true); + } elseif(get_post('filterType') == ST_SUPPLIER){ + supplier_list_cells(_("Select a supplier: "), 'trans_no', null, false, true,true); + } elseif(get_post('filterType') == ST_ITEM){ + stock_items_list_cells(_("Select an Item: "), 'trans_no', null, false, true,true); + } end_row(); end_table(1); @@ -175,6 +198,8 @@ function viewing_controls() function trans_view($trans) { + if ($trans['type_no']==ST_SUPPLIER || $trans['type_no']==ST_CUSTOMER || $trans['type_no']==ST_ITEM) + return $trans['id']; return get_trans_view_str($trans["type_no"], $trans["trans_no"]); } @@ -198,35 +223,41 @@ function delete_link($row) return button('Delete'.$row["id"], _("Delete"), _("Delete"), ICON_DELETE); } -function display_rows($type) +function display_rows($type, $trans_no) { - $sql = get_sql_for_attached_documents($type); + $sql = get_sql_for_attached_documents($type, $type==ST_SUPPLIER || $type==ST_CUSTOMER ? $trans_no : + ($type==ST_ITEM ? get_item_code_id($trans_no) : 0)); $cols = array( - _("#") => array('fun'=>'trans_view', 'ord'=>''), - _("Description") => array('name'=>'description'), + _("#") => array('fun'=>'trans_view', 'ord'=>''), + _("Doc Title") => array('name'=>'description'), _("Filename") => array('name'=>'filename'), _("Size") => array('name'=>'filesize'), _("Filetype") => array('name'=>'filetype'), - _("Date Uploaded") => array('name'=>'tran_date', 'type'=>'date'), + _("Doc Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>''), array('insert'=>true, 'fun'=>'edit_link'), array('insert'=>true, 'fun'=>'view_link'), array('insert'=>true, 'fun'=>'download_link'), array('insert'=>true, 'fun'=>'delete_link') ); - $table =& new_db_pager('trans_tbl', $sql, $cols); - $table->width = "60%"; + $table =& new_db_pager('trans_tbl', $sql, $cols); - display_db_pager($table); + $table->width = "60%"; + + display_db_pager($table); } //---------------------------------------------------------------------------------------- +if (list_updated('filterType') || list_updated('trans_no')) + $Ajax->activate('_page_body'); start_form(true); viewing_controls(); -display_rows($_POST['filterType']); +$type = get_post('filterType'); + +display_rows($type, get_post('trans_no')); br(2); @@ -241,13 +272,16 @@ if ($selected_id != -1) $_POST['description'] = $row["description"]; hidden('trans_no', $row['trans_no']); hidden('unique_name', $row['unique_name']); - label_row(_("Transaction #"), $row['trans_no']); + if ($type != ST_SUPPLIER && $type != ST_CUSTOMER && $type != ST_ITEM) + label_row(_("Transaction #"), $row['trans_no']); } hidden('selected_id', $selected_id); } -else - text_row_ex(_("Transaction #").':', 'trans_no', 10); -text_row_ex(_("Description").':', 'description', 40); +else { + if ($type != ST_SUPPLIER && $type != ST_CUSTOMER && $type != ST_ITEM) + text_row_ex(_("Transaction #").':', 'trans_no', 10); +} +text_row_ex(_("Doc Title").':', 'description', 40); file_row(_("Attached File") . ":", 'filename', 'filename'); end_table(1); @@ -258,4 +292,3 @@ end_form(); end_page(); -?>