gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-01-27 11:39:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-02-26 09:08:32 +01:00
commit 8d1dc66c59
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inc/inc.Utils.php
View File

@ -26,13 +26,13 @@ function formatted_size($size_bytes) { /* {{{ */
return number_format($size_bytes,0,"","")." Bytes";
} /* }}} */
function getReadableDate($timestamp) {
function getReadableDate($timestamp) { /* {{{ */
return date("Y-m-d", $timestamp);
}
} /* }}} */
function getLongReadableDate($timestamp) {
function getLongReadableDate($timestamp) { /* {{{ */
return date("Y-m-d H:i:s", $timestamp);
}
} /* }}} */
/*
* Converts a date/time string into a timestamp
@ -52,16 +52,16 @@ function makeTsFromLongDate($date) { /* {{{ */
return $ts;
} /* }}} */
function getReadableDuration($secs) {
function getReadableDuration($secs) { /* {{{ */
$s = "";
foreach ( getReadableDurationArray($secs) as $k => $v ) {
if ( $v ) $s .= $v." ".($v==1? substr($k,0,-1) : $k).", ";
}
return substr($s, 0, -2);
}
} /* }}} */
function getReadableDurationArray($secs) {
function getReadableDurationArray($secs) { /* {{{ */
$units = array(
getMLText("weeks") => 7*24*3600,
getMLText("days") => 24*3600,
@ -77,7 +77,7 @@ function getReadableDurationArray($secs) {
}
return $units;
}
} /* }}} */
/**
* Compare two version

4
utils/indexer.php
View File

@ -83,7 +83,7 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
$lucenesearch = new $indexconf['Search']($index);
if(!($hit = $lucenesearch->getDocument($document->getId()))) {
try {
$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false));
$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout));
echo " (Document added)\n";
} catch(Exception $e) {
echo " (Timeout)\n";
@ -100,7 +100,7 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
} else {
if($index->delete($hit->id)) {
try {
$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false));
$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout));
echo " (Document updated)\n";
} catch(Exception $e) {
echo " (Timeout)\n";

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

@ -1215,6 +1215,7 @@ $('#acceptkeywords').click(function(ev) {
echo "<input type=\"checkbox\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".(($attribute && $attribute->getValue()) ? 'checked' : '')." />";
break;
case SeedDMS_Core_AttributeDefinition::type_date:
$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
?>
<span class="input-append date datepicker" style="display: inline;" data-date="<?php echo date('Y-m-d'); ?>" data-date-format="yyyy-mm-dd" data-date-language="<?php echo str_replace('_', '-', $this->params['session']->getLanguage()); ?>">
<input class="span4" size="16" name="<?= $fieldname ?>[<?= $attrdef->getId() ?>]" type="text" value="<?php if($objvalue) echo $objvalue; else echo "" /*date('Y-m-d')*/; ?>">