DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Joining session works

Browse Source
This commit is contained in:
Victor Dubiniuk 2013-08-08 17:05:58 +03:00 committed by Tobias Hintze
parent 0247677108
commit 9658890600
6 changed files with 91 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
ajax/controller.php Normal file
View File

@ -0,0 +1,65 @@
<?php
/**
* ownCloud - Office App
*
* @author Victor Dubiniuk
* @copyright 2013 Victor Dubiniuk victor.dubiniuk@gmail.com
*
* This file is licensed under the Affero General Public License version 3 or
* later.
*/
namespace OCA\Office;
class Controller {
public static function serve($args){
\OCP\JSON::checkLoggedIn();
$session = Session::getSession(@$args['es_id']);
$filename = isset($session['genesis_url']) ? $session['genesis_url'] : '';
$officeView = View::initOfficeView($session['owner']);
$download = new Download($officeView, $filename);
$download->sendResponse();
}
public static function startSession($args){
$path = @$_POST['path'];
\OCP\JSON::checkLoggedIn();
$uid = \OCP\User::getUser();
$officeView = View::initOfficeView($uid);
if (!$officeView->file_exists($path)){
$genesisPath = View::storeDocument($uid, $path);
} else {
$genesisPath = $path;
}
if ($genesisPath){
$session = Session::getSessionByPath($uid, $genesisPath);
if (!$session){
$hash = View::getHashByGenesis($uid, $genesisPath);
$session = Session::addSession($genesisPath, $hash);
}
\OCP\JSON::success($session);
exit();
}
\OCP\JSON::error();
}
public static function joinSession($args){
$esId = @$args['es_id'];
\OCP\JSON::checkLoggedIn();
if ($esId){
$session = Session::getSession($esId);
\OCP\JSON::success($session);
exit();
}
\OCP\JSON::error();
}
}

2
appinfo/app.php
View File

@ -33,6 +33,6 @@ OCP\App::addNavigationEntry(array(
'name' => 'Office')
);
OC::$CLASSPATH['OCA\Office\Genesis'] = 'office/lib/genesis.php';
OC::$CLASSPATH['OCA\Office\Controller'] = 'office/ajax/controller.php';
OC::$CLASSPATH['OCA\Office\Download\Simple'] = 'office/lib/download/simple.php';
OC::$CLASSPATH['OCA\Office\Download\Range'] = 'office/lib/download/range.php';

22
appinfo/routes.php
View File

@ -11,9 +11,27 @@
$this->create('office_genesis', 'ajax/genesis/{es_id}')
->post()
->action('\OCA\Office\Genesis', 'serve')
->action('\OCA\Office\Controller', 'serve')
;
$this->create('office_genesis', 'ajax/genesis/{es_id}')
->get()
->action('\OCA\Office\Genesis', 'serve')
->action('\OCA\Office\Controller', 'serve')
;
$this->create('office_session_start', 'ajax/session/start')
->get()
->action('\OCA\Office\Controller', 'startSession')
;
$this->create('office_session_start', 'ajax/session/start')
->post()
->action('\OCA\Office\Controller', 'startSession')
;
$this->create('office_session_join', 'ajax/session/join/{es_id}')
->get()
->action('\OCA\Office\Controller', 'joinSession')
;
$this->create('office_session_join', 'ajax/session/join/{es_id}')
->post()
->action('\OCA\Office\Controller', 'joinSession')
;

4
js/office.js
View File

@ -89,8 +89,8 @@ var officeMain = {
return;
}
$.post(OC.filePath('office', 'ajax', 'session.php'),
{ 'genesis' : filepath },
$.post(OC.Router.generate('office_session_start'),
{ 'path' : filepath },
officeMain.onView
);
},

29
lib/genesis.php
View File

@ -1,29 +0,0 @@
<?php
/**
* ownCloud - Office App
*
* @author Victor Dubiniuk
* @copyright 2013 Victor Dubiniuk victor.dubiniuk@gmail.com
*
* This file is licensed under the Affero General Public License version 3 or
* later.
*/
namespace OCA\Office;
class Genesis {
public static function serve($args){
\OCP\JSON::checkLoggedIn();
$session = Session::getSession(@$args['es_id']);
$filename = isset($session['genesis_url']) ? $session['genesis_url'] : '';
$officeView = View::initOfficeView($session['owner']);
$download = new Download($officeView, $filename);
$download->sendResponse();
}
}

6
lib/session.php
View File

@ -25,9 +25,9 @@ class Session {
return $result->fetchRow();
}
public static function getSessionByPath($url){
$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_session` WHERE `genesis_url`= ?');
$result = $query->execute(array($url));
public static function getSessionByPath($uid, $url){
$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_session` WHERE `genesis_url`= ? AND `owner`= ? ');
$result = $query->execute(array($url, $uid));
return $result->fetchRow();
}