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

Merge branch 'develop' into hooks

Browse Source
This commit is contained in:
Uwe Steinmann 2013-04-22 22:13:57 +02:00
commit 4e6ee4cdea
7 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -1,3 +1,8 @@
--------------------------------------------------------------------------------
Changes in version 4.2.1
--------------------------------------------------------------------------------
- fixing jumploader upload, added missing file for uploading attachments
--------------------------------------------------------------------------------
Changes in version 4.2.0
--------------------------------------------------------------------------------

1
languages/de_DE/lang.inc
View File

@ -136,6 +136,7 @@ $text = array(
'choose_workflow' => "Workflow wählen",
'choose_workflow_state' => "Workflow-Status wählen",
'choose_workflow_action' => "Workflow-Aktion wählen",
'clipboard' => "Zwischenablage",
'close' => "Schließen",
'comment' => "Kommentar",
'comment_for_current_version' => "Kommentar zur aktuellen Version",

1
languages/en_GB/lang.inc
View File

@ -136,6 +136,7 @@ $text = array(
'choose_workflow' => "Choose workflow",
'choose_workflow_state' => "Choose workflow state",
'choose_workflow_action' => "Choose workflow action",
'clipboard' => "Clipboard",
'close' => "Close",
'comment' => "Comment",
'comment_for_current_version' => "Version comment",

5
op/op.AddFile2.php
View File

@ -60,8 +60,9 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
$userfiletype = $_FILES[ $file_param_name ]["type"];
$userfilename = $_FILES[ $file_param_name ]["name"];
$name = $_POST["name"];
if(!$name)
if(isset($_POST["name"]) && $_POST["name"])
$name = $_POST["name"];
else
$name = $userfilename;
$comment = $_POST["comment"];

2
views/bootstrap/class.AddFile.php
View File

@ -74,7 +74,7 @@ function checkForm()
<?php echo getMLText("max_upload_size").": ".ini_get( "upload_max_filesize"); ?>
<?php
if($enablelargefileupload) {
printf('<p>'.getMLText('link_alt_updatedocument'), "out.AddFile2.php?documentid=".$document->getId().'</p>');
printf('<p>'.getMLText('link_alt_updatedocument').'</p>', "out.AddFile2.php?documentid=".$document->getId());
}
?>
</div>

54
views/bootstrap/class.AddFile2.php Normal file
View File

@ -0,0 +1,54 @@
<?php
/**
* Implementation of AddFile2 view
*
* @category DMS
* @package SeedDMS
* @license GPL 2
* @version @version@
* @author Uwe Steinmann <uwe@steinmann.cx>
* @copyright Copyright (C) 2002-2005 Markus Westphal,
* 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
* 2010-2012 Uwe Steinmann
* @version Release: @package_version@
*/
/**
* Include parent class
*/
require_once("class.Bootstrap.php");
/**
* Class which outputs the html page for AddFile2 view
*
* @category DMS
* @package SeedDMS
* @author Markus Westphal, Malcolm Cowe, Uwe Steinmann <uwe@steinmann.cx>
* @copyright Copyright (C) 2002-2005 Markus Westphal,
* 2006-2008 Malcolm Cowe, 2010 Matteo Lucarelli,
* 2010-2012 Uwe Steinmann
* @version Release: @package_version@
*/
class SeedDMS_View_AddFile2 extends SeedDMS_Bootstrap_Style {
function show() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
$folder = $this->params['folder'];
$document = $this->params['document'];
$this->htmlStartPage(getMLText("document_title", array("documentname" => htmlspecialchars($document->getName()))));
$this->globalNavigation($folder);
$this->contentStart();
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
$this->contentHeading(getMLText("linked_files"));
$this->contentContainerStart();
$this->printUploadApplet('../op/op.AddFile2.php', array('documentid'=>$document->getId()), 1, array('name'=>1, 'comment'=>1));
$this->contentContainerEnd();
$this->htmlEndPage();
} /* }}} */
}
?>

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

@ -1042,7 +1042,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
function printClipboard($clipboard){ /* {{{ */
$dms = $this->params['dms'];
$this->contentHeading("Clipboard", true);
$this->contentHeading(getMLText("clipboard"), true);
echo "<div class=\"well\" ondragover=\"allowDrop(event)\" ondrop=\"onAddClipboard(event)\">\n";
$clipboard = $this->params['session']->getClipboard();
// print_r($clipboard);
@ -1130,7 +1130,7 @@ archive="jl_core_z.jar"
width="715"
height="400"
mayscript>
<param name="uc_uploadUrl" value="<?php echo $uploadurl."?folderid=".$attributes['folderid']; unset($attributes['folderid']); ?>"/>
<param name="uc_uploadUrl" value="<?php echo $uploadurl; ?>"/>
<param name="ac_fireAppletInitialized" value="true"/>
<param name="ac_fireUploaderSelectionChanged" value="true"/>
<param name="ac_fireUploaderFileStatusChanged" value="true"/>
@ -1152,7 +1152,7 @@ mayscript>
/**
* applet initialized notification
*/
function uploaderInitialized( ) {
function appletInitialized( ) {
var uploader = document.jumpLoaderApplet.getUploader();
var attrSet = uploader.getAttributeSet();
var attr;