From 4ef635382e33e25fb37431c30f25f69a543d530e Mon Sep 17 00:00:00 2001
From: Leif Andersson <leif.andersson@control.lth.se>
Date: Sun, 23 Apr 2017 13:29:18 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84ndring=20i=20utskriften?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 action.printGroup.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/action.printGroup.php b/action.printGroup.php
index e28e35b..3823072 100644
--- a/action.printGroup.php
+++ b/action.printGroup.php
@@ -10,32 +10,33 @@ $HEAD = <<<EOS
 <head>
 <meta charset="utf-8" />
 <title>Grupp $ID</title>
-<meta http-equiv="Content-Type" content="text/plain"/>
+<!-- meta http-equiv="Content-Type" content="text/html"/ -->
 </head>
 EOS;
 
 
 $members = Person::getGroupMembers($ID);
 $addresses = array();
+$addresses[] = 'Kolumn1;Kolumn2;Kolumn3;Kolumn4;Kolumn5;Kolumn6';
 foreach ($members as $member) {
   $adr = '';
-  if (trim($member->Namn)) $adr .= $member->Namn.PHP_EOL;
-  
-  if ($member->SkolaForetag) $adr .= $member->SkolaForetag.PHP_EOL;
-  if ($member->Avdelning) $adr .= $member->Avdelning.PHP_EOL;
-  if ($member->Adress) $adr .= $member->Adress.PHP_EOL;
-  $addresses[] = $adr;
-}
+  if (trim($member->Namn)) $adr .= $member->Namn.';';
   
+  if ($member->SkolaForetag) $adr .= $member->SkolaForetag.';';
+  if ($member->Avdelning) $adr .= $member->Avdelning.';';
+  if ($member->Adress) {
+    $aas = explode("\n",$member->Adress);
+    foreach($aas as $aa) $adr .= $aa .';';
+  }
   
-
-
-
+  $addresses[] = rtrim($adr,';');
+}
+//print_r($addresses);
 echo $HEAD;
 echo '<body>'.PHP_EOL;
-echo '<pre>';
+echo '<pre>'.PHP_EOL;
 foreach ($addresses as $adr) echo $adr.PHP_EOL;
- echo '</pre>';
+echo '</pre>';
 echo '</body></html>';
 
 exit;
-- 
GitLab