gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 17:44:56 +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 2017-03-06 10:51:24 +01:00
commit cabe4371e7
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -79,6 +79,8 @@
--------------------------------------------------------------------------------
- add multibyte save basename() replacement, which fixes uploading files whose
name starts with a multibyte char
- show both number of links from a document A to B and vise versa in tab header
on ViewDocuments page
--------------------------------------------------------------------------------
Changes in version 4.3.33

8
utils/xmldump.php
View File

@ -1,5 +1,11 @@
<?php
require_once("../inc/inc.ClassSettings.php");
if(isset($_SERVER['SEEDDMS_HOME'])) {
require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassAcl.php");
} else {
require_once("../inc/inc.ClassSettings.php");
require_once("../inc/inc.ClassAcl.php");
}
function usage() { /* {{{ */
echo "Usage:\n";

15
utils/xmlimport.php
View File

@ -1,5 +1,11 @@
<?php
require_once("../inc/inc.ClassSettings.php");
if(isset($_SERVER['SEEDDMS_HOME'])) {
require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassSettings.php");
require_once($_SERVER['SEEDDMS_HOME']."/inc/inc.ClassAcl.php");
} else {
require_once("../inc/inc.ClassSettings.php");
require_once("../inc/inc.ClassAcl.php");
}
require("Log.php");
function usage() { /* {{{ */
@ -39,10 +45,15 @@ function getRevAppLog($reviews) { /* {{{ */
if($review['attributes']['type'] == 1) {
if(isset($objmap['groups'][(int) $review['attributes']['required']]))
$newreview['required'] = $dms->getGroup($objmap['groups'][(int) $review['attributes']['required']]);
else
$logger->warning("Group ".(int) $review['attributes']['required']." for Log cannot be mapped");
} else {
if(isset($objmap['users'][(int) $review['attributes']['required']]))
$newreview['required'] = $dms->getUser($objmap['users'][(int) $review['attributes']['required']]);
else
$logger->warning("User ".(int) $review['attributes']['required']." for Log cannot be mapped");
}
if(isset($newreview['required'])) {
$newreview['logs'] = array();
foreach($review['logs'] as $j=>$log) {
if(!array_key_exists($log['attributes']['user'], $objmap['users'])) {
@ -63,6 +74,7 @@ function getRevAppLog($reviews) { /* {{{ */
}
}
$newreviews[] = $newreview;
}
}
return $newreviews;
} /* }}} */
@ -1704,6 +1716,7 @@ if($defaultuserid) {
$defaultUser = null;
}
$users = array();
$elementstack = array();
$objmap = array(
'attributedefs' => array(),

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

@ -475,7 +475,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
}
?>
<li class="<?php if($currenttab == 'attachments') echo 'active'; ?>"><a data-target="#attachments" data-toggle="tab"><?php printMLText('linked_files'); echo (count($files)) ? " (".count($files).")" : ""; ?></a></li>
<li class="<?php if($currenttab == 'links') echo 'active'; ?>"><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links)) ? " (".count($links).")" : ""; ?></a></li>
<li class="<?php if($currenttab == 'links') echo 'active'; ?>"><a data-target="#links" data-toggle="tab"><?php printMLText('linked_documents'); echo (count($links) || count($reverselinks)) ? " (".count($links)."/".count($reverselinks).")" : ""; ?></a></li>
</ul>
<div class="tab-content">
<div class="tab-pane <?php if(!$currenttab || $currenttab == 'docinfo') echo 'active'; ?>" id="docinfo">