X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fattachments.php;h=e92276ed87fd2934596504ff9147e178394a4542;hb=efa2530a7c385a329c3fc76f4560b28ba97c3efe;hp=d41684b1b87854187ac11ecd81a7b1dd700a7da2;hpb=d547fddd3f624f338164ac1f93f064a7ba722525;p=fa-stable.git

diff --git a/admin/attachments.php b/admin/attachments.php
index d41684b1..e92276ed 100644
--- a/admin/attachments.php
+++ b/admin/attachments.php
@@ -12,12 +12,14 @@
 $path_to_root="..";
 $page_security = 'SA_ATTACHDOCUMENT';
 
+include_once($path_to_root . "/includes/db_pager.inc");
 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");
+include_once($path_to_root . "/admin/db/transactions_db.inc");
 
 if (isset($_GET['vw']))
 	$view_id = $_GET['vw'];
@@ -34,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();
 		}
@@ -67,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);
 
@@ -77,11 +76,20 @@ if (isset($_GET['filterType'])) // catch up external links
 	$_POST['filterType'] = $_GET['filterType'];
 if (isset($_GET['trans_no']))
 	$_POST['trans_no'] = $_GET['trans_no'];
-	
+
 if ($Mode == 'ADD_ITEM' || $Mode == 'UPDATE_ITEM')
 {
-	if (isset($_FILES['filename']) && $_FILES['filename']['size'] > 0)
-	{
+	if (!transaction_exists($_POST['filterType'], $_POST['trans_no']))
+		display_error(_("Selected transaction does not exists."));
+	elseif ($Mode == 'ADD_ITEM' && !isset($_FILES['filename']))
+		display_error(_("Select attachment file."));
+	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."));
+  	}
+	else {
 		//$content = base64_encode(file_get_contents($_FILES['filename']['tmp_name']));
 		$tmpname = $_FILES['filename']['tmp_name'];
 
@@ -89,47 +97,50 @@ 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); _vd($dir);
+			fclose($fp);
 		}
+
+		$filename = basename($_FILES['filename']['name']);
+		$filesize = $_FILES['filename']['size'];
+		$filetype = $_FILES['filename']['type'];
+
 		// file name compatible with POSIX
 		// protect against directory traversal
 		if ($Mode == 'UPDATE_ITEM')
 		{
-			$unique_name = preg_replace('/[^a-zA-Z0-9.\-_]/', '', $_POST['unique_name']);
-			if ($Mode == 'UPDATE_ITEM' && file_exists($dir."/".$unique_name))
+		    $row = get_attachment($selected_id);
+		    if ($row['filename'] == "")
+        		exit();
+			$unique_name = $row['unique_name'];
+			if ($filename && file_exists($dir."/".$unique_name))
 				unlink($dir."/".$unique_name);
 		}
 		else
-			$unique_name = uniqid('');
-		move_uploaded_file($tmpname, $dir."/".$unique_name);
+			$unique_name = random_id();
 
 		//save the file
-		$filename = basename($_FILES['filename']['name']);
-		$filesize = $_FILES['filename']['size'];
-		$filetype = $_FILES['filename']['type'];
-	}
-	else
-	{
-		$unique_name = $filename = $filetype = "";
-		$filesize = 0;
-	}
-	if ($Mode == 'ADD_ITEM')
-	{
-		add_attachment($_POST['filterType'], $_POST['trans_no'], $_POST['description'],
-			$filename, $unique_name, $filesize, $filetype);
-		display_notification(_("Attachment has been inserted.")); 
-	}
-	else
-	{
-		update_attachment($selected_id, $_POST['filterType'], $_POST['trans_no'], $_POST['description'],
-			$filename, $unique_name, $filesize, $filetype); 
-		display_notification(_("Attachment has been updated.")); 
+		move_uploaded_file($tmpname, $dir."/".$unique_name);
+
+		if ($Mode == 'ADD_ITEM')
+		{
+			add_attachment($_POST['filterType'], $_POST['trans_no'], $_POST['description'],
+				$filename, $unique_name, $filesize, $filetype);
+			display_notification(_("Attachment has been inserted.")); 
+		}
+		else
+		{
+			update_attachment($selected_id, $_POST['filterType'], $_POST['trans_no'], $_POST['description'],
+				$filename, $unique_name, $filesize, $filetype); 
+			display_notification(_("Attachment has been updated.")); 
+		}
 	}
+	refresh_pager('trans_tbl');
+	$Ajax->activate('_page_body');
 	$Mode = 'RESET';
-}		
+}
 
 if ($Mode == 'Delete')
 {
@@ -158,38 +169,58 @@ function viewing_controls()
 	start_row();
 	systypes_list_cells(_("Type:"), 'filterType', null, true);
 	if (list_updated('filterType'))
-		$selected_id = -1;;
+		$selected_id = -1;
 
 	end_row();
     end_table(1);
 
 }
 
+function trans_view($trans)
+{
+	return get_trans_view_str($trans["type_no"], $trans["trans_no"]);
+}
+
+function edit_link($row)
+{
+  	return button('Edit'.$row["id"], _("Edit"), _("Edit"), ICON_EDIT);
+}
+
+function view_link($row)
+{
+  	return button('view'.$row["id"], _("View"), _("View"), ICON_VIEW);
+}
+
+function download_link($row)
+{
+  	return button('download'.$row["id"], _("Download"), _("Download"), ICON_DOWN);
+}
+
+function delete_link($row)
+{
+  	return button('Delete'.$row["id"], _("Delete"), _("Delete"), ICON_DELETE);
+}
+
 function display_rows($type)
 {
-	$rows = get_attached_documents($type);
-	$th = array(_("#"), _("Description"), _("Filename"), _("Size"), _("Filetype"), _("Date Uploaded"), "", "", "", "");
-	
-	start_table(TABLESTYLE);
-	table_header($th);
-	$k = 0;
-	while ($row = db_fetch($rows))
-	{
-		alt_table_row_color($k);
-		
-		label_cell(get_trans_view_str($type, $row['trans_no']));
-		label_cell($row['description']);
-		label_cell($row['filename']);
-		label_cell($row['filesize']);
-		label_cell($row['filetype']);
-		label_cell(sql2date($row['tran_date']));
- 		edit_button_cell("Edit".$row['id'], _("Edit"));
- 		button_cell("view".$row['id'], _("View"), false, ICON_VIEW);
- 		button_cell("download".$row['id'], _("Download"), false, ICON_DOWN);
- 		delete_button_cell("Delete".$row['id'], _("Delete"));
-    	end_row();
-	}	
-	end_table(1);
+	$sql = get_sql_for_attached_documents($type);
+	$cols = array(
+		_("#") => array('fun'=>'trans_view', 'ord'=>''),
+	    _("Description") => array('name'=>'description'),
+	    _("Filename") => array('name'=>'filename'),
+	    _("Size") => array('name'=>'filesize'),
+	    _("Filetype") => array('name'=>'filetype'),
+	    _("Date Uploaded") => array('name'=>'tran_date', 'type'=>'date'),
+	    	array('insert'=>true, 'fun'=>'edit_link'),
+	    	array('insert'=>true, 'fun'=>'view_link'),
+	    	array('insert'=>true, 'fun'=>'download_link'),
+	    	array('insert'=>true, 'fun'=>'delete_link')
+	    );	
+		$table =& new_db_pager('trans_tbl', $sql, $cols);
+
+		$table->width = "60%";
+
+		display_db_pager($table);
 }
 
 //----------------------------------------------------------------------------------------
@@ -200,6 +231,7 @@ viewing_controls();
 
 display_rows($_POST['filterType']);
 
+br(2);
 
 start_table(TABLESTYLE2);
 
@@ -223,10 +255,9 @@ file_row(_("Attached File") . ":", 'filename', 'filename');
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', 'both');
+submit_add_or_update_center($selected_id == -1, '', 'process');
 
 end_form();
 
 end_page();
 
-?>