Changeset 485 for trunk/phpbms/modules/bms/invoices_attachments.php

Timestamp:

04/07/09 11:44:18 (3 years ago)

Author:

nate

Message:

• Merged Nathan branch back into trunk.

Files:

• trunk/phpbms/modules/bms/invoices_attachments.php (modified) (4 diffs)

trunk/phpbms/modules/bms/invoices_attachments.php

@@ -1 @@
-<?php 
+<?php
 /*
  $Rev$ | $LastChangedBy$
@@ -39 +39 @@
 
         include("../../include/session.php");
-        
+
 
         require_once("../../include/search_class.php");
-                
+
 
         //set the table passing stuff
@@ -49 +49 @@
         $refid=(integer) $_GET["id"];
         $securitywhere="";
-        if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0)               
-                $securitywhere=" AND files.roleid IN (".implode(",",$_SESSION["userinfo"]["roles"]).",0)";      
+        if ($_SESSION["userinfo"]["admin"]!=1 && count($_SESSION["userinfo"]["roles"])>0)
+                $securitywhere=" AND files.roleid IN (".implode(",",$_SESSION["userinfo"]["roles"]).",0)";
         $whereclause="attachments.tabledefid=".$tabledefid." AND attachments.recordid=".$refid.$securitywhere;
         $backurl="../bms/invoices_attachments.php";
@@ -60 +60 @@
 
         $refquery="SELECT
-                           invoices.id, if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company) as name 
-                           FROM invoices INNER JOIN clients ON invoices.clientid=clients.id 
+                           invoices.id, if(clients.lastname!=\"\",concat(clients.lastname,\", \",clients.firstname,if(clients.company!=\"\",concat(\" (\",clients.company,\")\"),\"\")),clients.company) as name
+                           FROM invoices INNER JOIN clients ON invoices.clientid=clients.id
                            WHERE invoices.id=".$refid;
         $refquery=$db->query($refquery);
-        $refrecord=$db->fetchArray($refquery);  
-        
-        $pageTitle="Attachments: ".$refrecord["id"].", ".$refrecord["name"];
+        $refrecord=$db->fetchArray($refquery);
+
+        $pageTitle="Attachments: ".$refrecord["id"];
+        if($refrecord["name"] !== "")
+                $pageTitle .= ", ".$refrecord["name"];
 
         $tabgroup="invoices entry";
         $selectedtabid=17;
-        
+
         include("../base/attachments_records.php");
-        
+
 ?>