gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2015-10-27 09:03:45 +01:00
commit 50ef190ae7
4 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -1,3 +1,10 @@
--------------------------------------------------------------------------------
Changes in version 4.3.22
--------------------------------------------------------------------------------
- fix lots of HTTP-Headers in op.Ajax.php (Closes: #233)
- Timeline will be updated by ajax call, clicking on an item in the timeline
will output some document information
--------------------------------------------------------------------------------
Changes in version 4.3.21
--------------------------------------------------------------------------------

2
conf/settings.xml.template
View File

@ -32,7 +32,7 @@
-->
<edition
strictFormCheck = "false"
viewOnlineFileTypes = ".txt;.text;.html;.htm;.xml;.pdf;.gif;.png;.jpg;.jpeg"
viewOnlineFileTypes = ".txt;.text;.html;.htm;.xml;.pdf;.gif;.png;.jpg;.jpeg;.mp4"
enableConverting = "true"
enableEmail = "true"
enableUsersView = "true"

82
op/op.Ajax.php
View File

@ -227,7 +227,7 @@ switch($command) {
case 'movefolder': /* {{{ */
if($user) {
if(!checkFormKey('movefolder', 'GET')) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
} else {
$mfolder = $dms->getFolder($_REQUEST['folderid']);
@ -236,26 +236,26 @@ switch($command) {
if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
if($folder->getAccessMode($user) >= M_READWRITE) {
if($mfolder->setParent($folder)) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>'Folder moved', 'data'=>''));
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error moving folder', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No access on destination folder', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No destination folder', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
}
}
@ -265,7 +265,7 @@ switch($command) {
case 'movedocument': /* {{{ */
if($user) {
if(!checkFormKey('movedocument', 'GET')) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
} else {
$mdocument = $dms->getDocument($_REQUEST['docid']);
@ -274,26 +274,26 @@ switch($command) {
if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
if($folder->getAccessMode($user) >= M_READWRITE) {
if($mdocument->setFolder($folder)) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>'Document moved', 'data'=>''));
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error moving folder', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No access on destination folder', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No destination folder', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
}
}
@ -303,25 +303,25 @@ switch($command) {
case 'deletefolder': /* {{{ */
if($user) {
if(!checkFormKey('removefolder', 'GET')) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
} else {
$folder = $dms->getFolder($_REQUEST['id']);
if($folder) {
if ($folder->getAccessMode($user) >= M_READWRITE) {
if($folder->remove()) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error removing folder', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No folder', 'data'=>''));
}
}
@ -331,7 +331,7 @@ switch($command) {
case 'deletedocument': /* {{{ */
if($user) {
if(!checkFormKey('removedocument', 'GET')) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
} else {
$document = $dms->getDocument($_REQUEST['id']);
@ -349,18 +349,18 @@ switch($command) {
}
}
}
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error removing document', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
}
}
@ -376,31 +376,31 @@ switch($command) {
$lockingUser = $document->getLockingUser();
if (($lockingUser->getID() == $user->getID()) || ($document->getAccessMode($user) == M_ALL)) {
if (!$document->setLocked(false)) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error unlocking document', 'data'=>''));
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
}
} else {
if (!$document->setLocked($user)) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Error locking document', 'data'=>''));
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>'', 'data'=>''));
}
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No access', 'data'=>''));
}
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'No document', 'data'=>''));
}
}
@ -413,10 +413,10 @@ switch($command) {
fputcsv($fp, array(date('Y-m-d H:i:s'), $user->getLogin(), $_POST['key'], $_POST['lang'], $_POST['phrase']));
fclose($fp);
}
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>'Thank you for your contribution', 'data'=>''));
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>'Missing translation', 'data'=>''));
}
}
@ -490,7 +490,7 @@ switch($command) {
if($user) {
if(checkFormKey('adddocument')) {
if (!isset($_POST["folderid"]) || !is_numeric($_POST["folderid"]) || intval($_POST["folderid"])<1) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id")));
exit;
}
@ -499,7 +499,7 @@ switch($command) {
$folder = $dms->getFolder($folderid);
if (!is_object($folder)) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText("invalid_folder_id")));
exit;
}
@ -518,12 +518,12 @@ switch($command) {
}
if (!is_uploaded_file($_FILES["userfile"]["tmp_name"]) || $_FILES['userfile']['error']!=0){
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText("uploading_failed")));
exit;
}
if ($_FILES["userfile"]["size"]==0) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText("uploading_zerosize")));
exit;
}
@ -547,7 +547,7 @@ switch($command) {
/* Check if name already exists in the folder */
if(!$settings->_enableDuplicateDocNames) {
if($folder->hasDocumentByName($name)) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText("document_duplicate_name")));
exit;
}
@ -616,7 +616,7 @@ switch($command) {
'', array(), array(), $workflow);
if (is_bool($res) && !$res) {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText("error_occured")));
exit;
} else {
@ -683,10 +683,10 @@ switch($command) {
}
}
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>true, 'message'=>getMLText('splash_document_added'), 'data'=>$document->getID()));
} else {
header('Content-Type', 'application/json');
header('Content-Type: application/json');
echo json_encode(array('success'=>false, 'message'=>getMLText('invalid_request_token'), 'data'=>''));
}
}

4
views/bootstrap/class.ViewDocument.php
View File

@ -118,7 +118,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if($user->isAdmin()) {
$data = $document->getTimeline();
foreach($data as &$item) {
foreach($data as $i=>$item) {
switch($item['type']) {
case 'add_version':
$msg = getMLText('timeline_'.$item['type'], array('document'=>htmlspecialchars($item['document']->getName()), 'version'=> $item['version']));
@ -132,7 +132,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
default:
$msg = '???';
}
$item['msg'] = $msg;
$data[$i]['msg'] = $msg;
}
foreach($data as $item) {