gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 13:11:31 +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 2017-07-20 15:09:39 +02:00
commit 7259c668c4
5 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -163,8 +163,12 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.36 Changes in version 4.3.36
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- mark disabled users in user list and substitute user list
- if expandFolderTree is set to hidden the tree actually is hidden (partially
closes #312)
- fix sql statement for creating temp. tables (sqlite) - fix sql statement for creating temp. tables (sqlite)
- remove empty lines at end of view/bootstrap/class.*.php files (Closes #329) - remove empty lines at end of view/bootstrap/class.*.php files (Closes #329)
- make sure contentDir ends with DIRECTORY_SEPARATOR (Closes #323)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.35 Changes in version 4.3.35

2
inc/inc.ClassSettings.php
View File

@ -475,6 +475,8 @@ class Settings { /* {{{ */
$this->_rootDir = strval($tab["rootDir"]); $this->_rootDir = strval($tab["rootDir"]);
$this->_httpRoot = strval($tab["httpRoot"]); $this->_httpRoot = strval($tab["httpRoot"]);
$this->_contentDir = strval($tab["contentDir"]); $this->_contentDir = strval($tab["contentDir"]);
if(substr($this->_contentDir, -1, 1) != DIRECTORY_SEPARATOR)
$this->_contentDir .= DIRECTORY_SEPARATOR;
$this->_cacheDir = strval($tab["cacheDir"]); $this->_cacheDir = strval($tab["cacheDir"]);
$this->_stagingDir = strval($tab["stagingDir"]); $this->_stagingDir = strval($tab["stagingDir"]);
$this->_luceneDir = strval($tab["luceneDir"]); $this->_luceneDir = strval($tab["luceneDir"]);

2
inc/inc.Utils.php
View File

@ -424,7 +424,7 @@ function showtree() { /* {{{ */
global $settings; global $settings;
if (isset($_GET["showtree"])) return intval($_GET["showtree"]); if (isset($_GET["showtree"])) return intval($_GET["showtree"]);
else if ($settings->_enableFolderTree==0) return 0; else if ($settings->_expandFolderTree==0) return 0;
return 1; return 1;
} /* }}} */ } /* }}} */

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

@ -45,7 +45,6 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("substitute_user")); $this->contentHeading(getMLText("substitute_user"));
$this->contentContainerStart();
?> ?>
<table class="table table-condensed"> <table class="table table-condensed">
<thead> <thead>
@ -54,7 +53,7 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
<tbody> <tbody>
<?php <?php
foreach ($allUsers as $currUser) { foreach ($allUsers as $currUser) {
echo "<tr>"; echo "<tr".($currUser->isDisabled() ? " class=\"error\"" : "").">";
echo "<td>"; echo "<td>";
echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")<br />"; echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")<br />";
echo "<small>".htmlspecialchars($currUser->getComment())."</small>"; echo "<small>".htmlspecialchars($currUser->getComment())."</small>";
@ -97,7 +96,6 @@ class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {
} }
echo "</tbody>"; echo "</tbody>";
echo "</table>"; echo "</table>";
$this->contentContainerEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();

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

@ -44,7 +44,6 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
$this->contentStart(); $this->contentStart();
$this->pageNavigation("", "admin_tools"); $this->pageNavigation("", "admin_tools");
$this->contentHeading(getMLText("user_list")); $this->contentHeading(getMLText("user_list"));
$this->contentContainerStart();
$sessionmgr = new SeedDMS_SessionMgr($dms->getDB()); $sessionmgr = new SeedDMS_SessionMgr($dms->getDB());
?> ?>
@ -53,7 +52,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
<thead><tr><th></th><th><?php printMLText('name'); ?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('role'); ?></th><th><?php printMLText('discspace'); ?></th><th><?php printMLText('authentication'); ?></th><th></th></tr></thead><tbody> <thead><tr><th></th><th><?php printMLText('name'); ?></th><th><?php printMLText('groups'); ?></th><th><?php printMLText('role'); ?></th><th><?php printMLText('discspace'); ?></th><th><?php printMLText('authentication'); ?></th><th></th></tr></thead><tbody>
<?php <?php
foreach ($allUsers as $currUser) { foreach ($allUsers as $currUser) {
echo "<tr>"; echo "<tr".($currUser->isDisabled() ? " class=\"error\"" : "").">";
echo "<td>"; echo "<td>";
if ($currUser->hasImage()) if ($currUser->hasImage())
print "<img width=\"100\" src=\"".$this->html_url('UserImage', array('userid'=>$currUser->getId()))."\" >"; print "<img width=\"100\" src=\"".$this->html_url('UserImage', array('userid'=>$currUser->getId()))."\" >";
@ -116,7 +115,6 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
} }
echo "</tbody></table>"; echo "</tbody></table>";
$this->contentContainerEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */