X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fattachments.php;h=6febfb70c92c77b922204d9162178abc65472275;hb=179e8cf33e77512ca94cf8389ea36a253feebba7;hp=8f517e8aafc46b0a6f6a272e17b90dd9804cd586;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/admin/attachments.php b/admin/attachments.php
index 8f517e8a..6febfb70 100644
--- a/admin/attachments.php
+++ b/admin/attachments.php
@@ -10,7 +10,7 @@
     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();
+		}
 	}	
 }
 
@@ -144,7 +158,7 @@ if ($Mode == 'RESET')
 
 function viewing_controls()
 {
-    start_form(false, true);
+    start_form();
 
     start_table("class='tablestyle_noborder'");
 
@@ -239,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();