mirror of
https://github.com/nextcloud/passman.git
synced 2025-02-27 17:04:43 +08:00
Merge branch 'master' into translations
This commit is contained in:
commit
fcbf31bd46
1 changed files with 11 additions and 10 deletions
|
@ -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');
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue