Better phpdoc and method naming
This commit is contained in:
parent
8605e2e6a5
commit
fa3393674c
|
@ -16,7 +16,7 @@ $content = isset( $_REQUEST['content'] ) ? $_REQUEST['content'] : '';
|
||||||
$source = isset( $_REQUEST['source'] ) ? trim($_REQUEST['source'], '/\\') : '';
|
$source = isset( $_REQUEST['source'] ) ? trim($_REQUEST['source'], '/\\') : '';
|
||||||
|
|
||||||
if($source) {
|
if($source) {
|
||||||
$eventSource = \OC::$server->getEventSource();
|
$eventSource = \OC::$server->createEventSource();
|
||||||
} else {
|
} else {
|
||||||
OC_JSON::callCheck();
|
OC_JSON::callCheck();
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,7 @@ if (isset($_GET['users'])) {
|
||||||
$users = array(OC_User::getUser());
|
$users = array(OC_User::getUser());
|
||||||
}
|
}
|
||||||
|
|
||||||
$eventSource = \OC::$server->getEventSource();
|
$eventSource = \OC::$server->createEventSource();
|
||||||
$listener = new ScanListener($eventSource);
|
$listener = new ScanListener($eventSource);
|
||||||
|
|
||||||
foreach ($users as $user) {
|
foreach ($users as $user) {
|
||||||
|
|
|
@ -4,7 +4,7 @@ require_once '../../lib/base.php';
|
||||||
|
|
||||||
if (OC::checkUpgrade(false)) {
|
if (OC::checkUpgrade(false)) {
|
||||||
$l = new \OC_L10N('core');
|
$l = new \OC_L10N('core');
|
||||||
$eventSource = \OC::$server->getEventSource();
|
$eventSource = \OC::$server->createEventSource();
|
||||||
$updater = new \OC\Updater(\OC_Log::$object);
|
$updater = new \OC\Updater(\OC_Log::$object);
|
||||||
$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) {
|
$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) {
|
||||||
$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
|
$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));
|
||||||
|
|
|
@ -114,7 +114,7 @@ class API implements IApi{
|
||||||
* @return \OCP\IEventSource a new open EventSource class
|
* @return \OCP\IEventSource a new open EventSource class
|
||||||
*/
|
*/
|
||||||
public function openEventSource(){
|
public function openEventSource(){
|
||||||
return \OC::$server->getEventSource();
|
return \OC::$server->createEventSource();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -494,11 +494,11 @@ class Server extends SimpleContainer implements IServerContainer {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a search instance
|
* Create a new event source
|
||||||
*
|
*
|
||||||
* @return \OCP\IEventSource
|
* @return \OCP\IEventSource
|
||||||
*/
|
*/
|
||||||
function getEventSource() {
|
function createEventSource() {
|
||||||
return new \OC_EventSource();
|
return new \OC_EventSource();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,8 @@ namespace OCP;
|
||||||
* includes a fallback for older browsers and IE
|
* includes a fallback for older browsers and IE
|
||||||
*
|
*
|
||||||
* use server side events with caution, to many open requests can hang the server
|
* use server side events with caution, to many open requests can hang the server
|
||||||
|
*
|
||||||
|
* The event source will initialize the connection to the client when the first data is sent
|
||||||
*/
|
*/
|
||||||
interface IEventSource {
|
interface IEventSource {
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -237,9 +237,9 @@ interface IServerContainer {
|
||||||
function getCertificateManager($user = null);
|
function getCertificateManager($user = null);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns a search instance
|
* Create a new event source
|
||||||
*
|
*
|
||||||
* @return \OCP\IEventSource
|
* @return \OCP\IEventSource
|
||||||
*/
|
*/
|
||||||
function getEventSource();
|
function createEventSource();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue