Switch to fileid. Missed file
This commit is contained in:
parent
70a20ebc93
commit
1c759cda62
@ -30,21 +30,16 @@ class Controller {
|
|||||||
|
|
||||||
public static function startSession($args){
|
public static function startSession($args){
|
||||||
$uid = self::getUser();
|
$uid = self::getUser();
|
||||||
$path = @$_POST['path'];
|
$fileid = @$_POST['fileid'];
|
||||||
$officeView = View::initOfficeView($uid);
|
$officeView = View::initOfficeView($uid);
|
||||||
|
$genesisPath = View::storeDocument($uid, $fileid);
|
||||||
if (!$officeView->file_exists($path)){
|
|
||||||
$genesisPath = View::storeDocument($uid, $path);
|
|
||||||
} else {
|
|
||||||
$genesisPath = $path;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($genesisPath){
|
if ($genesisPath){
|
||||||
$session = Session::getSessionByOwnerAndGenesis($uid, $genesisPath);
|
$session = Session::getSessionByOwnerAndGenesis($uid, $genesisPath);
|
||||||
try {
|
try {
|
||||||
if (!$session){
|
if (!$session){
|
||||||
$hash = View::getHashByGenesis($uid, $genesisPath);
|
$hash = View::getHashByGenesis($uid, $genesisPath);
|
||||||
$session = Session::add($genesisPath, $hash, $path);
|
$session = Session::add($genesisPath, $hash, $fileid);
|
||||||
}
|
}
|
||||||
|
|
||||||
$session['member_id'] = (string) Member::add($session['es_id'], \OCP\User::getUser(), self::getRandomColor());
|
$session['member_id'] = (string) Member::add($session['es_id'], \OCP\User::getUser(), self::getRandomColor());
|
||||||
@ -95,6 +90,23 @@ class Controller {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function listSessionFor(){
|
||||||
|
self::getUser();
|
||||||
|
$path = @$_POST['path'];
|
||||||
|
$sessions = Session::getAll();
|
||||||
|
if (!is_array($sessions)){
|
||||||
|
$sessions = array();
|
||||||
|
}
|
||||||
|
|
||||||
|
$preparedSessions = array_map(
|
||||||
|
function($x){return ($x['es_id']);},
|
||||||
|
$sessions
|
||||||
|
);
|
||||||
|
\OCP\JSON::success(array(
|
||||||
|
"session_list" => $preparedSessions
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
public static function listSessionsHtml(){
|
public static function listSessionsHtml(){
|
||||||
self::getUser();
|
self::getUser();
|
||||||
$sessions = Session::getAll();
|
$sessions = Session::getAll();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user