Use path for creating sessions, store fileid to db

ajax/controller.php

@@ -31,13 +31,16 @@ class Controller {
 	public static function startSession($args){
 		$uid = self::preDispatch();
 		try{
-			$fileId = @$_POST['fileid'];
+			$path = @$_POST['path'];
-			if (!$fileId){
+			if (!$path){
-				throw new \Exception('No fileId has been passed');
+				throw new \Exception('No file has been passed');
 			}
 
 			$officeView = View::initOfficeView($uid);
-			$genesisPath = View::storeDocument($uid, $fileId);
+			$genesisPath = View::storeDocument($uid, $path);
+			$info = \OC_Files::getFileInfo($path);
+
+			$fileId =  $info['fileid'];
 			if (!$genesisPath){
 				throw new \Exception('Unable to copy document. Check permissions and make sure you have enought free space.');
 			}
@@ -52,7 +55,7 @@ class Controller {
 			\OCP\JSON::success($session);
 			exit();
 		} catch (\Exception $e){
-			Helper::warnLog('Starting a session failed. Reason:') . $e->getMessage();
+			Helper::warnLog('Starting a session failed. Reason: '  . $e->getMessage());
 			\OCP\JSON::error();
 			exit();
 		}
@@ -75,7 +78,7 @@ class Controller {
 			\OCP\JSON::success($session);
 			exit();
 		} catch (\Exception $e){
-			Helper::warnLog('Joining a session failed. Reason:') . $e->getMessage();
+			Helper::warnLog('Joining a session failed. Reason:' . $e->getMessage());
 			\OCP\JSON::error();
 			exit();
 		}

ajax/otpoll.php

@@ -66,18 +66,6 @@ try{
 					$members
 			);
 					
-			break;
-		case 'session_list':
-			OCA\Office\Controller::listSessions();
-			exit();
-			break;
-		case 'join_session':
-			 // should fail when session is non-existent
-			break;
-			OCA\Office\Controller::joinSession(array(
-				'es_id' => $request->getParam('args/es_id')
-			));
-			exit();
 			break;
 		case 'sync_ops':
 			$seqHead = (string) $request->getParam('args/seq_head');

js/office.js

@@ -92,7 +92,7 @@ var officeMain = {
 		}
 
 		$.post(OC.Router.generate('office_session_start'),
-				{'fileid': filepath},
+				{'path': filepath},
 		officeMain.initSession
 				);
 	},

lib/session.php

@@ -59,7 +59,7 @@ class Session {
 		}
 		return $info;
 	}
-	
+
 	public static function getSessionByFileId($fileId){
 		$query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*office_session` WHERE `file_id`= ?');
 		$result = $query->execute(array($fileId));

lib/view.php

@@ -30,21 +30,20 @@ class View extends \OC\Files\View{
 		return new \OC\Files\View('/' . $uid . self::OFFICE_DIRNAME);
 	}
 	
-	public static function storeDocument($uid, $fileid){
+	public static function storeDocument($uid, $filePath){
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 		
-		$path = \OC\Files\Cache\Cache::getById($fileid);
+		$view = new \OC\Files\View('/' . $uid);
-		if (is_null($path)){
+		
-			// No longer exists
+		$relPath = '/files' . $filePath;
-		} else {
+		if (!$view->file_exists($relPath)){
-			$path = $path[1];
+			throw new \Exception('Original document doesn\'t exist any more');
 		}
 		
-		$view = new \OC\Files\View('/' . $uid);
 		$newName = '/' . sha1($view->file_get_contents($path)) . '.odt';
 
-		$view->copy( $path, self::OFFICE_DIRNAME . $newName);
+		$view->copy($relPath, self::OFFICE_DIRNAME . $newName);
 		\OC_FileProxy::$enabled = $proxyStatus;
 		return $newName;
 	}

templates/documents.php

@@ -29,7 +29,7 @@
 		</tr>
 	<?php } ?>
 	<?php foreach($_['list'] as $entry) { ?>
-		<tr data-file="<?php p($entry['fileid']) ?>">
+		<tr data-file="<?php p($entry['path']) ?>">
 			<td>
 				<img align="left" src="<?php p(\OCP\Util::linkToAbsolute('office','ajax/thumbnail.php').'?filepath='.\OCP\Util::encodePath($entry['path'])) ?>" />
 			</td>