Attach Documents: fixed user interface to reset input fields only when needed. Fixes...

[fa-stable.git] / admin / attachments.php

diff --git a/admin/attachments.php b/admin/attachments.php
index 639fbd9fdb985eae6443d8cd84ba5a4b9fb716a8..5b5e8247511c359d923f3f85f8a61475dcb5f215 100644 (file)
--- a/admin/attachments.php
+++ b/admin/attachments.php
@@ -36,10 +36,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 +58,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 +66,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 +79,23 @@ if (isset($_GET['trans_no']))
 
 if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
 {
+       
+       $filename = basename($_FILES['filename']['name']);
        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 +103,12 @@ if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
                if (!file_exists($dir))
                {
                        mkdir ($dir,0777);
-                       $index_file = "<?php\nheader(\"Location: ../index.php\");\n?>";
+                       $index_file = "<?php\nheader(\"Location: ../index.php\");\n";
                        $fp = fopen($dir."/index.php", "w");
                        fwrite($fp, $index_file);
                        fclose($fp);
                }
 
-               $filename = basename($_FILES['filename']['name']);
                $filesize = $_FILES['filename']['size'];
                $filetype = $_FILES['filename']['type'];
 
@@ -133,10 +141,10 @@ if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
                                $filename, $unique_name, $filesize, $filetype); 
                        display_notification(_("Attachment has been updated.")); 
                }
+               reset_form();
        }
        refresh_pager('trans_tbl');
        $Ajax->activate('_page_body');
-       $Mode = 'RESET';
 }
 
 if ($Mode == 'Delete')
@@ -147,10 +155,13 @@ 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()
 {
        unset($_POST['trans_no']);
        unset($_POST['description']);
@@ -166,7 +177,13 @@ 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);
+       }
 
        end_row();
     end_table(1);
@@ -198,11 +215,11 @@ 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 : 0);
        $cols = array(
-               _("#") => array('fun'=>'trans_view', 'ord'=>''),
+               _("#") => $type == ST_SUPPLIER || $type == ST_CUSTOMER? 'skip' : array('fun'=>'trans_view', 'ord'=>''),
            _("Description") => array('name'=>'description'),
            _("Filename") => array('name'=>'filename'),
            _("Size") => array('name'=>'filesize'),
@@ -213,20 +230,25 @@ function display_rows($type)
                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,12 +263,15 @@ 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)
+                       label_row(_("Transaction #"), $row['trans_no']);
        }       
        hidden('selected_id', $selected_id);
 }
-else
-       text_row_ex(_("Transaction #").':', 'trans_no', 10);
+else {
+       if ($type != ST_SUPPLIER && $type != ST_CUSTOMER)
+               text_row_ex(_("Transaction #").':', 'trans_no', 10);
+}
 text_row_ex(_("Description").':', 'description', 40);
 file_row(_("Attached File") . ":", 'filename', 'filename');
 
@@ -258,4 +283,3 @@ end_form();
 
 end_page();
 
-?>