Merge branch 'seeddms-5.0.x' into develop

Makefile

@@ -1,4 +1,4 @@
-VERSION=5.1.0
+VERSION=5.1.1
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp
 

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -391,7 +391,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.1.0';
+			$this->version = '5.1.1';
 	} /* }}} */
 
 	/**

SeedDMS_Core/package.xml

@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-03-09</date>
+ <date>2016-05-03</date>
  <time>09:28:28</time>
  <version>
-  <release>5.1.0</release>
-  <api>5.1.0</api>
+  <release>5.1.1</release>
+  <api>5.1.1</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,9 +24,6 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- add roles
-- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
-- all changes from 4.3.26 merged
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1110,5 +1107,40 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - all changes from 4.3.25 merged
 	 </notes>
   </release>
+  <release>
+   <date>2016-04-04</date>
+   <time>08:56:33</time>
+   <version>
+    <release>5.0.3</release>
+    <api>5.0.3</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+- all changes from 4.3.26 merged
+   </notes>
+  </release>
+  <release>
+   <date>2016-03-09</date>
+   <time>09:28:28</time>
+   <version>
+    <release>5.1.0</release>
+    <api>5.1.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- add roles
+- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+- all changes from 4.3.26 merged
+   </notes>
+  </release>
  </changelog>
 </package>

inc/inc.Authentication.php

@@ -117,20 +117,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";
 }

inc/inc.Version.php

@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.1.0";
+	public $_number = "5.1.1";
 	private $_string = "SeedDMS";
 
 	function __construct() {

install/install.php

@@ -118,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "5.1.0");
+define("SEEDDMS_VERSION", "5.1.1");
 
 require_once('../inc/inc.ClassSettings.php');
 

views/bootstrap/class.ForcePasswordChange.php

@@ -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();
 ?>