gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-11-28 02:20:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-11-08 11:39:02 +01:00
commit 2ed68b22d2
9 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,5 +1,5 @@
VERSION=5.0.7 VERSION=5.0.8
SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi pdfviewer
# webapp # webapp
EXTENSIONS := \ EXTENSIONS := \

2
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -328,7 +328,7 @@ class SeedDMS_Core_DMS {
$this->callbacks = array(); $this->callbacks = array();
$this->version = '@package_version@'; $this->version = '@package_version@';
if($this->version[0] == '@') if($this->version[0] == '@')
$this->version = '5.0.7'; $this->version = '5.0.8';
} /* }}} */ } /* }}} */
/** /**

6
SeedDMS_Preview/package.xml
View File

@ -28,9 +28,15 @@ add new previewer which converts document to pdf instead of png
<contents> <contents>
<dir baseinstalldir="SeedDMS" name="/"> <dir baseinstalldir="SeedDMS" name="/">
<dir name="Preview"> <dir name="Preview">
<file name="Base.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
<file name="Previewer.php" role="php"> <file name="Previewer.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" /> <tasks:replace from="@package_version@" to="version" type="package-info" />
</file> </file>
<file name="PdfPreviewer.php" role="php">
<tasks:replace from="@package_version@" to="version" type="package-info" />
</file>
</dir> <!-- /Lucene --> </dir> <!-- /Lucene -->
<dir name="tests"> <dir name="tests">
</dir> <!-- /tests --> </dir> <!-- /tests -->

2
inc/inc.Version.php
View File

@ -20,7 +20,7 @@
class SeedDMS_Version { class SeedDMS_Version {
public $_number = "5.0.7"; public $_number = "5.0.8";
private $_string = "SeedDMS"; private $_string = "SeedDMS";
function __construct() { function __construct() {

2
install/install.php
View File

@ -118,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
* Load default settings + set * Load default settings + set
*/ */
define("SEEDDMS_INSTALL", "on"); define("SEEDDMS_INSTALL", "on");
define("SEEDDMS_VERSION", "5.0.7"); define("SEEDDMS_VERSION", "5.0.8");
require_once('../inc/inc.ClassSettings.php'); require_once('../inc/inc.ClassSettings.php');

3
styles/bootstrap/application.js
View File

@ -461,7 +461,7 @@ $(document).ready( function() {
function onAddClipboard(ev) { /* {{{ */ function onAddClipboard(ev) { /* {{{ */
ev.preventDefault(); ev.preventDefault();
var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text")); var source_info = JSON.parse(ev.originalEvent.dataTransfer.getData("text"));
source_type = source_info.type; source_type = source_info.type;
source_id = source_info.id; source_id = source_info.id;
formtoken = source_info.formtoken; formtoken = source_info.formtoken;
@ -698,6 +698,7 @@ $(document).ready(function() {
attr_rel = $(e.currentTarget).attr('rel'); attr_rel = $(e.currentTarget).attr('rel');
target_type = attr_rel.split("_")[0]; target_type = attr_rel.split("_")[0];
target_id = attr_rel.split("_")[1]; target_id = attr_rel.split("_")[1];
console.log(e.originalEvent.dataTransfer.getData("text"));
var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text")); var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
source_type = source_info.type; source_type = source_info.type;
source_id = source_info.id; source_id = source_info.id;

6
views/bootstrap/class.DocumentVersionDetail.php
View File

@ -62,6 +62,12 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
$this->contentHeading(getMLText("preview")); $this->contentHeading(getMLText("preview"));
?> ?>
<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.Download.php?documentid='.$document->getID().'&version='.$version->getVersion()); ?>" width="100%" height="700px"></iframe> <iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.Download.php?documentid='.$document->getID().'&version='.$version->getVersion()); ?>" width="100%" height="700px"></iframe>
<?php
break;
case 'image/svg+xml':
$this->contentHeading(getMLText("preview"));
?>
<img src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
<?php <?php
break; break;
default: default:

8
views/bootstrap/class.Search.php
View File

@ -53,7 +53,9 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
} /* }}} */ } /* }}} */
function js() { /* {{{ */ function js() { /* {{{ */
header('Content-Type: application/javascript'); header('Content-Type: application/javascript; charset=UTF-8');
parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
$this->printFolderChooserJs("form1"); $this->printFolderChooserJs("form1");
$this->printDeleteFolderButtonJs(); $this->printDeleteFolderButtonJs();
@ -478,7 +480,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
else else
$comment = htmlspecialchars($document->getComment()); $comment = htmlspecialchars($document->getComment());
if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
print "<tr id=\"table-row-document-".$document->getID()."\">"; print "<tr id=\"table-row-document-".$document->getID()."\" class=\"table-row-document\" rel=\"document_".$document->getID()."\" formtoken=\"".createFormKey('movedocument')."\" draggable=\"true\">";
//print "<td><img src=\"../out/images/file.gif\" class=\"mimeicon\"></td>"; //print "<td><img src=\"../out/images/file.gif\" class=\"mimeicon\"></td>";
if (in_array(2, $searchin)) { if (in_array(2, $searchin)) {
$docName = $this->markQuery(htmlspecialchars($document->getName()), "i"); $docName = $this->markQuery(htmlspecialchars($document->getName()), "i");
@ -564,7 +566,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
} else { } else {
$folderName = htmlspecialchars($folder->getName()); $folderName = htmlspecialchars($folder->getName());
} }
print "<tr id=\"table-row-folder-".$folder->getID()."\" rel=\"folder_".$folder->getID()."\" class=\"folder\" ondragover=\"allowDrop(event)\" ondrop=\"onDrop(event)\">"; print "<tr id=\"table-row-folder-".$folder->getID()."\" draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>"; print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>";
print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">"; print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">";
$path = $folder->getPath(); $path = $folder->getPath();

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

@ -191,6 +191,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$this->contentHeading(getMLText("preview")); $this->contentHeading(getMLText("preview"));
?> ?>
<iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.Download.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe> <iframe src="../pdfviewer/web/viewer.html?file=<?php echo urlencode('../../op/op.Download.php?documentid='.$document->getID().'&version='.$latestContent->getVersion()); ?>" width="100%" height="700px"></iframe>
<?php
break;
case 'image/svg+xml':
$this->contentHeading(getMLText("preview"));
?>
<img src="../op/op.Download.php?documentid=<?php echo $document->getID(); ?>&version=<?php echo $latestContent->getVersion(); ?>" width="100%">
<?php <?php
break; break;
default: default: