Company directory was not deleted after company removal.

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

diff --git a/admin/attachments.php b/admin/attachments.php
index e623f0b9887d5639ca4482ec111f9b27f0d0a61a..6febfb70c92c77b922204d9162178abc65472275 100644 (file)
--- a/admin/attachments.php
+++ b/admin/attachments.php
@@ -1,16 +1,16 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $path_to_root="..";
-$page_security = 8;
+$page_security = 'SA_ATTACHDOCUMENT';
 
 include_once($path_to_root . "/includes/session.inc");
 
@@ -18,36 +18,50 @@ 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");
 
+if (isset($_GET['vw']))
+       $view_id = $_GET['vw'];
+else
 $view_id = find_submit('view');
 if ($view_id != -1)
 {
        $row = get_attachment($view_id);
        if ($row['filename'] != "")
        {
-               $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");
-       echo file_get_contents($comp_path."/".user_company(). "/attachments/".$row['unique_name']);
-       exit();
+               if(in_ajax()) {
+                       $Ajax->popup($_SERVER['PHP_SELF'].'?vw='.$view_id);
+               } else {
+                       $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");
+               echo file_get_contents($comp_path."/".user_company(). "/attachments/".$row['unique_name']);
+               exit();
+               }
        }       
 }
+if (isset($_GET['dl']))
+       $download_id = $_GET['dl'];
+else
+       $download_id = find_submit('download');
 
-$download_id = find_submit('download');
 if ($download_id != -1)
 {
        $row = get_attachment($download_id);
        if ($row['filename'] != "")
        {
-               $type = ($row['filetype']) ? $row['filetype'] : 'application/octet-stream';     
-       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']);
-       exit();
+               if(in_ajax()) {
+                       $Ajax->redirect($_SERVER['PHP_SELF'].'?dl='.$download_id);
+               } else {
+                       $type = ($row['filetype']) ? $row['filetype'] : 'application/octet-stream';     
+               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']);
+               exit();
+               }
        }       
 }
 
@@ -79,7 +93,7 @@ if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
                        fwrite($fp, $index_file);
                        fclose($fp);
                }
-               if ($Mode == 'UPDATE_ITEM')
+               if ($Mode == 'UPDATE_ITEM' && file_exists($dir."/".$_POST['unique_name']))
                        unlink($dir."/".$_POST['unique_name']);
 
                $unique_name = uniqid('');
@@ -125,6 +139,10 @@ if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
 
 if ($Mode == 'Delete')
 {
+       $row = get_attachment($selected_id);
+       $dir =  $comp_path."/".user_company(). "/attachments";
+       if (file_exists($dir."/".$row['unique_name']))
+               unlink($dir."/".$row['unique_name']);
        $sql = "DELETE FROM ".TB_PREF."attachments WHERE id = $selected_id";
        db_query($sql, "Could not delete attachment");
        display_notification(_("Attachment has been deleted.")); 
@@ -140,7 +158,7 @@ if ($Mode == 'RESET')
 
 function viewing_controls()
 {
-    start_form(false, true);
+    start_form();
 
     start_table("class='tablestyle_noborder'");
 
@@ -209,7 +227,7 @@ if (isset($_POST['filterType']))
 
 start_form(true);
 
-start_table("$table_style2 width=30%");
+start_table($table_style2);
 
 if ($selected_id != -1)
 {
@@ -235,7 +253,7 @@ end_table(1);
 if (isset($_POST['filterType']))
        hidden('filterType', $_POST['filterType']);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();