gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 05:31:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2023-04-03 15:51:05 +02:00
commit c83bcf9877
3 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,13 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
if($this->hasHook('startPage'))
$this->callHook('startPage');
echo "<!DOCTYPE html>\n";
echo "<html lang=\"en\">\n<head>\n";
echo "<html lang=\"";
if($this->params['session'] && ($slang = $this->params['session']->getLanguage())) {
echo str_replace('_', '-', $slang);
} else {
echo str_replace('_', '-', $settings->_language);
}
echo "\">\n<head>\n";
echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
echo '<meta name="viewport" content="width=device-width, initial-scale=1.0" />'."\n";
if($base)

4
views/bootstrap/class.Calendar.php
View File

@ -192,6 +192,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
if(mktime(23,59,59, $end[1], $end[2], $end[0]) > time()) {
$documents = $dms->getDocumentsExpired($this->params['end']);
foreach ($documents as $document){
if($document->getAccessMode($user) >= M_READ) {
$arr[] = array(
'start'=>date('Y-m-d', $document->getExpires()),
'allDay'=>true,
@ -202,6 +203,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
);
}
}
}
break;
case 'attrdate':
if(mktime(23,59,59, $end[1], $end[2], $end[0]) > time()) {
@ -210,6 +212,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
if($attrdef->getType() == \SeedDMS_Core_AttributeDefinition::type_date) {
$documents = $attrdef->getObjects($this->params['start'], 0, O_GTEQ);
foreach ($documents['docs'] as $document){
if($document->getAccessMode($user) >= M_READ) {
$arr[] = array(
'start'=>$document->getAttribute($attrdef)->getValue(),
'allDay'=>true,
@ -222,6 +225,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
}
}
}
}
break;
case 'action':
/* These are all operations which added a new version, an attachment

8
views/bootstrap4/class.Bootstrap4.php
View File

@ -87,7 +87,13 @@ class SeedDMS_Theme_Style extends SeedDMS_View_Common {
if($this->hasHook('startPage'))
$this->callHook('startPage');
echo "<!DOCTYPE html>\n";
echo "<html lang=\"en\">\n<head>\n";
echo "<html lang=\"";
if($this->params['session'] && ($slang = $this->params['session']->getLanguage())) {
echo str_replace('_', '-', $slang);
} else {
echo str_replace('_', '-', $settings->_language);
}
echo "\">\n<head>\n";
echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
echo '<meta name="viewport" content="width=device-width, initial-scale=1.0" />'."\n";
if($base)