New files from unstable branch
[fa-stable.git] / admin / attachments.php
index 4d75a5087f35bacc2536269eff61a6b01369498c..1ad50d699fe81d4d51bd91b163f0eba960514dab 100644 (file)
@@ -17,11 +17,12 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 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");
 
 if (isset($_GET['vw']))
        $view_id = $_GET['vw'];
 else
-$view_id = find_submit('view');
+       $view_id = find_submit('view');
 if ($view_id != -1)
 {
        $row = get_attachment($view_id);
@@ -33,11 +34,11 @@ 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
+               //if ($type == 'application/octet-stream')
+               //      header('Content-Disposition: attachment; filename='.$row['filename']);
+               //else
                                header("Content-Disposition: inline");
-               echo file_get_contents($comp_path."/".user_company(). "/attachments/".$row['unique_name']);
+               echo file_get_contents(company_path(). "/attachments/".$row['unique_name']);
                exit();
                }
        }       
@@ -59,7 +60,7 @@ if ($download_id != -1)
                header("Content-type: ".$type);
                header('Content-Length: '.$row['filesize']);
                header('Content-Disposition: attachment; filename='.$row['filename']);
-               echo file_get_contents($comp_path."/".user_company(). "/attachments/".$row['unique_name']);
+               echo file_get_contents(company_path()."/attachments/".$row['unique_name']);
                exit();
                }
        }       
@@ -84,7 +85,7 @@ if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
                //$content = base64_encode(file_get_contents($_FILES['filename']['tmp_name']));
                $tmpname = $_FILES['filename']['tmp_name'];
 
-               $dir =  $comp_path."/".user_company(). "/attachments";
+               $dir =  company_path()."/attachments";
                if (!file_exists($dir))
                {
                        mkdir ($dir,0777);
@@ -93,13 +94,16 @@ if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
                        fwrite($fp, $index_file);
                        fclose($fp);
                }
-               if ($Mode == 'UPDATE_ITEM' && file_exists($dir."/".$_POST['unique_name']))
-                       unlink($dir."/".$_POST['unique_name']);
+               // file name compatible with POSIX
+               // protect against directory traversal
+               $unique_name = preg_replace('/[^a-zA-Z0-9.\-_]/', '', $_POST['unique_name']);
+               if ($Mode == 'UPDATE_ITEM' && file_exists($dir."/".$unique_name))
+                       unlink($dir."/".$unique_name);
 
                $unique_name = uniqid('');
                move_uploaded_file($tmpname, $dir."/".$unique_name);
                //save the file
-               $filename = $_FILES['filename']['name'];
+               $filename = basename($_FILES['filename']['name']);
                $filesize = $_FILES['filename']['size'];
                $filetype = $_FILES['filename']['type'];
        }
@@ -108,32 +112,16 @@ if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
                $unique_name = $filename = $filetype = "";
                $filesize = 0;
        }
-       $date = date2sql(Today());
        if ($Mode == 'ADD_ITEM')
        {
-               $sql = "INSERT INTO ".TB_PREF."attachments (type_no, trans_no, description, filename, unique_name,
-                       filesize, filetype, tran_date) VALUES (".db_escape($_POST['filterType']).","
-                       .db_escape($_POST['trans_no']).",".db_escape($_POST['description']).", "
-                       .db_escape($filename).", ".db_escape($unique_name).", ".db_escape($filesize)
-                       .", ".db_escape($filetype).", '$date')";
-               db_query($sql, "Attachment could not be inserted");             
+               add_attachment($_POST['filterType'], $_POST['trans_no'], $_POST['description'],
+                       $filename, $unique_name, $filesize, $filetype);
                display_notification(_("Attachment has been inserted.")); 
        }
        else
        {
-               $sql = "UPDATE ".TB_PREF."attachments SET
-                       type_no=".db_escape($_POST['filterType']).",
-                       trans_no=".db_escape($_POST['trans_no']).",
-                       description=".db_escape($_POST['description']).", ";
-               if ($filename != "")
-               {
-                       $sql .= "filename=".db_escape($filename).",
-                       unique_name=".db_escape($unique_name).",
-                       filesize=".db_escape($filesize).",
-                       filetype=".db_escape($filetype);
-               }       
-               $sql .= "tran_date='$date' WHERE id=".db_escape($selected_id);
-               db_query($sql, "Attachment could not be updated");              
+               update_attachment($selected_id, $_POST['filterType'], $_POST['trans_no'], $_POST['description'],
+                       $filename, $unique_name, $filesize, $filetype); 
                display_notification(_("Attachment has been updated.")); 
        }
        $Mode = 'RESET';
@@ -142,11 +130,10 @@ if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
 if ($Mode == 'Delete')
 {
        $row = get_attachment($selected_id);
-       $dir =  $comp_path."/".user_company(). "/attachments";
+       $dir =  company_path()."/attachments";
        if (file_exists($dir."/".$row['unique_name']))
                unlink($dir."/".$row['unique_name']);
-       $sql = "DELETE FROM ".TB_PREF."attachments WHERE id = ".db_escape($selected_id);
-       db_query($sql, "Could not delete attachment");
+       delete_attachment($selected_id);        
        display_notification(_("Attachment has been deleted.")); 
        $Mode = 'RESET';
 }
@@ -160,43 +147,26 @@ if ($Mode == 'RESET')
 
 function viewing_controls()
 {
-    start_form();
-
-    start_table("class='tablestyle_noborder'");
+       global $selected_id;
+       
+    start_table(TABLESTYLE_NOBORDER);
 
-       systypes_list_row(_("Type:"), 'filterType', null, true);
+       start_row();
+       systypes_list_cells(_("Type:"), 'filterType', null, true);
+       if (list_updated('filterType'))
+               $selected_id = -1;;
 
+       end_row();
     end_table(1);
 
-       end_form();
-}
-
-//----------------------------------------------------------------------------------------
-
-function get_attached_documents($type)
-{
-       $sql = "SELECT * FROM ".TB_PREF."attachments WHERE type_no=".db_escape($type)
-       ." ORDER BY trans_no";
-       return db_query($sql, "Could not retrieve attachments");
-}
-
-function get_attachment($id)
-{
-       $sql = "SELECT * FROM ".TB_PREF."attachments WHERE id=".db_escape($id);
-       $result = db_query($sql, "Could not retrieve attachments");
-       return db_fetch($result);
 }
 
 function display_rows($type)
 {
-       global $table_style;
-
        $rows = get_attached_documents($type);
        $th = array(_("#"), _("Description"), _("Filename"), _("Size"), _("Filetype"), _("Date Uploaded"), "", "", "", "");
        
-       div_start('transactions');
-       start_form();
-       start_table($table_style);
+       start_table(TABLESTYLE);
        table_header($th);
        $k = 0;
        while ($row = db_fetch($rows))
@@ -216,21 +186,18 @@ function display_rows($type)
        end_row();
        }       
        end_table(1);
-       hidden('filterType', $type);
-       end_form();
-       div_end();
 }
 
 //----------------------------------------------------------------------------------------
 
+start_form(true);
+
 viewing_controls();
 
-if (isset($_POST['filterType']))
-       display_rows($_POST['filterType']);
+display_rows($_POST['filterType']);
 
-start_form(true);
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1)
 {
@@ -251,8 +218,6 @@ text_row_ex(_("Description").':', 'description', 40);
 file_row(_("Attached File") . ":", 'filename', 'filename');
 
 end_table(1);
-if (isset($_POST['filterType']))
-       hidden('filterType', $_POST['filterType']);
 
 submit_add_or_update_center($selected_id == -1, '', 'both');