gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-04 15:12:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-05-03 07:05:10 +02:00
commit 6c509d3f8b
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
inc/inc.Authentication.php
View File

@ -114,20 +114,9 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['notification'])) {
}
}
/* Include the language file as specified in the session. If that is not
* available use the language from the settings
/* Include additional language file for view
* This file must set $LANG[xx][]
*/
/*
if(file_exists($settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc")) {
include $settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc";
$session->setLanguage($resArr["language"]);
} else {
include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
$session->setLanguage($settings->_language);
}
*/
if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $lang . "/lang.inc")) {
include $settings->_rootDir . "view/".$theme."/languages/" . $lang . "/lang.inc";
}

2
views/bootstrap/class.ForcePasswordChange.php
View File

@ -75,7 +75,7 @@ $(document).ready( function() {
$this->htmlStartPage(getMLText("sign_in"), "forcepasswordchange");
$this->globalBanner();
$this->contentStart();
echo "<h3>".getMLText('password_expiration')."</h3>";
$this->contentHeading(getMLText('password_expiration'));
echo "<div class=\"alert\">".getMLText('password_expiration_text')."</div>";
$this->contentContainerStart();
?>