X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fattachments.php;h=92008742e9bfc3480b1b431b116aeb4a1e91ec10;hb=1b163e169c22e3b38d3bb766ceee8fa2b08aa084;hp=3b39aa94bdeb22e7d28fa9394366a8950f3ac495;hpb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;p=fa-stable.git

diff --git a/admin/attachments.php b/admin/attachments.php
index 3b39aa94..92008742 100644
--- a/admin/attachments.php
+++ b/admin/attachments.php
@@ -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);
@@ -37,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();
 		}
 	}	
@@ -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();
 		}
 	}	
@@ -68,7 +69,7 @@ if ($download_id != -1)
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(800, 500);
-page(_("Attach Documents"), false, false, "", $js);
+page(_($help_context = "Attach Documents"), false, false, "", $js);
 
 simple_page_mode(true);
 //----------------------------------------------------------------------------------------
@@ -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);
@@ -108,32 +109,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 +127,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 +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 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 +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)
 {
@@ -248,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');