mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the public api to get event sources

This commit is contained in:
Robin Appelman 2014-08-29 17:21:52 +02:00
parent dad53180bc
commit 65608d7c92
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/ajax/newfile.php
View File

@ -16,7 +16,7 @@ $content = isset( $_REQUEST['content'] ) ? $_REQUEST['content'] : '';
$source = isset( $_REQUEST['source'] ) ? trim($_REQUEST['source'], '/\\') : '';
if($source) {
$eventSource=new OC_EventSource();
$eventSource = \OC::$server->getEventSource();
} else {
OC_JSON::callCheck();
}

6
apps/files/ajax/scan.php
View File

@ -15,7 +15,7 @@ if (isset($_GET['users'])) {
$users = array(OC_User::getUser());
}
$eventSource = new OC_EventSource();
$eventSource = \OC::$server->getEventSource();
$listener = new ScanListener($eventSource);
foreach ($users as $user) {
@ -39,12 +39,12 @@ class ScanListener {
private $lastCount = 0;
/**
* @var \OC_EventSource event source to pass events to
* @var \OCP\IEventSource event source to pass events to
*/
private $eventSource;
/**
* @param \OC_EventSource $eventSource
* @param \OCP\IEventSource $eventSource
*/
public function __construct($eventSource) {
$this->eventSource = $eventSource;

2
core/ajax/update.php
View File

@ -4,7 +4,7 @@ require_once '../../lib/base.php';
if (OC::checkUpgrade(false)) {
$l = new \OC_L10N('core');
$eventSource = new OC_EventSource();
$eventSource = \OC::$server->getEventSource();
$updater = new \OC\Updater(\OC_Log::$object);
$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));

7
lib/private/appframework/core/api.php
View File

@ -110,12 +110,11 @@ class API implements IApi{
/**
* used to return and open a new eventsource
* @return \OC_EventSource a new open EventSource class
* used to return and open a new event source
* @return \OCP\IEventSource a new open EventSource class
*/
public function openEventSource(){
# TODO: use public api
return new \OC_EventSource();
return \OC::$server->getEventSource();
}
/**