gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-04 15:12:30 +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-02-26 08:17:50 +01:00
commit 771f266aa6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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
@ -40,7 +40,7 @@ function getLongReadableDate($timestamp) {
* @param $date string date in form Y-m-d H:i:s
* @return integer/boolean unix timestamp or false in case of an error
*/
function makeTsFromLongDate($date) { /* }}} */
function makeTsFromLongDate($date) { /* {{{ */
$tmp = explode(' ', $date);
if(count($tmp) != 2)
return false;
@ -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";