gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +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-02-22 13:22:51 +01:00
commit 8d7c8a0bdf
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SeedDMS_Core/package.xml
View File

@ -1162,6 +1162,25 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
- SeedDMS_Core_DMS::search() can search for document/folder id - SeedDMS_Core_DMS::search() can search for document/folder id
</notes> </notes>
</release> </release>
<release>
<date>2017-02-22</date>
<time>11:25:11</time>
<version>
<release>4.3.33</release>
<api>4.3.33</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- SeedDMЅ_Core_DMS::getTimeline() no longer returns duplicate documents
- SeedDMЅ_Core_Document::addContent() sets workflow after status was set
- SeedDMЅ_Core_Keyword::setOwner() fix sql statement
- SeedDMЅ_Core_User::setFullname() minor fix in sql statement
</notes>
</release>
<release> <release>
<date>2016-01-22</date> <date>2016-01-22</date>
<time>14:34:58</time> <time>14:34:58</time>

4
inc/inc.ClassUI.php
View File

@ -56,16 +56,19 @@ class UI extends UI_Default {
* to rootDir or an extension dir if it has set the include path * to rootDir or an extension dir if it has set the include path
*/ */
$filename = ''; $filename = '';
$httpbasedir = '';
foreach($EXT_CONF as $extname=>$extconf) { foreach($EXT_CONF as $extname=>$extconf) {
if(!isset($extconf['disable']) || $extconf['disable'] == false) { if(!isset($extconf['disable']) || $extconf['disable'] == false) {
$filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php"; $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/class.".$class.".php";
if(file_exists($filename)) { if(file_exists($filename)) {
$httpbasedir = 'ext/'.$extname.'/';
break; break;
} }
$filename = ''; $filename = '';
if(isset($extconf['views'][$class])) { if(isset($extconf['views'][$class])) {
$filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file']; $filename = $settings->_rootDir.'ext/'.$extname.'/views/'.$theme."/".$extconf['views'][$class]['file'];
if(file_exists($filename)) { if(file_exists($filename)) {
$httpbasedir = 'ext/'.$extname.'/';
$classname = $extconf['views'][$class]['name']; $classname = $extconf['views'][$class]['name'];
break; break;
} }
@ -81,6 +84,7 @@ class UI extends UI_Default {
$view = new $classname($params, $theme); $view = new $classname($params, $theme);
/* Set some configuration parameters */ /* Set some configuration parameters */
$view->setParam('refferer', $_SERVER['REQUEST_URI']); $view->setParam('refferer', $_SERVER['REQUEST_URI']);
$view->setParam('absbaseprefix', $settings->_httpRoot.$httpbasedir);
$view->setParam('class', $class); $view->setParam('class', $class);
$view->setParam('session', $session); $view->setParam('session', $session);
$view->setParam('settings', $settings); $view->setParam('settings', $settings);

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

@ -152,12 +152,12 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
parse_str($_SERVER['QUERY_STRING'], $tmp); parse_str($_SERVER['QUERY_STRING'], $tmp);
$tmp['action'] = 'footerjs'; $tmp['action'] = 'footerjs';
$tmp['hash'] = $hashjs; $tmp['hash'] = $hashjs;
echo '<script src="../out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n"; echo '<script src="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n";
} }
if(method_exists($this, 'js')) { if(method_exists($this, 'js')) {
parse_str($_SERVER['QUERY_STRING'], $tmp); parse_str($_SERVER['QUERY_STRING'], $tmp);
$tmp['action'] = 'js'; $tmp['action'] = 'js';
echo '<script src="../out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n"; echo '<script src="'.$this->params['absbaseprefix'].'out/out.'.$this->params['class'].'.php?'.http_build_query($tmp).'"></script>'."\n";
} }
echo "</body>\n</html>\n"; echo "</body>\n</html>\n";
} /* }}} */ } /* }}} */