Added company db upgrade boundary markers in error log.

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

diff --git a/admin/attachments.php b/admin/attachments.php
index 3d7623482dd20948b371191d9a57fd2ac94d15c7..92008742e9bfc3480b1b431b116aeb4a1e91ec10 100644 (file)
--- a/admin/attachments.php
+++ b/admin/attachments.php
@@ -22,7 +22,7 @@ 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);
@@ -38,7 +38,7 @@ if ($view_id != -1)
                        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();
                }
        }       
@@ -60,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();
                }
        }       
@@ -85,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);
@@ -127,7 +127,7 @@ 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']);
        delete_attachment($selected_id);        
@@ -144,27 +144,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 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))
@@ -184,21 +183,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)
 {
@@ -216,13 +212,9 @@ if ($selected_id != -1)
 else
        text_row_ex(_("Transaction #").':', 'trans_no', 10);
 text_row_ex(_("Description").':', 'description', 40);
-start_row();
-label_cells(_("Attached File") . ":", "<input type='file' id='filename' name='filename'>");
-end_row();
+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');