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

Merge branch 'master' into rename-info-xml

Browse Source
pull/1/head
Andras Timar 8 years ago
parent d48d3b4f70 b091c74814
commit 444f987412
18 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File

11
appinfo/app.php
Unescape Escape View File

@ -43,15 +43,14 @@ $navigationEntry = function () use ($c) {
$c->getServer()->getNavigationManager()->add($navigationEntry);
//Script for registering file actions
$request = \OC::$server->getRequest();
if (isset($request->server['REQUEST_URI'])) {
$url = $request->server['REQUEST_URI'];
if (preg_match('%index.php/apps/files(/.*)?%', $url)) {
$eventDispatcher = \OC::$server->getEventDispatcher();
$eventDispatcher->addListener(
'OCA\Files::loadAdditionalScripts',
function() {
\OCP\Util::addScript('richdocuments', 'viewer/viewer');
\OCP\Util::addStyle('richdocuments', 'viewer/odfviewer');
}
}
);
//Listen to delete file signal
\OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Richdocuments\Storage", "onDelete");

1
appinfo/info.xml
Unescape Escape View File

@ -15,4 +15,5 @@
<public>
<richdocuments>public.php</richdocuments>
</public>
<ocsid>174727</ocsid>
</info>

38
controller/documentcontroller.php
Unescape Escape View File

@ -423,17 +423,23 @@ class DocumentController extends Controller {
return false;
}
// Login the user to see his mount locations
$this->loginUser($res['owner']);
$view = new \OC\Files\View('/' . $res['owner'] . '/files');
$info = $view->getFileInfo($res['path']);
\OC::$server->getLogger()->debug('File info: {info}.', [ 'app' => $this->appName, 'info' => $info ]);
$baseFileName = $info['name'];
$size = $info['size'];
// Close the session created for user login
\OC::$server->getSession()->close();
if (!$info) {
http_response_code(404);
return false;
}
\OC::$server->getLogger()->debug('File info: {info}.', [ 'app' => $this->appName, 'info' => $info ]);
return array(
'BaseFileName' => $baseFileName,
'Size' => $size,
'BaseFileName' => $info['name'],
'Size' => $info['size'],
'Version' => $version
//'DownloadUrl' => '',
//'FileUrl' => '',
@ -464,26 +470,32 @@ class DocumentController extends Controller {
//TODO: Support X-WOPIMaxExpectedSize header.
$res = $row->getPathForToken($fileId, $version, $token);
$ownerid = $res['owner'];
// Login the user to see his mount locations
$this->loginUser($ownerid);
$filename = '';
// If some previous version is requested, fetch it from Files_Version app
if ($version !== '0') {
\OCP\JSON::checkAppEnabled('files_versions');
$ownerid = $res['owner'];
// Setup the FS
\OC_Util::tearDownFS();
\OC_Util::setupFS($ownerid, '/' . $ownerid . '/files');
list($owner_uid, $filename) = \OCA\Files_Versions\Storage::getUidAndFilename($res['path']);
$versionName = '/files_versions/' . $filename . '.v' . $version;
list($ownerid, $filename) = \OCA\Files_Versions\Storage::getUidAndFilename($res['path']);
$filename = '/files_versions/' . $filename . '.v' . $version;
\OC_Util::tearDownFS();
return new DownloadResponse($this->request, $owner_uid, $versionName);
} else {
$filename = '/files' . $res['path'];
}
return new DownloadResponse($this->request, $res['owner'], '/files' . $res['path']);
// Close the session created for user login
\OC::$server->getSession()->close();
return new DownloadResponse($this->request, $ownerid, $filename);
}
/**

1
l10n/de.js
Unescape Escape View File

@ -30,6 +30,7 @@ OC.L10N.register(
"Latest revision" : "Letzte Revision",
"More versions..." : "Weitere Versionen…",
"Just now" : "Gerade ebend",
"Failed to revert the document to older version" : "Fehler beim Zurüclsetzen des Dokumentes auf eine ältere Version",
"Failed to aquire access token. Please re-login and try again." : "Fehler beim Erwerben des Tokens. Bitte neu anmelden und nochmals versuchen.",
"No connection to server. Trying to reconnect." : "Keine Verbindung zum Server. Es wird versucht diese wiederherzustellen.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "Es ist ein Fehler beim Laden dieses Dokumentes aufgetreten. Bitte überprüfe, ob diese Datei mit einem externen Editor geöffnet werden kann. Dies könnte auch bedeuten, dass die Datei nicht mehr geteilt wird oder vor kurzem gelöscht wurde.",

1
l10n/de.json
Unescape Escape View File

@ -28,6 +28,7 @@
"Latest revision" : "Letzte Revision",
"More versions..." : "Weitere Versionen…",
"Just now" : "Gerade ebend",
"Failed to revert the document to older version" : "Fehler beim Zurüclsetzen des Dokumentes auf eine ältere Version",
"Failed to aquire access token. Please re-login and try again." : "Fehler beim Erwerben des Tokens. Bitte neu anmelden und nochmals versuchen.",
"No connection to server. Trying to reconnect." : "Keine Verbindung zum Server. Es wird versucht diese wiederherzustellen.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "Es ist ein Fehler beim Laden dieses Dokumentes aufgetreten. Bitte überprüfe, ob diese Datei mit einem externen Editor geöffnet werden kann. Dies könnte auch bedeuten, dass die Datei nicht mehr geteilt wird oder vor kurzem gelöscht wurde.",

1
l10n/de_DE.js
Unescape Escape View File

@ -30,6 +30,7 @@ OC.L10N.register(
"Latest revision" : "Letzte Revision",
"More versions..." : "Weitere Versionen…",
"Just now" : "Gerade ebend",
"Failed to revert the document to older version" : "Fehler beim Zurüclsetzen des Dokumentes auf eine ältere Version",
"Failed to aquire access token. Please re-login and try again." : "Fehler beim Erwerben des Tokens. Bitte neu anmelden und nochmals versuchen.",
"No connection to server. Trying to reconnect." : "Keine Verbindung zum Server. Es wird versucht diese wiederherzustellen.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "Es ist ein Fehler beim Laden dieses Dokumentes aufgetreten. Bitte überprüfen Sie, ob diese Datei mit einem externen Editor geöffnet werden kann. Dies könnte auch bedeuten, dass die Datei nicht mehr geteilt wird oder vor kurzem gelöscht wurde.",

1
l10n/de_DE.json
Unescape Escape View File

@ -28,6 +28,7 @@
"Latest revision" : "Letzte Revision",
"More versions..." : "Weitere Versionen…",
"Just now" : "Gerade ebend",
"Failed to revert the document to older version" : "Fehler beim Zurüclsetzen des Dokumentes auf eine ältere Version",
"Failed to aquire access token. Please re-login and try again." : "Fehler beim Erwerben des Tokens. Bitte neu anmelden und nochmals versuchen.",
"No connection to server. Trying to reconnect." : "Keine Verbindung zum Server. Es wird versucht diese wiederherzustellen.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "Es ist ein Fehler beim Laden dieses Dokumentes aufgetreten. Bitte überprüfen Sie, ob diese Datei mit einem externen Editor geöffnet werden kann. Dies könnte auch bedeuten, dass die Datei nicht mehr geteilt wird oder vor kurzem gelöscht wurde.",

1
l10n/he.js
Unescape Escape View File

@ -30,6 +30,7 @@ OC.L10N.register(
"Latest revision" : "גרסה אחרונה",
"More versions..." : "גרסאות נוספות...",
"Just now" : "ממש עכשיו",
"Failed to revert the document to older version" : "נכשל באחזור המסמך לגרסה קודמת",
"Failed to aquire access token. Please re-login and try again." : "נכשל להשיג מחרוזת גישה. יש להתחבר מחדש ולנסות שנית.",
"No connection to server. Trying to reconnect." : "אין תקשורת לשרת. מנסה להתחבר מחדש.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "טעינת המסמך נכשלה. יש לבדוק אם אפשר לפתוח את המסמך בעורך חיצוני. התופעה יכולה להעיד גם על כך שבוטל השיתוף של המסמך או על כך שהמסמך נמחק לאחרונה.",

1
l10n/he.json
Unescape Escape View File

@ -28,6 +28,7 @@
"Latest revision" : "גרסה אחרונה",
"More versions..." : "גרסאות נוספות...",
"Just now" : "ממש עכשיו",
"Failed to revert the document to older version" : "נכשל באחזור המסמך לגרסה קודמת",
"Failed to aquire access token. Please re-login and try again." : "נכשל להשיג מחרוזת גישה. יש להתחבר מחדש ולנסות שנית.",
"No connection to server. Trying to reconnect." : "אין תקשורת לשרת. מנסה להתחבר מחדש.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "טעינת המסמך נכשלה. יש לבדוק אם אפשר לפתוח את המסמך בעורך חיצוני. התופעה יכולה להעיד גם על כך שבוטל השיתוף של המסמך או על כך שהמסמך נמחק לאחרונה.",

1
l10n/pt_BR.js
Unescape Escape View File

@ -30,6 +30,7 @@ OC.L10N.register(
"Latest revision" : "Última revisão",
"More versions..." : "Mais versões...",
"Just now" : "Agora",
"Failed to revert the document to older version" : "Falha ao reverter o documento para a versão anterior",
"Failed to aquire access token. Please re-login and try again." : "Falha ao adquirir token de acesso. Por favor, re-login e tente novamente.",
"No connection to server. Trying to reconnect." : "Sem conexão com o servidor. Tentando reconectar.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "Falha ao carregar este documento. Por favor, verifique se ele pode ser aberto com um editor externo. Isso também pode significar que tenha sido descompartilhado ou excluídos recentemente.",

1
l10n/pt_BR.json
Unescape Escape View File

@ -28,6 +28,7 @@
"Latest revision" : "Última revisão",
"More versions..." : "Mais versões...",
"Just now" : "Agora",
"Failed to revert the document to older version" : "Falha ao reverter o documento para a versão anterior",
"Failed to aquire access token. Please re-login and try again." : "Falha ao adquirir token de acesso. Por favor, re-login e tente novamente.",
"No connection to server. Trying to reconnect." : "Sem conexão com o servidor. Tentando reconectar.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "Falha ao carregar este documento. Por favor, verifique se ele pode ser aberto com um editor externo. Isso também pode significar que tenha sido descompartilhado ou excluídos recentemente.",

1
l10n/ru.js
Unescape Escape View File

@ -30,6 +30,7 @@ OC.L10N.register(
"Latest revision" : "Крайняя ревизия",
"More versions..." : "Ещё версии...",
"Just now" : "Прямо сейчас",
"Failed to revert the document to older version" : "Не удалось вернуть документ к старой версии",
"Failed to aquire access token. Please re-login and try again." : "Не удалось получить токен доступа. Пожалуйста перевойдите и попробуйте ещё раз.",
"No connection to server. Trying to reconnect." : "Нет связи с сервером. Попытка переподключения.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "Не удалось загрузить документ. Пожалуйста проверьте, открывается ли он внешним редактором. Это так же может означать, что к нему недавно убрали общий доступ или удалили.",

1
l10n/ru.json
Unescape Escape View File

@ -28,6 +28,7 @@
"Latest revision" : "Крайняя ревизия",
"More versions..." : "Ещё версии...",
"Just now" : "Прямо сейчас",
"Failed to revert the document to older version" : "Не удалось вернуть документ к старой версии",
"Failed to aquire access token. Please re-login and try again." : "Не удалось получить токен доступа. Пожалуйста перевойдите и попробуйте ещё раз.",
"No connection to server. Trying to reconnect." : "Нет связи с сервером. Попытка переподключения.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "Не удалось загрузить документ. Пожалуйста проверьте, открывается ли он внешним редактором. Это так же может означать, что к нему недавно убрали общий доступ или удалили.",

2
l10n/sl.js
Unescape Escape View File

@ -9,6 +9,7 @@ OC.L10N.register(
"Collabora Online: Cannot resolve the host \"%s\"." : "Collabora Online: ni mogoče razrešiti gostitelja \"%s\".",
"Collabora Online: Cannot connect to the host \"%s\"." : "Collabora Online: ni se mogoče povezati z gostiteljem \"%s\".",
"Collabora Online: SSL certificate is not installed." : "Collabora Online: potrdilo SSL ni nameščeno.",
"Please ask your administrator to add ca-chain.cert.pem to the ownCloud's ca-bundle.crt, for example \"cat /etc/loolwsd/ca-chain.cert.pem >> owncloud/resources/config/ca-bundle.crt\" . The exact error message was: " : "Prišlo je do napake nalaganja potrdila. V datoteko ownCloud ca-bundle.crt je treba dodati vpis potrdila ca-chain.cert.pem na primer \"cat /etc/loolwsd/ca-chain.cert.pem >> owncloud/resources/config/ca-bundle.crt\". V kolikor tega ne morete storiti sami, stopite v stik s skrbnikom. Celotno sporočilo napake je: ",
"Collabora Online unknown error: " : "Collabora Online: neznana napaka: ",
"Collabora Online: Unable to read discovery.xml from \"%s\"." : "Collabora Online: ni mogoče prebrati datoteke discovery.xml iz \"%s\".",
"Collabora Online: discovery.xml from \"%s\" is not a well-formed XML string." : "Collabora Online: v zapisu datoteke discovery.xml iz \"%s\" je napačno oblikovan niz XML.",
@ -29,6 +30,7 @@ OC.L10N.register(
"Latest revision" : "Najnovejša predelava",
"More versions..." : "Več različic ...",
"Just now" : "Ravnokar",
"Failed to revert the document to older version" : "Povrnitev dokumenta na starejšo različico je spodletela.",
"No connection to server. Trying to reconnect." : "Ni vzpostavljene povezave s strežnikom. Poskus povezave bo ponovljen.",
"Save" : "Shrani",
"Loading documents..." : "Nalaganje dokumentov ...",

2
l10n/sl.json
Unescape Escape View File

@ -7,6 +7,7 @@
"Collabora Online: Cannot resolve the host \"%s\"." : "Collabora Online: ni mogoče razrešiti gostitelja \"%s\".",
"Collabora Online: Cannot connect to the host \"%s\"." : "Collabora Online: ni se mogoče povezati z gostiteljem \"%s\".",
"Collabora Online: SSL certificate is not installed." : "Collabora Online: potrdilo SSL ni nameščeno.",
"Please ask your administrator to add ca-chain.cert.pem to the ownCloud's ca-bundle.crt, for example \"cat /etc/loolwsd/ca-chain.cert.pem >> owncloud/resources/config/ca-bundle.crt\" . The exact error message was: " : "Prišlo je do napake nalaganja potrdila. V datoteko ownCloud ca-bundle.crt je treba dodati vpis potrdila ca-chain.cert.pem na primer \"cat /etc/loolwsd/ca-chain.cert.pem >> owncloud/resources/config/ca-bundle.crt\". V kolikor tega ne morete storiti sami, stopite v stik s skrbnikom. Celotno sporočilo napake je: ",
"Collabora Online unknown error: " : "Collabora Online: neznana napaka: ",
"Collabora Online: Unable to read discovery.xml from \"%s\"." : "Collabora Online: ni mogoče prebrati datoteke discovery.xml iz \"%s\".",
"Collabora Online: discovery.xml from \"%s\" is not a well-formed XML string." : "Collabora Online: v zapisu datoteke discovery.xml iz \"%s\" je napačno oblikovan niz XML.",
@ -27,6 +28,7 @@
"Latest revision" : "Najnovejša predelava",
"More versions..." : "Več različic ...",
"Just now" : "Ravnokar",
"Failed to revert the document to older version" : "Povrnitev dokumenta na starejšo različico je spodletela.",
"No connection to server. Trying to reconnect." : "Ni vzpostavljene povezave s strežnikom. Poskus povezave bo ponovljen.",
"Save" : "Shrani",
"Loading documents..." : "Nalaganje dokumentov ...",

1
l10n/sq.js
Unescape Escape View File

@ -30,6 +30,7 @@ OC.L10N.register(
"Latest revision" : "Rishikimi më i ri",
"More versions..." : "Më shumë versione…",
"Just now" : "Mu tani",
"Failed to revert the document to older version" : "Dështoi kthimi i dokumentit te versioni më i vjetër",
"Failed to aquire access token. Please re-login and try again." : "S’u arrit marrja e token-it të hyrjeve. Ju lutemi, ribëni hyrjen dhe riprovoni.",
"No connection to server. Trying to reconnect." : "Pa lidhje me shërbyesin. Po provohet të rilidhet.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "S’u arrit të ngarkohej ky dokument. Ju lutemi, shihni nëse mund të hapet me një përpunues të jashtëm. Kjo mundet edhe të thotë se për të mund të jetë ndalur ndarja me të tjerët ose të jetë fshirë tani së fundi.",

1
l10n/sq.json
Unescape Escape View File

@ -28,6 +28,7 @@
"Latest revision" : "Rishikimi më i ri",
"More versions..." : "Më shumë versione…",
"Just now" : "Mu tani",
"Failed to revert the document to older version" : "Dështoi kthimi i dokumentit te versioni më i vjetër",
"Failed to aquire access token. Please re-login and try again." : "S’u arrit marrja e token-it të hyrjeve. Ju lutemi, ribëni hyrjen dhe riprovoni.",
"No connection to server. Trying to reconnect." : "Pa lidhje me shërbyesin. Po provohet të rilidhet.",
"Failed to load this document. Please check if it can be opened with an external editor. This might also mean it has been unshared or deleted recently." : "S’u arrit të ngarkohej ky dokument. Ju lutemi, shihni nëse mund të hapet me një përpunues të jashtëm. Kjo mundet edhe të thotë se për të mund të jetë ndalur ndarja me të tjerët ose të jetë fshirë tani së fundi.",

11
lib/db/wopi.php
Unescape Escape View File

@ -120,15 +120,6 @@ class Wopi extends \OCA\Richdocuments\Db{
return false;
}
$owner = $row['owner_uid'];
$view = new \OC\Files\View('/' . $owner . '/files');
$path = $row['path'];
if (!$view->is_file($path)) {
throw new \Exception('Invalid file path.');
}
$editor = $row['editor_uid'];
return array('owner' => $owner, 'editor' => $editor, 'path' => $path);
return array('owner' => $row['owner_uid'], 'editor' => $row['editor_uid'], 'path' => $row['path']);
}
}

Write Preview
Loading…
Cancel
Save