Merge branch 'master' into translations

This commit is contained in:
brantje 2016-12-21 14:43:14 +01:00
commit fcbf31bd46
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F

View file

@ -51,16 +51,17 @@ class ActivityService {
public function add($subject,$subjectParams=array(), public function add($subject,$subjectParams=array(),
$message='',$messageParams=array(), $message='',$messageParams=array(),
$link='',$user=null,$type='') { $link='',$user=null,$type='') {
$activity = $this->manager->generateEvent(); if($user) {
$activity->setType($type); $activity = $this->manager->generateEvent();
$activity->setApp('passman'); $activity->setType($type);
$activity->setSubject($subject, $subjectParams); $activity->setApp('passman');
$activity->setLink($link); $activity->setSubject($subject, $subjectParams);
$activity->setAffectedUser($user); $activity->setLink($link);
$activity->setAuthor($user); $activity->setAffectedUser($user);
$activity->setTimestamp(time()); $activity->setAuthor($user);
$activity->setMessage($message, $messageParams); $activity->setTimestamp(time());
print_r($this->manager->publish($activity)); $activity->setMessage($message, $messageParams);
}
return array('success'=>'ok'); return array('success'=>'ok');
} }
} }