From 9fb4dfaa9b4451e317101e39b40db87601b43b84 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 May 2016 06:44:50 +0200
Subject: [PATCH 1/3] start new version 5.0.4

---
 Makefile                           |  2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php |  2 +-
 SeedDMS_Core/package.xml           | 25 ++++++++++++++++++++-----
 inc/inc.Version.php                |  2 +-
 install/install.php                |  2 +-
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 97be48904..d76f54390 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=5.0.3
+VERSION=5.0.4
 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
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index c1e6d1c62..a047733f7 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -312,7 +312,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.0.3';
+			$this->version = '5.0.4';
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 75077d574..79f2645bb 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-04-04</date>
+ <date>2016-05-03</date>
  <time>08:56:33</time>
  <version>
-  <release>5.0.3</release>
-  <api>5.0.3</api>
+  <release>5.0.4</release>
+  <api>5.0.4</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,8 +24,6 @@
  </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>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1074,5 +1072,22 @@ 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>
  </changelog>
 </package>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 95f0bc97e..21244c76c 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.0.3";
+	public $_number = "5.0.4";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index 6c1ddb38d..3c413a0b4 100644
--- a/install/install.php
+++ b/install/install.php
@@ -118,7 +118,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "5.0.3");
+define("SEEDDMS_VERSION", "5.0.4");
 
 require_once('../inc/inc.ClassSettings.php');
 

From 553a29bd29a65fb85951c550a9b0b726c7ecbb22 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 May 2016 07:03:31 +0200
Subject: [PATCH 2/3] remove some old code

---
 inc/inc.Authentication.php | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/inc/inc.Authentication.php b/inc/inc.Authentication.php
index d300504b7..38c3d8bd6 100644
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@@ -76,19 +76,9 @@ if($settings->_enableEmail) {
 	$notifier->addService(new SeedDMS_EmailNotify($dms));
 }
 
-/* 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";
 }

From 1b8e0052e8b35625de5ed874ef49f621f6697c3e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 3 May 2016 07:03:47 +0200
Subject: [PATCH 3/3] use contentHeading() instead of plain html

---
 views/bootstrap/class.ForcePasswordChange.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.ForcePasswordChange.php b/views/bootstrap/class.ForcePasswordChange.php
index dde4f3ea4..d48443479 100644
--- a/views/bootstrap/class.ForcePasswordChange.php
+++ b/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();
 ?>