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

Merge pull request #233 from owncloud/fix-63

Browse Source 
Cleanup some variables
This commit is contained in:
VicDeo 2014-04-10 21:25:13 +03:00
commit d770cec140
6 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ajax/documentController.php
View File

@ -53,14 +53,15 @@ class DocumentController extends Controller{
* @param array $args - array containing session id as an element with a key es_id * @param array $args - array containing session id as an element with a key es_id
*/ */
public static function serve($args){ public static function serve($args){
$session = new Db_Session(); $session = new Db_Session();
$sessionData = $session->load(@$args['es_id'])->getData(); $sessionData = $session->load(@$args['es_id'])->getData();
$file = new File(@$sessionData['file_id']); $file = new File(@$sessionData['file_id']);
if (!$file->isPublicShare()){ if (!$file->isPublicShare()){
self::preDispatch(false); self::preDispatch();
} else { } else {
self::preDispatchGuest(false); self::preDispatchGuest();
} }
$filename = isset($sessionData['genesis_url']) ? $sessionData['genesis_url'] : ''; $filename = isset($sessionData['genesis_url']) ? $sessionData['genesis_url'] : '';

6
ajax/sessionController.php
View File

@ -52,9 +52,9 @@ class SessionController extends Controller{
} }
protected static function join($uid, $file){ protected static function join($uid, $file){
$session = Db_Session::start($uid, $file); $session = Db_Session::start($uid, $file);
\OCP\JSON::success($session); \OCP\JSON::success($session);
exit(); exit();
} }
/** /**

4
ajax/userController.php
View File

@ -40,8 +40,8 @@ class UserController extends Controller{
} }
public static function rename($args){ public static function rename($args){
$memberId = @$args['member_id']; $memberId = Helper::getArrayValueByKey($args, 'member_id');
$name = @$_POST['name']; $name = Helper::getArrayValueByKey($_POST, 'name');
$member = new Db_Member(); $member = new Db_Member();
$member->load($memberId); $member->load($memberId);
$memberData = $member->getData(); $memberData = $member->getData();

3
js/ServerFactory.js
View File

@ -45,8 +45,7 @@ define("owncloud/ServerFactory", [
server = new PullBoxServer(args); server = new PullBoxServer(args);
server.getGenesisUrl = function(sid) { server.getGenesisUrl = function(sid) {
// what a dirty hack :) return OC.generateUrl('apps/documents/ajax/genesis/{es_id}', {es_id: sid}) + '?requesttoken=' + oc_requesttoken;
return OC.generateUrl('apps/documents/ajax/genesis/{es_id}', {es_id: sid});
}; };
return server; return server;
}; };

14
js/documents.js
View File

@ -19,9 +19,8 @@ var documentsMain = {
toolbar : '<div id="odf-toolbar" class="dijitToolbar">' + toolbar : '<div id="odf-toolbar" class="dijitToolbar">' +
' <div id="document-title" class="icon-noise">' + ' <div id="document-title" class="icon-noise">' +
'<div class="logo-wide"></div>' + '<div class="logo-wide"></div>' +
'<div>' + '<div id="document-title-container"></div>' +
'%title%' + '</div>' +
' </div></div>' +
' <span id="toolbar" class="claro">' + ' <span id="toolbar" class="claro">' +
' <button id="odf-invite" class="drop">' + ' <button id="odf-invite" class="drop">' +
t('documents', 'Share') + t('documents', 'Share') +
@ -69,7 +68,8 @@ var documentsMain = {
}, },
showEditor : function(title, canShare){ showEditor : function(title, canShare){
$(document.body).prepend(documentsMain.UI.toolbar.replace(/%title%/g, title)); $(document.body).prepend(documentsMain.UI.toolbar);
$('#document-title-container').text(title);
if (!canShare){ if (!canShare){
$('#odf-invite').remove(); $('#odf-invite').remove();
} else { } else {
@ -132,9 +132,7 @@ var documentsMain = {
notify : function(message){ notify : function(message){
OC.Notification.show(message); OC.Notification.show(message);
setTimeout(function() { setTimeout(OC.Notification.hide, 10000);
OC.Notification.hide();
}, 10000);
} }
}, },
@ -420,7 +418,7 @@ var documentsMain = {
} }
documentsMain.fileName = name; documentsMain.fileName = name;
$('title').text(documentsMain.UI.mainTitle + '| ' + name); $('title').text(documentsMain.UI.mainTitle + '| ' + name);
$('#document-title>div').text(name); $('#document-title-container').text(name);
} }
); );
}, },

7
lib/helper.php
View File

@ -26,6 +26,13 @@ class Helper {
return $path; return $path;
} }
public static function getArrayValueByKey($array, $key, $default=''){
if (array_key_exists($key, $array)){
return $array[$key];
}
return $default;
}
public static function isVersionsEnabled(){ public static function isVersionsEnabled(){
return \OCP\App::isEnabled('files_versions'); return \OCP\App::isEnabled('files_versions');