gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-11-27 18:10: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 2025-11-08 19:43:07 +01:00
commit 4f8c7ed315
7 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.xml
View File

@ -257,13 +257,13 @@
</replaceregexp> </replaceregexp>
</filterchain> </filterchain>
</copy> </copy>
<exec executable="ln" passthru="true" dir="${builddir}/export/${shortversion}">
<arg line="-s seeddms-${version} seeddms" />
</exec>
<phingcall target="composer"> <phingcall target="composer">
<property name="composer_extra_params" value="--working-dir=${builddir}/export/${shortversion}/" /> <property name="composer_extra_params" value="--working-dir=${builddir}/export/${shortversion}/" />
<property name="composer_envv" value="COMPOSER=${srcdir}/composer-dist.json" /> <property name="composer_envv" value="COMPOSER=${srcdir}/composer-dist.json" />
</phingcall> </phingcall>
<exec executable="ln" passthru="true" dir="${builddir}/export/${shortversion}">
<arg line="-s seeddms-${version} seeddms" />
</exec>
<exec executable="ln" passthru="true" dir="${builddir}/export/${shortversion}/www"> <exec executable="ln" passthru="true" dir="${builddir}/export/${shortversion}/www">
<arg line="-s ../seeddms/op" /> <arg line="-s ../seeddms/op" />
</exec> </exec>

2
composer-dist.json
View File

@ -22,7 +22,7 @@
"psr-4": { "psr-4": {
"SeedDMS\\Console\\": "seeddms/utils" "SeedDMS\\Console\\": "seeddms/utils"
}, },
"classmap": ["seeddms/inc/inc.ClassTranslator.php", "seeddms/inc/inc.ClassSettings.php", "seeddms/inc/inc.Version.php", "inc/inc.ClassViewCommon.php", "inc/inc.ClassControllerCommon.php", "inc/inc.ClassController.php"] "classmap": ["seeddms/inc/inc.ClassTranslator.php", "seeddms/inc/inc.ClassSettings.php", "seeddms/inc/inc.Version.php", "seeddms/inc/inc.ClassViewCommon.php", "seeddms/inc/inc.ClassControllerCommon.php", "seeddms/inc/inc.ClassController.php"]
}, },
"require": { "require": {
"pear/http_request2": "^2", "pear/http_request2": "^2",

2
inc/inc.ClassSettings.php
View File

@ -1972,7 +1972,7 @@ class Settings { /* {{{ */
return $this->_availablelanguages; return $this->_availablelanguages;
} }
return getAvailableLanguages(); return self::getAvailableLanguages();
} /* }}} */ } /* }}} */
} /* }}} */ } /* }}} */

2
op/op.Login.php
View File

@ -63,7 +63,7 @@ if(isset($_POST['pwd'])) {
} }
$lang = ''; $lang = '';
if(isset($_REQUEST["lang"]) && strlen($_REQUEST["lang"])>0 && is_numeric(array_search($_REQUEST["lang"],getLanguages())) ) { if(isset($_REQUEST["lang"]) && strlen($_REQUEST["lang"])>0 && is_numeric(array_search($_REQUEST["lang"],$settings->getLanguages())) ) {
$lang = (string) $_REQUEST["lang"]; $lang = (string) $_REQUEST["lang"];
} }

2
out/out.Login.php
View File

@ -56,7 +56,7 @@ if($view) {
$view->setParam('referrer', $refer); $view->setParam('referrer', $refer);
$view->setParam('themes', $themes); $view->setParam('themes', $themes);
$view->setParam('msg', $msg); $view->setParam('msg', $msg);
$view->setParam('languages', getLanguages()); $view->setParam('languages', $settings->getLanguages());
$view->setParam('enablelanguageselector', $settings->_enableLanguageSelector); $view->setParam('enablelanguageselector', $settings->_enableLanguageSelector);
$view->setParam('enablethemeselector', $settings->_enableThemeSelector); $view->setParam('enablethemeselector', $settings->_enableThemeSelector);
$view->setParam('enable2factauth', $settings->_enable2FactorAuthentication); $view->setParam('enable2factauth', $settings->_enable2FactorAuthentication);

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

@ -744,14 +744,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
<ul class="dropdown-menu"> <ul class="dropdown-menu">
'; ';
foreach($button['menuitems'] as $menuitem) { foreach($button['menuitems'] as $menuitem) {
$content .= ' if(is_array($menuitem)) {
$content .= '
<li><a'; <li><a';
if(!empty($menuitem['link'])) if(!empty($menuitem['link']))
$content .= ' href="'.$menuitem['link'].'"'; $content .= ' href="'.$menuitem['link'].'"';
if(!empty($menuitem['onclick'])) if(!empty($menuitem['onclick']))
$content .= ' onclick="'.$menuitem['onclick'].'"'; $content .= ' onclick="'.$menuitem['onclick'].'"';
$content .= '>'.$menuitem['label'].'</a><li> $content .= '>'.$menuitem['label'].'</a><li>
'; ';
} else {
$content .= $menuitem;
}
} }
$content .= ' $content .= '
</ul> </ul>

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

@ -677,14 +677,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
<div class="dropdown-menu"> <div class="dropdown-menu">
'; ';
foreach($button['menuitems'] as $menuitem) { foreach($button['menuitems'] as $menuitem) {
$content .= ' if(is_array($menuitem)) {
$content .= '
<a class="dropdown-item"'; <a class="dropdown-item"';
if(!empty($menuitem['link'])) if(!empty($menuitem['link']))
$content .= ' href="'.$menuitem['link'].'"'; $content .= ' href="'.$menuitem['link'].'"';
if(!empty($menuitem['onclick'])) if(!empty($menuitem['onclick']))
$content .= ' onclick="'.$menuitem['onclick'].'"'; $content .= ' onclick="'.$menuitem['onclick'].'"';
$content .= '>'.$menuitem['label'].'</a> $content .= '>'.$menuitem['label'].'</a>
'; ';
} else {
$content .= $menuitem;
}
} }
$content .= ' $content .= '
</div> </div>