*** report_customer_contracts.php	2010-07-06 16:05:03.931110511 +0100
--- tom_report_customer_contracts.php	2010-07-06 16:08:57.151501692 +0100
***************
*** 42,47 ****
--- 42,51 ----
  else $sql .= "ORDER BY s.name";
  $result = mysql_query($sql);
  if (mysql_error()) trigger_error(mysql_error(), E_USER_WARNING);
+ if ($_REQUEST['mode'] == 'csv')
+ {
+     echo "{$strSite},{$strProduct},{$strLicense},{$strExpiryDate},{$strAllContacts},{$strEngineer} 1, {$strEngineer} 2, {$strEngineer} 3, {$strEngineer} 4\n";
+ }
  while ($site = mysql_fetch_object($result))
  {
      $msql  = "SELECT m.id AS maintid, m.term AS term, p.name AS product, r.name AS reseller, ";
***************
*** 55,72 ****
      $msql .= "AND m.term!='yes' ";
      $msql .= "AND m.expirydate > '$now' ";     $msql .= "ORDER BY expirydate DESC";
  
!     echo "\n<!-- $msql -->\n";
      $mresult = mysql_query($msql);
      if (mysql_num_rows($mresult)>=1)
      {
          if ($_REQUEST['mode'] == 'csv')
          {
-             echo "{$site->sitename}\n";
-             echo "{$strProduct},{$strLicense},{$strExpiryDate},{$strAllContacts},{$strEngineer} 1, {$strEngineer} 2, {$strEngineer} 3, {$strEngineer} 4\n";
              while ($maint = mysql_fetch_object($mresult))
              {
                  if ($maint->expirydate > $now AND $maint->term != 'yes')
                  {
                      echo "{$maint->product},";
                      echo "{$maint->licence_quantity} {$maint->licence_type},";
                      echo ldate($CONFIG['dateformat_date'], $maint->expirydate).",";
--- 59,75 ----
      $msql .= "AND m.term!='yes' ";
      $msql .= "AND m.expirydate > '$now' ";     $msql .= "ORDER BY expirydate DESC";
  
! //    echo "\n<!-- $msql -->\n";
      $mresult = mysql_query($msql);
      if (mysql_num_rows($mresult)>=1)
      {
          if ($_REQUEST['mode'] == 'csv')
          {
              while ($maint = mysql_fetch_object($mresult))
              {
                  if ($maint->expirydate > $now AND $maint->term != 'yes')
                  {
+                     echo "{$site->sitename},";
                      echo "{$maint->product},";
                      echo "{$maint->licence_quantity} {$maint->licence_type},";
                      echo ldate($CONFIG['dateformat_date'], $maint->expirydate).",";