diff --git a/CHANGELOG b/CHANGELOG index 7a90ae4b1..873a00a9f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -328,6 +328,7 @@ - add much better support for new storage drivers - fix possible xss attacks - saver way to collect plugin configuration +- fix update of postgres database -------------------------------------------------------------------------------- Changes in version 5.1.39 diff --git a/views/bootstrap/class.Charts.php b/views/bootstrap/class.Charts.php index da627df17..a370f646d 100644 --- a/views/bootstrap/class.Charts.php +++ b/views/bootstrap/class.Charts.php @@ -244,6 +244,41 @@ $(document).ready( function() { return true; } /* }}} */ + protected function getSearchUrl($type, $item) { + $dms = $this->params['dms']; + + $searchurl = null; + switch($type) { + case 'docsperuser': + case 'sizeperuser': + $searchurl = $settings->_httpRoot.'/out/out.Search.php?fullsearch=0&query=&mode=1&orderby=&resultmode=1&owner%5B%5D='.$item['res']; + break; + case 'foldersperuser': + $searchurl = $settings->_httpRoot.'/out/out.Search.php?fullsearch=0&query=&mode=1&orderby=&resultmode=2&owner%5B%5D='.$item['res']; + break; + case 'docspercategory': + $searchurl = $settings->_httpRoot.'/out/out.Search.php?fullsearch=0&query=&mode=1&orderby=&resultmode=1&category%5B%5D='.$item['res']; + break; + case 'docsperstatus': + $searchurl = $settings->_httpRoot.'/out/out.Search.php?fullsearch=0&query=&mode=1&orderby=&resultmode=1&status%5B%5D='.$item['res']; + break; + case 'docspermonth': + case 'sizepermonth': + $startmonth = $item['key'].'-01'; + $endmonth = date('Y-m-t', strtotime($startmonth)); + $searchurl = $settings->_httpRoot.'/out/out.Search.php?fullsearch=0&query=&mode=1&orderby=&resultmode=1&created%5Bfrom%5D='.$startmonth.'&created%5Bto%5D='.$endmonth; + break; + case 'docspermimetype': + break; + case 'docsaccumulated': + $start = date('Y-m-d', $item['key']/1000); + $end = date('Y-m-d', $item['key']/1000 + 86400); + $searchurl = $settings->_httpRoot.'/out/out.Search.php?fullsearch=0&query=&mode=1&orderby=&resultmode=1&created%5Bfrom%5D='.$start.'&created%5Bto%5D='.$end; + break; + } + return $searchurl; + } + public function show() { /* {{{ */ $dms = $this->params['dms']; $user = $this->params['user']; @@ -293,6 +328,7 @@ $(document).ready( function() { $types[] = 'sizeperuser'; if(in_array($type, $types)) echo ""; + echo "Search"; echo ""; $total = 0; switch($type) { @@ -309,6 +345,11 @@ $(document).ready( function() { echo "".$item['total'].""; if(in_array($type, array('docspermonth'))) echo "".sprintf('%+d', $item['total']-$oldtotal).""; + $searchurl = $this->getSearchUrl($type, $item); + if($searchurl) + echo ""; + else + echo ""; echo ""; $oldtotal = $item['total']; $total += $item['total']; @@ -322,6 +363,11 @@ $(document).ready( function() { echo "".getReadableDate($item['key']/1000).""; echo "".$item['total'].""; echo "".sprintf('%+d', $item['total']-$oldtotal).""; + $searchurl = $this->getSearchUrl($type, $item); + if($searchurl) + echo ""; + else + echo ""; echo ""; $oldtotal = $item['total']; $total += $item['total']; @@ -338,6 +384,11 @@ $(document).ready( function() { echo $this->getProgressBar($currUser->getUsedDiskSpace(), $qt); echo ""; } + $searchurl = $this->getSearchUrl($type, $item); + if($searchurl) + echo ""; + else + echo ""; echo ""; $total += $item['total']; } @@ -345,7 +396,13 @@ $(document).ready( function() { break; case 'sizepermonth': foreach($data as $item) { - echo "".htmlspecialchars($item['key'])."".SeedDMS_Core_File::format_filesize((int) $item['total']).""; + echo "".htmlspecialchars($item['key'])."".SeedDMS_Core_File::format_filesize((int) $item['total']).""; + $searchurl = $this->getSearchUrl($type, $item); + if($searchurl) + echo ""; + else + echo ""; + echo ""; $total += $item['total']; } echo "".SeedDMS_Core_File::format_filesize($total)."";