Allowing more than one document attachment.

diff --git a/admin/db/attachments_db.inc b/admin/db/attachments_db.inc
index e18000fe3f8f2db9e6f61a70a4b416cdf3ca488c..bb4c04c8cf0351d3677dc9b13370ada7c9a87ac3 100644 (file)
--- a/admin/db/attachments_db.inc
+++ b/admin/db/attachments_db.inc
@@ -51,6 +51,25 @@ function delete_attachment($id)
        $sql = "DELETE FROM ".TB_PREF."attachments WHERE id = ".db_escape($id);
        db_query($sql, "Could not delete attachment");
 }
+
+//----------------------------------------------------------------------------------------
+
+function get_attachment_string($type, $id)
+{
+       global $path_to_root;
+    $str_return = "";    
+    $sql = "SELECT * FROM ".TB_PREF."attachments WHERE type_no=".db_escape($type)." AND trans_no=".db_escape($id)." ORDER BY trans_no";
+    $return = db_query($sql, "Could not retrieve attachments");
+    while ($attachment = db_fetch($return))
+    {
+        if (strlen($str_return))
+            $str_return = $str_return . " \n";    
+        $str_return .= _("Attached File:")." <a href='$path_to_root/admin/attachments.php?vw=".$attachment["id"]." ' target='blanc_'>ID: ". 
+               $attachment["id"] . " " . $attachment["description"]. " - ". $attachment["filename"]."</a><br/>";
+    }
+    return $str_return . "<br/>";
+}
+
 //----------------------------------------------------------------------------------------
 
 function get_attached_documents($type)

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 7502aba4127b6a8901e3648772f3cce75c8770c6..6250620528e2d4b153d00de2f8fa5f4114cd67ac 100644 (file)
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -177,14 +177,14 @@ function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0, $f
        {
                include_once($path_to_root."/admin/db/attachments_db.inc");
                $id = has_attachment($type_no, $trans_no);
-       }
+               $attach = get_attachment_string($type_no, $trans_no);
+       echo $attach;   
+    }
        $width = ($id != 0 ? "30%" : "20%");    
        start_table(false, "width=$width");
        start_row();
        if ($no_menu)
        {
-               if ($id != 0)
-                       echo "<td align=center><a href='$path_to_root/admin/attachments.php?vw=$id' target='blanc_'>"._("View Attachment")."</a></td>\n";
                echo "<td align=center><a href='javascript:window.print();'>"._("Print")."</a></td>\n";
        }
        echo "<td align=center><a href='javascript:goBack(".($final ? '-2' : '').");'>".($no_menu ? _("Close") : _("Back"))."</a></td>\n";