fix(spdx2): also show email-address of creator in report

sandipbhuyan · Jan 24, 2017 · 42f9284 · 42f9284
1 parent 9d74d05
commit 42f9284
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/lib/php/Dao/UserDao.php b/src/lib/php/Dao/UserDao.php
@@ -373,4 +373,19 @@ public function getUserName($userId)
     }
     return $userRow['user_name'];
   }
+
+
+  /**
+   * @param int $userId
+   * @return string
+   */
+  public function getUserEmail($userId)
+  {
+    $userRow = $this->dbManager->getSingleRow("SELECT user_email FROM users WHERE user_pk=$1",array($userId),__METHOD__);
+    if(!$userRow)
+    {
+      throw new \Exception('unknown user with id='.$userId);
+    }
+    return $userRow['user_email'];
+  }
 }
diff --git a/src/spdx2/agent/spdx2.php b/src/spdx2/agent/spdx2.php
@@ -519,7 +519,7 @@ protected function writeReport(&$packageNodes, $packageIds, $uploadId)
     $message = $this->renderString($this->getTemplateFile('document'),array(
         'documentName'=>$fileBase,
         'uri'=>$this->uri,
-        'userName'=>$this->container->get('dao.user')->getUserName($this->userId),
+        'userName'=>$this->container->get('dao.user')->getUserName($this->userId) . " (" . $this->container->get('dao.user')->getUserEmail($this->userId) . ")",
         'organisation'=>'',
         'packageNodes'=>$packageNodes,
         'packageIds'=>$packageIds,