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

2025-02-11 09:35:00 +00:00 · 2016-02-02 09:48:18 +01:00 · 2016-02-02 09:48:18 +01:00 · 76f5a89f92
commit 76f5a89f92
parent a8a86193af 0c8768a09e
75 changed files with 755 additions and 307 deletions
--- a/6
+++ b/6
@ -15,8 +15,12 @@
                     Changes in version 4.3.24
 --------------------------------------------------------------------------------
 - fixed possible XSS attack in user substitution
- users can have than 1 mandatory workflow, in that case the user can select one
+- users can have than one mandatory workflow, in that case the user can select one
 - completed MyDocuments page for advanced workflows
+- guest user can be automatically logged in
+- get/set custom attributes by webdav
+- default search method can be set (fulltext, database)
+- various translation updates

 --------------------------------------------------------------------------------
                     Changes in version 4.3.23
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-VERSION=5.0.0
+VERSION=5.0.1
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install restapi
 # webapp

--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@ -311,7 +311,7 @@ class SeedDMS_Core_DMS {
 		$this->classnames['group'] = 'SeedDMS_Core_Group';
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.0.0';
+			$this->version = '5.0.1';
 	} /* }}} */

 	/**
--- a/SeedDMS_Core/Core/inc.ClassObject.php
+++ b/SeedDMS_Core/Core/inc.ClassObject.php
@ -202,6 +202,11 @@ class SeedDMS_Core_Object { /* {{{ */
 		if (!$this->_attributes) {
 			$this->getAttributes();
 		}
+		switch($attrdef->getType()) {
+		case SeedDMS_Core_AttributeDefinition::type_boolean:
+			$value = ($value === true || $value != '' || $value == 1) ? 1 : 0;
+			break;
+		}
 		if($attrdef->getMultipleValues() && is_array($value)) {
 			$sep = substr($attrdef->getValueSet(), 0, 1);
 			$value = $sep.implode($sep, $value);
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@ -943,5 +943,22 @@ by a group or user right
 - minor improvements int SeedDMS_Core_Document::getReadAccessList()
 	 </notes>
  </release>
+  <release>
+   <date>2016-01-22</date>
+   <time>07:12:53</time>
+   <version>
+    <release>4.3.24</release>
+    <api>4.3.24</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- make sure boolean attribute is saved as 0/1
+- add SeedDMS_Core_User::[g|s]etMandatoryWorkflows()
+	 </notes>
+  </release>
 </changelog>
 </package>
--- a/SeedDMS_Lucene/Lucene/IndexedDocument.php
+++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php
@ -64,6 +64,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
 	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) {
 		$_convcmd = array(
 			'application/pdf' => 'pdftotext -enc UTF-8 -nopgbrk %s - |sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
+			'application/postscript' => 'ps2pdf14 %s - | pdftotext -enc UTF-8 -nopgbrk - - | sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
 			'application/msword' => 'catdoc %s',
 			'application/vnd.ms-excel' => 'ssconvert -T Gnumeric_stf:stf_csv -S %s fd://1',
 			'audio/mp3' => "id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'",
--- a/SeedDMS_Lucene/package.xml
+++ b/SeedDMS_Lucene/package.xml
@ -11,11 +11,11 @@
  <email>uwe@steinmann.cx</email>
  <active>yes</active>
 </lead>
- <date>2015-08-05</date>
- <time>21:13:13</time>
+ <date>2016-02-01</date>
+ <time>09:14:07</time>
 <version>
-  <release>1.1.6</release>
-  <api>1.1.6</api>
+  <release>1.1.7</release>
+  <api>1.1.7</api>
 </version>
 <stability>
  <release>stable</release>
@ -23,7 +23,7 @@
 </stability>
 <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
 <notes>
-run external commands with a timeout
+add command for indexing postѕcript files
 </notes>
 <contents>
  <dir baseinstalldir="SeedDMS" name="/">
@ -186,5 +186,21 @@ field for original filename is treated as utf-8
 declare SeeDMS_Lucene_Indexer::open() static
   </notes>
  </release>
+  <release>
+   <date>2015-08-05</date>
+   <time>21:13:13</time>
+   <version>
+    <release>1.1.6</release>
+    <api>1.1.6</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+run external commands with a timeout
+   </notes>
+  </release>
 </changelog>
 </package>
--- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
+++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
@ -69,6 +69,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
 	public function __construct($dms, $document, $convcmd=null, $nocontent=false, $timeout=5) {
 		$_convcmd = array(
 			'application/pdf' => 'pdftotext -enc UTF-8 -nopgbrk %s - |sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
+			'application/postscript' => 'ps2pdf14 %s - | pdftotext -enc UTF-8 -nopgbrk - - | sed -e \'s/ [a-zA-Z0-9.]\{1\} / /g\' -e \'s/[0-9.]//g\'',
 			'application/msword' => 'catdoc %s',
 			'application/vnd.ms-excel' => 'ssconvert -T Gnumeric_stf:stf_csv -S %s fd://1',
 			'audio/mp3' => "id3 -l -R %s | egrep '(Title|Artist|Album)' | sed 's/^[^:]*: //g'",
--- a/SeedDMS_SQLiteFTS/package.xml
+++ b/SeedDMS_SQLiteFTS/package.xml
@ -11,10 +11,10 @@
  <email>uwe@steinmann.cx</email>
  <active>yes</active>
 </lead>
- <date>2016-01-10</date>
- <time>09:07:07</time>
+ <date>2016-02-01</date>
+ <time>09:15:01</time>
 <version>
-  <release>1.0.2</release>
+  <release>1.0.3</release>
  <api>1.0.1</api>
 </version>
 <stability>
@ -23,7 +23,7 @@
 </stability>
 <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
 <notes>
-check if index exists before removing it when creating a new one
+add command for indexing postѕcript files
 </notes>
 <contents>
  <dir baseinstalldir="SeedDMS" name="/">
@ -98,5 +98,21 @@ initial release
 add __get() to SQLiteFTS_Document because class.IndexInfo.php access class variable title which doesn't exists
   </notes>
  </release>
+  <release>
+   <date>2016-01-10</date>
+   <time>09:07:07</time>
+   <version>
+    <release>1.0.2</release>
+    <api>1.0.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+check if index exists before removing it when creating a new one
+   </notes>
+  </release>
 </changelog>
 </package>
--- a/inc/inc.Authentication.php
+++ b/inc/inc.Authentication.php
@ -12,16 +12,42 @@
 * @version    Release: @package_version@
 */

+require_once("inc.Utils.php");
+require_once("inc.ClassEmailNotify.php");
+require_once("inc.ClassSession.php");
+
 $refer = $_SERVER["REQUEST_URI"];
 if (!strncmp("/op", $refer, 3)) {
 	$refer="";
 } else {
 	$refer = urlencode($refer);
 }
+if (!isset($_COOKIE["mydms_session"])) {
+	if($settings->_enableGuestLogin && $settings->_enableGuestAutoLogin) {
+		require_once("../inc/inc.ClassSession.php");
+		$session = new SeedDMS_Session($db);
+		if(!$dms_session = $session->create(array('userid'=>$settings->_guestID, 'theme'=>$settings->_theme, 'lang'=>$settings->_language))) {
+			header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+			exit;
+		}
+		$resArr = $session->load($dms_session);
+	} else {
+		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+		exit;
+	}
+} else {
+	/* Load session */
+	$dms_session = $_COOKIE["mydms_session"];
+	$session = new SeedDMS_Session($db);
+	if(!$resArr = $session->load($dms_session)) {
+		setcookie("mydms_session", $dms_session, time()-3600, $settings->_httpRoot); //delete cookie
+		header("Location: " . $settings->_httpRoot . "out/out.Login.php?referuri=".$refer);
+		exit;
+	}
+}

-require_once("inc.Utils.php");
-require_once("inc.ClassEmailNotify.php");
-require_once("inc.ClassSession.php");
+/* Update last access time */
+$session->updateAccess($dms_session);

 if (!isset($_COOKIE["mydms_session"])) {
 	if($settings->_autoLoginUser) {
--- a/inc/inc.ClassSettings.php
+++ b/inc/inc.ClassSettings.php
@ -38,6 +38,8 @@ class Settings { /* {{{ */
 	var $_rootFolderID = 1;
 	// If you want anybody to login as guest, set the following line to true
 	var $_enableGuestLogin = false;
+	// If you even want guest to be logged in automatically, set the following to true
+	var $_enableGuestAutoLogin = false;
 	// Allow users to reset their password
 	var $_enablePasswordForgotten = false;
 	// Minimum password strength (0 - x, 0 means no check)
@ -91,6 +93,8 @@ class Settings { /* {{{ */
 	var $_enableFullSearch = true;
 	// fulltext search engine
 	var $_fullSearchEngine = 'lucene';
+	// default search method
+	var $_defaultSearchMethod = 'database'; // or 'fulltext'
 	// contentOffsetDirTo
 	var $_contentOffsetDir = "1048576";
 	// Maximum number of sub-directories per parent directory
@ -166,6 +170,8 @@ class Settings { /* {{{ */
 	var $_enableRecursiveCount = false;
 	// maximum number of documents or folders when counted recursively
 	var $_maxRecursiveCount = 10000;
+	// enable/disable help
+	var $_enableHelp = true;
 	// enable/disable language selection menu
 	var $_enableLanguageSelector = true;
 	// enable/disable theme selector
@ -354,10 +360,12 @@ class Settings { /* {{{ */
 		$this->_enableFolderTree = Settings::boolVal($tab["enableFolderTree"]);
 		$this->_enableRecursiveCount = Settings::boolVal($tab["enableRecursiveCount"]);
 		$this->_maxRecursiveCount = intval($tab["maxRecursiveCount"]);
+		$this->_enableHelp = Settings::boolVal($tab["enableHelp"]);
 		$this->_enableLanguageSelector = Settings::boolVal($tab["enableLanguageSelector"]);
 		$this->_enableThemeSelector = Settings::boolVal($tab["enableThemeSelector"]);
 		$this->_enableFullSearch = Settings::boolVal($tab["enableFullSearch"]);
 		$this->_fullSearchEngine = strval($tab["fullSearchEngine"]);
+		$this->_defaultSearchMethod = strval($tab["defaultSearchMethod"]);
 		$this->_stopWordsFile = strval($tab["stopWordsFile"]);
 		$this->_sortUsersInList = strval($tab["sortUsersInList"]);
 		$this->_sortFoldersDefault = strval($tab["sortFoldersDefault"]);
@ -389,6 +397,7 @@ class Settings { /* {{{ */
 		$node = $xml->xpath('/configuration/system/authentication');
 		$tab = $node[0]->attributes();
 		$this->_enableGuestLogin = Settings::boolVal($tab["enableGuestLogin"]);
+		$this->_enableGuestAutoLogin = Settings::boolVal($tab["enableGuestAutoLogin"]);
 		$this->_enablePasswordForgotten = Settings::boolVal($tab["enablePasswordForgotten"]);
 		$this->_passwordStrength = intval($tab["passwordStrength"]);
 		$this->_passwordStrengthAlgorithm = strval($tab["passwordStrengthAlgorithm"]);
@ -646,10 +655,12 @@ class Settings { /* {{{ */
    $this->setXMLAttributValue($node, "enableFolderTree", $this->_enableFolderTree);
    $this->setXMLAttributValue($node, "enableRecursiveCount", $this->_enableRecursiveCount);
    $this->setXMLAttributValue($node, "maxRecursiveCount", $this->_maxRecursiveCount);
+    $this->setXMLAttributValue($node, "enableHelp", $this->_enableHelp);
    $this->setXMLAttributValue($node, "enableLanguageSelector", $this->_enableLanguageSelector);
    $this->setXMLAttributValue($node, "enableThemeSelector", $this->_enableThemeSelector);
    $this->setXMLAttributValue($node, "enableFullSearch", $this->_enableFullSearch);
    $this->setXMLAttributValue($node, "fullSearchEngine", $this->_fullSearchEngine);
+    $this->setXMLAttributValue($node, "defaultSearchMethod", $this->_defaultSearchMethod);
    $this->setXMLAttributValue($node, "expandFolderTree", $this->_expandFolderTree);
    $this->setXMLAttributValue($node, "stopWordsFile", $this->_stopWordsFile);
    $this->setXMLAttributValue($node, "sortUsersInList", $this->_sortUsersInList);
@ -679,6 +690,7 @@ class Settings { /* {{{ */
    // XML Path: /configuration/system/authentication
    $node = $this->getXMLNode($xml, '/configuration/system', 'authentication');
    $this->setXMLAttributValue($node, "enableGuestLogin", $this->_enableGuestLogin);
+    $this->setXMLAttributValue($node, "enableGuestAutoLogin", $this->_enableGuestAutoLogin);
    $this->setXMLAttributValue($node, "enablePasswordForgotten", $this->_enablePasswordForgotten);
    $this->setXMLAttributValue($node, "passwordStrength", $this->_passwordStrength);
    $this->setXMLAttributValue($node, "passwordStrengthAlgorithm", $this->_passwordStrengthAlgorithm);
--- a/inc/inc.ClassUI.php
+++ b/inc/inc.ClassUI.php
@ -91,6 +91,7 @@ class UI extends UI_Default {
 			$view->setParam('enablecalendar', $settings->_enableCalendar);
 			$view->setParam('calendardefaultview', $settings->_calendarDefaultView);
 			$view->setParam('enablefullsearch', $settings->_enableFullSearch);
+			$view->setParam('enablehelp', $settings->_enableHelp);
 			$view->setParam('enablelargefileupload', $settings->_enableLargeFileUpload);
 			$view->setParam('printdisclaimer', $settings->_printDisclaimer);
 			$view->setParam('footnote', $settings->_footNote);
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@ -20,7 +20,7 @@

 class SeedDMS_Version {

-	public $_number = "5.0.0";
+	public $_number = "5.0.1";
 	private $_string = "SeedDMS";

 	function SeedDMS_Version() {
--- 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.0");
+define("SEEDDMS_VERSION", "5.0.1");

 require_once('../inc/inc.ClassSettings.php');

--- a/languages/ar_EG/lang.inc
+++ b/languages/ar_EG/lang.inc
@ -936,6 +936,10 @@ URL: [url]',
 'settings_dbUser' => '',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@ -964,8 +968,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => 'تفعيل البحث بالنص الكامل',
 'settings_enableFullSearch_desc' => 'تفعيل البحث بالنص الكامل',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => '',
 'settings_enableGuestLogin_desc' => '',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => '',
 'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
--- a/languages/bg_BG/lang.inc
+++ b/languages/bg_BG/lang.inc
@ -801,6 +801,10 @@ $text = array(
 'settings_dbUser' => 'Логин',
 'settings_dbUser_desc' => 'Логин, въведен в процеса на инсталацията. Не променяй без нужда, само например, ако БД е преместена.',
 'settings_dbVersion' => 'Схема БД остаряла',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Изтрийте ENABLE_INSTALL_TOOL в папка конфигурация, за да започнете да използвате системата',
 'settings_disableSelfEdit' => 'Изключи собствено редактиране',
 'settings_disableSelfEdit_desc' => 'Ако е включено, потребителите няма да могат да редактират своята информация',
@ -829,8 +833,12 @@ $text = array(
 'settings_enableFolderTree_desc' => 'Изключено - не показвй дървото с папките',
 'settings_enableFullSearch' => 'Включи полнотекстово търсене',
 'settings_enableFullSearch_desc' => 'Включване полнотекстово търсене',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Включи вход за гости',
 'settings_enableGuestLogin_desc' => 'За да разрешим вход за гости, включете тази опция. Гостевия вход да се исползва само в доверена среда.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Разреши избор на език',
 'settings_enableLanguageSelector_desc' => 'Покажи селектор за език на интерфейса след влизане. Това не влияе на избора на език на първа страница.',
 'settings_enableLargeFileUpload' => 'Включи джава-зараждане на файлове',
--- a/languages/ca_ES/lang.inc
+++ b/languages/ca_ES/lang.inc
@ -806,6 +806,10 @@ URL: [url]',
 'settings_dbUser' => '',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@ -834,8 +838,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'False to don\'t show the folder tree',
 'settings_enableFullSearch' => 'Enable Full text search',
 'settings_enableFullSearch_desc' => '',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Enable Guest Login',
 'settings_enableGuestLogin_desc' => '',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => '',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
--- a/languages/cs_CZ/lang.inc
+++ b/languages/cs_CZ/lang.inc
@ -945,6 +945,10 @@ URL: [url]',
 'settings_dbUser' => 'Username',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@ -973,8 +977,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'False to don\'t show the folder tree',
 'settings_enableFullSearch' => 'Enable Full text search',
 'settings_enableFullSearch_desc' => 'Enable Full text search',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Enable Guest Login',
 'settings_enableGuestLogin_desc' => 'If you want anybody to login as guest, check this option. Note: guest login should be used only in a trusted environment',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Povolit výběr jazyka',
 'settings_enableLanguageSelector_desc' => 'Zobrazit výběr jazyka uživatelského rozhraní po přihlášení.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
--- a/languages/de_DE/lang.inc
+++ b/languages/de_DE/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2154), dgrutsch (21)
+//    Translators: Admin (2162), dgrutsch (21)

 $text = array(
 'accept' => 'Übernehmen',
@ -982,6 +982,10 @@ URL: [url]',
 'settings_dbUser' => 'Benutzer',
 'settings_dbUser_desc' => 'Der Benutzername, um auf die Datenbank zugreifen zu können.',
 'settings_dbVersion' => 'Datenbankschema zu alt',
+'settings_defaultSearchMethod' => 'Voreinstellte Suchmethode',
+'settings_defaultSearchMethod_desc' => 'Voreingestellte Suchmethode, wenn über das Suchfeld in der Menüleiste gesucht wird.',
+'settings_defaultSearchMethod_valdatabase' => 'Datenbank',
+'settings_defaultSearchMethod_valfulltext' => 'Volltext',
 'settings_delete_install_folder' => 'Um SeedDMS nutzen zu können, müssen Sie die Datei ENABLE_INSTALL_TOOL aus dem Konfigurationsverzeichnis löschen.',
 'settings_disableSelfEdit' => 'Kein Ändern des eigenen Profils',
 'settings_disableSelfEdit_desc' => 'Anwählen, um das Ändern des eigenen Profiles zu verhindern.',
@ -1010,8 +1014,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Schaltet den Verzeichnisbaum auf der \'View Folder\' Seite ein oder aus',
 'settings_enableFullSearch' => 'Volltextsuche einschalten',
 'settings_enableFullSearch_desc' => 'Anwählen, um die Volltextsuche mittels Lucene einzuschalten.',
+'settings_enableGuestAutoLogin' => 'Automatische Anmeldung als Gast',
+'settings_enableGuestAutoLogin_desc' => 'Wenn das Gast-Login und automatisches Anmelden eingeschaltet ist, dann wird der Gast-Benutzer sofort angemeldet.',
 'settings_enableGuestLogin' => 'Anmeldung als Gast',
 'settings_enableGuestLogin_desc' => 'Wenn Sie Gast-Logins erlauben wollen, dann wählen Sie diese Option an. Anmerkung: Gast-Logins sollten nur in einer vertrauenswürdigen Umgebung erlaubt werden.',
+'settings_enableHelp' => 'Hilfe einschalten',
+'settings_enableHelp_desc' => 'Ein-/Ausschalten des Hilfe-Links im Hauptmenü.',
 'settings_enableLanguageSelector' => 'Sprachauswahl einschalten',
 'settings_enableLanguageSelector_desc' => 'Zeige Auswahl der verfügbaren Sprachen nachdem man sich angemeldet hat.',
 'settings_enableLargeFileUpload' => 'Hochladen von sehr großen Dateien ermöglichen',
--- a/languages/en_GB/lang.inc
+++ b/languages/en_GB/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1287), dgrutsch (7), netixw (14)
+//    Translators: Admin (1297), dgrutsch (7), netixw (14)

 $text = array(
 'accept' => 'Accept',
@ -689,7 +689,7 @@ URL: [url]',
 'october' => 'October',
 'old' => 'Old',
 'only_jpg_user_images' => 'Only .jpg-images may be used as user-images',
-'order_by_sequence_off' => 'Ordering by sequence is turned of in the settings. If you want this parameter to have effect, you will have to turn it back on.',
+'order_by_sequence_off' => 'Ordering by sequence is turned off in the settings. If you want this parameter to have effect, you will have to turn it back on.',
 'original_filename' => 'Original filename',
 'owner' => 'Owner',
 'ownership_changed_email' => 'Owner changed',
@ -982,6 +982,10 @@ URL: [url]',
 'settings_dbUser' => 'Username',
 'settings_dbUser_desc' => 'The username for access to your database entered during the installation process. Do not edit field unless absolutely necessary, for example transfer of the database to a new Host.',
 'settings_dbVersion' => 'Database schema too old',
+'settings_defaultSearchMethod' => 'Default search method',
+'settings_defaultSearchMethod_desc' => 'Default search method, when a search is started by the search form in the main menu.',
+'settings_defaultSearchMethod_valdatabase' => 'database',
+'settings_defaultSearchMethod_valfulltext' => 'fulltext',
 'settings_delete_install_folder' => 'In order to use SeedDMS, you must delete the file ENABLE_INSTALL_TOOL in the configuration directory',
 'settings_disableSelfEdit' => 'Disable Self Edit',
 'settings_disableSelfEdit_desc' => 'If checked user cannot edit his own profile',
@ -1010,8 +1014,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Enabel/Disable the folder tree on the \'View Folder\' page',
 'settings_enableFullSearch' => 'Enable Full text search',
 'settings_enableFullSearch_desc' => 'Enable Full text search',
+'settings_enableGuestAutoLogin' => 'Enable auto login for guest',
+'settings_enableGuestAutoLogin_desc' => 'If a guest login and auto login is enabled, the guest will be logged in automatically.',
 'settings_enableGuestLogin' => 'Enable Guest Login',
 'settings_enableGuestLogin_desc' => 'If you want anybody to login as guest, check this option. Note: guest login should be used only in a trusted environment',
+'settings_enableHelp' => 'Enable Help',
+'settings_enableHelp_desc' => 'Enable/disable the link to the help screens in the menu',
 'settings_enableLanguageSelector' => 'Enable Language Selector',
 'settings_enableLanguageSelector_desc' => 'Show selector for user interface language after being logged in.',
 'settings_enableLargeFileUpload' => 'Enable large file upload',
--- a/languages/es_ES/lang.inc
+++ b/languages/es_ES/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: acabello (20), Admin (979), angel (123), francisco (2), jaimem (14)
+//    Translators: acabello (20), Admin (981), angel (123), francisco (2), jaimem (14)

 $text = array(
 'accept' => 'Aceptar',
@ -951,6 +951,10 @@ URL: [url]',
 'settings_dbUser' => 'Nombre de usuario',
 'settings_dbUser_desc' => 'Nombre de usuario de acceso a su base de datos introducido durante el proceso de instalación. No edite este campo a menos que sea necesario, por ejemplo si la base de datos se transfiere a un nuevo servidor.',
 'settings_dbVersion' => 'Esquema de base de datos demasiado antiguo',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Para utilizar SeedDMS, debe eliminar el archivo ENABLE_INSTALL_TOOL de la carpeta de configuración',
 'settings_disableSelfEdit' => 'Deshabilitar autoedición',
 'settings_disableSelfEdit_desc' => 'Si está seleccionado el usuario no podrá editar su propio perfil',
@ -979,8 +983,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Falso para no mostrar el árbol de carpetas',
 'settings_enableFullSearch' => 'Habilitar búsqueda de texto completo',
 'settings_enableFullSearch_desc' => 'Habilitar búsqueda de texto completo',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Habilitar acceso de invitado',
 'settings_enableGuestLogin_desc' => 'Si quiere que cualquiera acceda como invitado, chequee esta opción. Nota: El acceso de invitado debería permitirse solo en entornos de confianza',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Habilitar selector de idioma',
 'settings_enableLanguageSelector_desc' => 'Mostrar selector de lenguaje para usuario despues de identificarse.',
 'settings_enableLargeFileUpload' => 'Habilitar la carga de ficheros grandes',
--- a/languages/fr_FR/lang.inc
+++ b/languages/fr_FR/lang.inc
@ -927,6 +927,10 @@ URL: [url]',
 'settings_dbUser' => 'Nom d\'utilisateur',
 'settings_dbUser_desc' => 'Le nom d\'utilisateur pour l\'accès à votre base de données entré pendant le processus d\'installation. Ne pas modifier le champ sauf si vraiment nécessaire, par exemple pour le transfert de la base de données vers un nouvel hébergement.',
 'settings_dbVersion' => 'Schéma de base de données trop ancien',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Pour utiliser SeedDMS, vous devez supprimer le fichier ENABLE_INSTALL_TOOL dans le répertoire de configuration',
 'settings_disableSelfEdit' => 'Désactiver auto modification',
 'settings_disableSelfEdit_desc' => 'Si coché, l\'utilisateur ne peut pas éditer son profil',
@ -955,8 +959,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'False pour ne pas montrer l\'arborescence des dossiers',
 'settings_enableFullSearch' => 'Recherches dans le contenu',
 'settings_enableFullSearch_desc' => 'Activer la recherche texte plein',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Activer la connexion Invité',
 'settings_enableGuestLogin_desc' => 'Si vous voulez vous connecter en tant qu\'invité, cochez cette option. Remarque: l\'utilisateur invité ne doit être utilisé que dans un environnement de confiance',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Activer la sélection de langue',
 'settings_enableLanguageSelector_desc' => 'Montrer le sélecteur de langue d\'interface après connexion de l\'utilisateur.',
 'settings_enableLargeFileUpload' => 'Activer téléchargement des gros fichiers',
--- a/languages/hr_HR/lang.inc
+++ b/languages/hr_HR/lang.inc
@ -972,6 +972,10 @@ Internet poveznica: [url]',
 'settings_dbUser' => 'Korisničko ime',
 'settings_dbUser_desc' => 'Korisničko ime za pristup vašoj bazi podataka unijeto tijekom postupka instalacije. Ne uređujte ovo polje bez prijeke potrebe, npr. prijenos baze podataka na novi Host.',
 'settings_dbVersion' => 'Shema baze podataka je prestara',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Da bi koristili ProsperaDMS, morate izbrisati datoteku ENABLE_INSTALL_TOOL u mapi konfiguracije',
 'settings_disableSelfEdit' => 'Onemogućite samostalno uređivanje',
 'settings_disableSelfEdit_desc' => 'Ako je označeno, korisnik ne može uređivati svoj vlastiti profil',
@ -1000,8 +1004,12 @@ Internet poveznica: [url]',
 'settings_enableFolderTree_desc' => 'Omogući/onemogući stablo mape na \'Vidi mapu\' stranici',
 'settings_enableFullSearch' => 'Omogući pretraživanje cijelog teksta',
 'settings_enableFullSearch_desc' => 'Omogući pretraživanje cijelog teksta',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Omogući Gost prijavu',
 'settings_enableGuestLogin_desc' => 'Ako želite da se bilo tko koristi Gost prijavu, označite ovu opciju. Napomena: gost prijava smije se koristiti samo u pouzdanom okruženju.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Omogući Izbornik jezika',
 'settings_enableLanguageSelector_desc' => 'Prikaži izbornik za jezik korisničkog sučelja nakon prijave.',
 'settings_enableLargeFileUpload' => 'Omogući učitavanje velikih datoteka',
--- a/languages/hu_HU/lang.inc
+++ b/languages/hu_HU/lang.inc
@ -950,6 +950,10 @@ URL: [url]',
 'settings_dbUser' => 'Felhasználónév',
 'settings_dbUser_desc' => 'Az adatbázis eléréséhez tartozó felhasználónevet a telepítési eljárás során kell megadni. Ne szerkessze ezt a mezőt, csak ha nagyon szükséges, például, ha az adatbázist át kell helyezni egy másik gépre.',
 'settings_dbVersion' => 'Adatbázis séma túl régi',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'A SeedDMS használatához törölnie kell a konfigurációs könyvtárban található ENABLE_INSTALL_TOOL állományt.',
 'settings_disableSelfEdit' => 'Saját adatok szerkesztésének tiltása',
 'settings_disableSelfEdit_desc' => 'Ha be van jelölve a felhasználó nem szerkesztheti saját profilját',
@ -978,8 +982,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Hamis hogy ne jelenjen meg a mappa fastruktúra',
 'settings_enableFullSearch' => 'Teljes szöveg keresés engedélyezése',
 'settings_enableFullSearch_desc' => 'Engedélyezi a teljes szöveg keresést',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Vendég belépésének engedélyezése',
 'settings_enableGuestLogin_desc' => 'Ha azt szeretné, hogy bárki be tudjon jelentkezni vendégként, jelölje be ezt a lehetőséget. Megjegyzés: vendég bejelentkezés megbízható környezetben használható',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Engedélyezi a nyelv választót',
 'settings_enableLanguageSelector_desc' => 'Megjelenít egy választást a felhasználói felületen a bejelentkezést követően.',
 'settings_enableLargeFileUpload' => 'Nagy méretű állományok feltöltésének engedélyezése',
--- a/languages/it_IT/lang.inc
+++ b/languages/it_IT/lang.inc
@ -974,6 +974,10 @@ URL: [url]',
 'settings_dbUser' => 'Utente',
 'settings_dbUser_desc' => 'Utente per accedere al database da utilizzarsi durante il processo di installazione. Non modificare questo campo se non assolutamente necessario, per esempio nel caso di trasferimento del database su un nuovo Host.',
 'settings_dbVersion' => 'Schema del database obsoleto',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Per poter usare SeedDMS, devi cancellare il file ENABLE_INSTALL_TOOL nella cartella di configurazione.',
 'settings_disableSelfEdit' => 'Disabilita Auto-Modifica',
 'settings_disableSelfEdit_desc' => 'Se selezionato l\'utente non può modificare il proprio profilo',
@ -1002,8 +1006,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Abilita/disabilita la visualizzaione della struttura ad albero nella pagina \'Vista cartella\'',
 'settings_enableFullSearch' => 'Abilita ricerca fulltext',
 'settings_enableFullSearch_desc' => 'Abilita/disabilita la ricerca fulltext',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Permetti login come ospite',
 'settings_enableGuestLogin_desc' => 'Per impedire il login come ospite, selezionare questa opzione. Nota bene: il login come ospite dovrebbe essere permesso soltanto in un ambiente fidato.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Selezione lingua',
 'settings_enableLanguageSelector_desc' => 'Mostra/nasconde il selettore di lingua successivamente al login.',
 'settings_enableLargeFileUpload' => 'Abilita caricamento grandi files',
--- a/languages/ko_KR/lang.inc
+++ b/languages/ko_KR/lang.inc
@ -965,6 +965,10 @@ URL : [url]',
 'settings_dbUser' => '사용자 이름',
 'settings_dbUser_desc' => '설치 과정에서 입력 한 데이터베이스 액세스를 위한 사용자 이름. 새 호스트에 데이터베이스의 예 전송을 위해 절대적으로 필요한 경우가 아니면 필드를 편집하지 마십시오.',
 'settings_dbVersion' => '오래된 데이터베이스 스키마',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'SeedDMS을 사용하려면 구성 디렉토리의 파일 ENABLE_INSTALL_TOOL을 삭제해야합니다',
 'settings_disableSelfEdit' => '자체 수정 불가',
 'settings_disableSelfEdit_desc' => '확인시 사용자가 자신의 프로필을 편집 할 수 없음',
@ -993,8 +997,12 @@ URL : [url]',
 'settings_enableFolderTree_desc' => '\'View Folder\'에 폴더 트리 표시 활성 / 비활성',
 'settings_enableFullSearch' => '전체 텍스트 검색 사용',
 'settings_enableFullSearch_desc' => '전체 텍스트 검색 사용',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => '게스트 로그인 활성화',
 'settings_enableGuestLogin_desc' => '누군가를 게스트로 로그인하게 할경우 이 옵션을 선택하세요. 참고 : 게스트 로그인은 신뢰할 수 있는 환경에서 사용되어야 한다',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => '언어 선택기 허용',
 'settings_enableLanguageSelector_desc' => '로그인 된 후 사용자 인터페이스 언어 선택기 보기 . 이것은 로그인 페이지에서 언어 선택에 영향을 주지 않습니다.',
 'settings_enableLargeFileUpload' => '대용량 파일 업로드 사용',
--- a/languages/nl_NL/lang.inc
+++ b/languages/nl_NL/lang.inc
@ -947,6 +947,10 @@ URL: [url]',
 'settings_dbUser' => 'Gebruikersnaam',
 'settings_dbUser_desc' => 'De gebruikersnaam voor toegang tot de datbase ingevoerd tijdens de installatie. Verander de waarde niet tenzij echt nodig, bijvoorbeeld bij verplaatsing van de database naar een ander systeem.',
 'settings_dbVersion' => 'Database schema te oud',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Om SeedDMS te kunnen gebruiken moet het bestand ENABLE_INSTALL_TOOL uit de configuratiemap verwijderd worden.',
 'settings_disableSelfEdit' => 'Uitschakelen Eigenprofiel wijzigen',
 'settings_disableSelfEdit_desc' => 'Indien aangevinkt kan de gebruiker zijn eigen profiel niet wijzigen.',
@ -975,8 +979,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Uitschakelen om de mappenstructuur niet te tonen',
 'settings_enableFullSearch' => 'Inschakelen volledigetekst zoekopdracht',
 'settings_enableFullSearch_desc' => 'Inschakelen zoeken in volledigetekst',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Inschakelen Gast login',
 'settings_enableGuestLogin_desc' => 'Als U iemand wilt laten inloggen als gast, schakel deze optie in. Opmerking: Gast login kan het beste alleen in een beveiligde omgeving ingeschakeld worden',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Activeer Taal instellen',
 'settings_enableLanguageSelector_desc' => 'Laat selector zien voor taalinterface, nadat gebruikers inloggen.',
 'settings_enableLargeFileUpload' => 'Inschakelen groot bestand upload',
--- a/languages/pl_PL/lang.inc
+++ b/languages/pl_PL/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (722), netixw (84), romi (93), uGn (112)
+//    Translators: Admin (726), netixw (84), romi (93), uGn (112)

 $text = array(
 'accept' => 'Akceptuj',
@ -401,7 +401,7 @@ URL: [url]',
 'files' => 'Pliki',
 'files_deletion' => 'Usuwanie plików',
 'files_deletion_warning' => 'Ta operacja pozwala usunąć wszystkie pliki z repozytorium. Informacje o wersjonowaniu pozostaną widoczne.',
-'files_loading' => '',
+'files_loading' => 'Proszę czekać do załadowania lista plików…',
 'file_size' => 'Rozmiar pliku',
 'filter_for_documents' => 'Dodatkowe filtrowanie dla dokumentów',
 'filter_for_folders' => 'Dodatkowe filtrowanie dla folderów',
@ -536,7 +536,7 @@ URL: [url]',
 'keep' => '',
 'keep_doc_status' => 'Pozostaw status dokumentu',
 'keywords' => 'Słowa kluczowe',
-'keywords_loading' => '',
+'keywords_loading' => 'Proszę czekać do załadowania lista słów kluczowych…',
 'keyword_exists' => 'Słowo kluczowe już istnieje',
 'ko_KR' => 'Koreański',
 'language' => 'Język',
@ -865,12 +865,12 @@ URL: [url]',
 'select_grp_ind_approvers' => '',
 'select_grp_ind_notification' => '',
 'select_grp_ind_reviewers' => '',
-'select_grp_notification' => '',
+'select_grp_notification' => 'Kliknij, aby wybrać grupowe powiadomienia',
 'select_grp_recipients' => '',
 'select_grp_reviewers' => 'Kliknij by wybrać grupę recenzentów',
 'select_grp_revisors' => '',
 'select_ind_approvers' => 'Kliknij by wybrać zatwierdzającego',
-'select_ind_notification' => '',
+'select_ind_notification' => 'Kliknij, aby wybrać indywidualne powiadomienia',
 'select_ind_recipients' => '',
 'select_ind_reviewers' => 'Kliknij by wybrać recenzenta',
 'select_ind_revisors' => '',
@ -930,6 +930,10 @@ URL: [url]',
 'settings_dbUser' => 'Nazwa użytkownika',
 'settings_dbUser_desc' => 'Nazwa użytkownika uprawnionego do dostępu do bazy danych podana w procesie instalacji. Nie zmieniaj tego pola dopóki nie jest to absolutnie konieczne, na przykład podczas przenoszenia bazy danych na nowego hosta.',
 'settings_dbVersion' => 'Schemat bazy danych jest za stary',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Aby móc używać LetoDMS, musisz usunąć plik ENABLE_INSTALL_TOOL znajdujący się w katalogu konfiguracyjnym',
 'settings_disableSelfEdit' => 'Wyłącz auto edycję',
 'settings_disableSelfEdit_desc' => 'Jeśli zaznaczone, użytkownik nie może zmieniać własnych danych',
@ -958,8 +962,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Odznacz aby nie pokazywać drzewa katalogów',
 'settings_enableFullSearch' => 'Włącz przeszukiwanie pełnotekstowe',
 'settings_enableFullSearch_desc' => 'Włącz przeszukiwanie pełnotekstowe',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Pozwól na logowanie gościa',
 'settings_enableGuestLogin_desc' => 'Jeśli chcesz dowolnej osobie zalogować się jako gość, zaznacz tę opcję. Uwaga: logowanie gościa powinno być używane wyłącznie w zaufanym środowisku.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Włącz wybór języka',
 'settings_enableLanguageSelector_desc' => 'Pokaż selektor języka dla interfejsu użytkownika po zalogowaniu To nie ma wpływu na wybór języka na stronie logowania.',
 'settings_enableLargeFileUpload' => 'Zezwól na wczytywanie dużych plików',
--- a/languages/pt_BR/lang.inc
+++ b/languages/pt_BR/lang.inc
@ -948,6 +948,10 @@ URL: [url]',
 'settings_dbUser' => 'Nome do usuário',
 'settings_dbUser_desc' => 'O nome de usuário para acesso ao banco de dados, informado durante o processo de instalação. Não edite campo a menos que seja absolutamente necessário, por exemplo, a transferência do banco de dados para um novo host.',
 'settings_dbVersion' => 'Esquema de banco de dados muito antigo',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Para utilizar SeedDMS, você deve excluir o arquivo ENABLE_INSTALL_TOOL do diretório de configuração',
 'settings_disableSelfEdit' => 'Desativar Auto Editar',
 'settings_disableSelfEdit_desc' => 'Se selecionado o usuário não poderá editar seu próprio perfil',
@ -976,8 +980,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Falso para não mostrar a árvore de pastas',
 'settings_enableFullSearch' => 'Ativar Pesquisa de texto completo',
 'settings_enableFullSearch_desc' => 'Ativar Pesquisa de texto completo',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Ativar Login de Visitante',
 'settings_enableGuestLogin_desc' => 'Se você quiser quiser permitir login como convidado, marque esta opção. Nota: login de convidado deve ser usado apenas em um ambiente de confiança',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Ativar Seletor de Idioma',
 'settings_enableLanguageSelector_desc' => 'Mostrar seletor para idioma de interface de usuário após login.',
 'settings_enableLargeFileUpload' => 'Ativar envio de grandes arquivos',
--- a/languages/ro_RO/lang.inc
+++ b/languages/ro_RO/lang.inc
@ -973,6 +973,10 @@ URL: [url]',
 'settings_dbUser' => 'Username',
 'settings_dbUser_desc' => 'Username-ul de acces la baza de date introdus în timpul procesului de instalare.  Nu editați câmpul decât dacă este absolut necesar (de exemplu transferul bazei de date la un nou Host).',
 'settings_dbVersion' => 'Schema bazei de date este prea veche',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Pentru a utiliza SeedDMS, trebuie să ștergeți fișierul ENABLE_INSTALL_TOOL din directorul de configurare',
 'settings_disableSelfEdit' => 'Dezactivați Auto Editarea',
 'settings_disableSelfEdit_desc' => 'Dacă este bifată, utilizatorul nu va putea să-și editeze profilul',
@ -1001,8 +1005,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Activare/dezactivare folder ierarhic în pagina \'Vizualizare Folder\'',
 'settings_enableFullSearch' => 'Activare căutare in tot textul',
 'settings_enableFullSearch_desc' => 'Activare căutare in tot textul',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Activare Login Oaspete',
 'settings_enableGuestLogin_desc' => 'Bifați această opțiune, dacă doriți ca cineva să te poată autentifica ca oaspete. Notă: autentificare oaspete trebuie utilizată numai într-un mediu de încredere',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Activare Selector Limba',
 'settings_enableLanguageSelector_desc' => 'Arată selectorul de limbă pentru interfața cu utilizatorul după ce a fost autentificat.',
 'settings_enableLargeFileUpload' => 'Activare încărcare fișier mare',
--- a/languages/ru_RU/lang.inc
+++ b/languages/ru_RU/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (1281)
+//    Translators: Admin (1285)

 $text = array(
 'accept' => 'Принять',
@ -856,15 +856,15 @@ URL: [url]',
 'search_fulltext' => 'Полнотекстовый поиск',
 'search_in' => 'Поиск',
 'search_mode_and' => 'Все слова',
-'search_mode_documents' => '',
-'search_mode_folders' => '',
+'search_mode_documents' => 'Только документы',
+'search_mode_folders' => 'Только папки',
 'search_mode_or' => 'Хотя бы одно слово',
 'search_no_results' => 'Нет документов, соответствующих запросу',
 'search_query' => 'Искать',
 'search_report' => 'Найдено документов: [doccount] и каталогов: [foldercount]',
 'search_report_fulltext' => 'Найдено документов: [doccount]',
-'search_resultmode' => '',
-'search_resultmode_both' => '',
+'search_resultmode' => 'Результат поиска',
+'search_resultmode_both' => 'Документы и папки',
 'search_results' => 'Результаты поиска',
 'search_results_access_filtered' => 'Результаты поиска могут содержать объекты к которым у вас нет доступа',
 'search_time' => 'Прошло: [time] с',
@ -941,6 +941,10 @@ URL: [url]',
 'settings_dbUser' => 'Логин',
 'settings_dbUser_desc' => 'Логин, введённый при установке. Не изменяйте без необходимости, например если БД была перемещена.',
 'settings_dbVersion' => 'Схема БД устарела',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Удалите ENABLE_INSTALL_TOOL в каталоге конфигурации, для того что бы начать использовать систему',
 'settings_disableSelfEdit' => 'Отключить собственное редактирование',
 'settings_disableSelfEdit_desc' => 'Если включено, пользователи не смогут изменять информацию о себе.',
@ -969,8 +973,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Если отключено, не будет показано дерево каталогов.',
 'settings_enableFullSearch' => 'Включить полнотекстовый поиск',
 'settings_enableFullSearch_desc' => 'Включить полнотекстовый поиск.',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Включить гостевой вход',
 'settings_enableGuestLogin_desc' => 'Чтобы разрешить гостевой вход, включите эту опцию. Гостевой вход должен использоваться только в доверенной среде.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Включить выбор языка',
 'settings_enableLanguageSelector_desc' => 'Показывать меню выбора языка пользовательского интерфейса после входа в систему. Это не влияет на выбор языка на странице входа.',
 'settings_enableLargeFileUpload' => 'Включить Java-загрузчик файлов',
--- a/languages/sk_SK/lang.inc
+++ b/languages/sk_SK/lang.inc
@ -801,6 +801,10 @@ $text = array(
 'settings_dbUser' => '',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@ -829,8 +833,12 @@ $text = array(
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => '',
 'settings_enableFullSearch_desc' => '',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => '',
 'settings_enableGuestLogin_desc' => '',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => '',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
--- a/languages/sv_SE/lang.inc
+++ b/languages/sv_SE/lang.inc
@ -936,6 +936,10 @@ URL: [url]',
 'settings_dbUser' => 'Användarnamn',
 'settings_dbUser_desc' => 'Användarnamnet för tillgång till databasen. Användarnamnet angavs under installationsprocessen.',
 'settings_dbVersion' => 'Databasschemat för gammalt',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'För att kunna använda LetoDMS måste du ta bort filen ENABLE_INSTALL_TOOL som finns i konfigurationsmappen.',
 'settings_disableSelfEdit' => 'Inaktivera själveditering',
 'settings_disableSelfEdit_desc' => 'Om utvald, kan användare inte ändra sin egen profil.',
@ -964,8 +968,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Av för att inte visa katalogernas trädstruktur',
 'settings_enableFullSearch' => 'Aktivera fulltext-sökning',
 'settings_enableFullSearch_desc' => 'Aktivera fulltext-sökning',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Tillåt gäst-inloggning',
 'settings_enableGuestLogin_desc' => 'Om du vill att alla ska kunna logga in som gäst, aktivera denna option. OBS! Gästinloggning bör endast användas i en säker omgivning',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Aktivera språkval',
 'settings_enableLanguageSelector_desc' => 'Visa språkurval i användargränssnittet efter inloggning.',
 'settings_enableLargeFileUpload' => 'Aktivera uppladdning av stora filer',
--- a/languages/tr_TR/lang.inc
+++ b/languages/tr_TR/lang.inc
@ -952,6 +952,10 @@ URL: [url]',
 'settings_dbUser' => 'Kullanıcı adı',
 'settings_dbUser_desc' => 'Kurulum sırasında veritabanına erişim için girdiğiniz veritabanı kullanıcı adı. Gerekmedikçe değiştirmeyin.',
 'settings_dbVersion' => 'Veritabanı yapısı çok eski',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'SeedDMS kullanabilmeniz için konfigürasyon (conf) dizini içindeki ENABLE_INSTALL_TOOL dosyasını silmelisiniz',
 'settings_disableSelfEdit' => 'Kendi kendine Düzenlemeyi Kapat',
 'settings_disableSelfEdit_desc' => 'Seçilirse kullanıcı kendi profil ayarlarını değiştiremez.',
@ -980,8 +984,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => '\'View Folder\' sayfasında klasör ağaç yapısını etkinleştir/devredışı bırak',
 'settings_enableFullSearch' => 'Tam metin aramayı etkinleştir',
 'settings_enableFullSearch_desc' => 'Tam metin aramayı etkinleştir',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Misafir Girişini Etkinleştir',
 'settings_enableGuestLogin_desc' => 'Herhangi birinin misafir olarak giriş yapabilmesini isterseniz bu seçeneği etkinleştirebilirsiniz. Not: Misafir girişinin sadece güvenilir ortamlar için açmanız önerilir.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Dil Seçimini Etkinleştir',
 'settings_enableLanguageSelector_desc' => 'Kullanıcının giriş yaparken dil seçimi yapabilmesi için bu seçeneği etkinleştirin.',
 'settings_enableLargeFileUpload' => 'Büyük dosya yüklemeyi etkinleştir',
--- a/languages/uk_UA/lang.inc
+++ b/languages/uk_UA/lang.inc
@ -963,6 +963,10 @@ URL: [url]',
 'settings_dbUser' => 'Логін',
 'settings_dbUser_desc' => 'Логін, введений при встановленні. Не змінюйте без потреби, наприклад, якщо БД було переміщено.',
 'settings_dbVersion' => 'Схема БД застаріла',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => 'Видаліть ENABLE_INSTALL_TOOL в каталозі конфігурації для того, щоби почати використовувати систему',
 'settings_disableSelfEdit' => 'Відключити власне редагування',
 'settings_disableSelfEdit_desc' => 'Якщо ввімкнено, користувачі не зможуть змінювати інформацію про себе.',
@ -991,8 +995,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => 'Якщо відключено, дерево каталогів не буде відображене',
 'settings_enableFullSearch' => 'Увімкнути повнотекстовий пошук',
 'settings_enableFullSearch_desc' => 'Увімкнути/вимкнути повнотекстовий пошук.',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => 'Увімкнути гостьовий вхід',
 'settings_enableGuestLogin_desc' => 'Увімкніть цю опцію для дозволу гостьового входу. Гостьовий вхід повинен використовуватися лише у довіреному середовищі.',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => 'Увімкнути вибір мови',
 'settings_enableLanguageSelector_desc' => 'Відображати меню вибору мови інтерфейсу користувача після входу в систему. Це не впливає на вибір мови на сторінці авторизації.',
 'settings_enableLargeFileUpload' => 'Увімкнути Java-завантажувач файлів',
--- a/languages/zh_CN/lang.inc
+++ b/languages/zh_CN/lang.inc
@ -807,6 +807,10 @@ URL: [url]',
 'settings_dbUser' => '',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@ -835,8 +839,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => '允许全文搜索',
 'settings_enableFullSearch_desc' => '允许全文搜索',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => '',
 'settings_enableGuestLogin_desc' => '',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => '',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
--- a/languages/zh_TW/lang.inc
+++ b/languages/zh_TW/lang.inc
@ -19,7 +19,7 @@
 //    along with this program; if not, write to the Free Software
 //    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
-//    Translators: Admin (2351)
+//    Translators: Admin (2355)

 $text = array(
 'accept' => '接受',
@ -471,7 +471,7 @@ URL: [url]',
 'keep' => '',
 'keep_doc_status' => '',
 'keywords' => '關鍵字',
-'keywords_loading' => '',
+'keywords_loading' => '請稍後,關鍵字載入中',
 'keyword_exists' => '關鍵字已存在',
 'ko_KR' => '韓語',
 'language' => '語言',
@ -520,7 +520,7 @@ URL: [url]',
 'monthly' => '',
 'month_view' => '月視圖',
 'move' => '移動',
-'move_clipboard' => '',
+'move_clipboard' => '移動剪貼簿',
 'move_document' => '移動文檔',
 'move_folder' => '移動資料夾',
 'my_account' => '我的帳戶',
@ -646,7 +646,7 @@ URL: [url]',
 'removed_revispr' => '',
 'removed_workflow_email_body' => '',
 'removed_workflow_email_subject' => '',
-'remove_marked_files' => '',
+'remove_marked_files' => '刪除勾選的檔案',
 'repaired' => '',
 'repairing_objects' => '',
 'request_workflow_action_email_body' => '',
@ -805,6 +805,10 @@ URL: [url]',
 'settings_dbUser' => '',
 'settings_dbUser_desc' => '',
 'settings_dbVersion' => '',
+'settings_defaultSearchMethod' => '',
+'settings_defaultSearchMethod_desc' => '',
+'settings_defaultSearchMethod_valdatabase' => '',
+'settings_defaultSearchMethod_valfulltext' => '',
 'settings_delete_install_folder' => '',
 'settings_disableSelfEdit' => '',
 'settings_disableSelfEdit_desc' => '',
@ -833,8 +837,12 @@ URL: [url]',
 'settings_enableFolderTree_desc' => '',
 'settings_enableFullSearch' => '',
 'settings_enableFullSearch_desc' => '',
+'settings_enableGuestAutoLogin' => '',
+'settings_enableGuestAutoLogin_desc' => '',
 'settings_enableGuestLogin' => '',
 'settings_enableGuestLogin_desc' => '',
+'settings_enableHelp' => '',
+'settings_enableHelp_desc' => '',
 'settings_enableLanguageSelector' => '',
 'settings_enableLanguageSelector_desc' => '',
 'settings_enableLargeFileUpload' => '',
@ -1197,7 +1205,7 @@ URL: [url]',
 'version_deleted_email_body' => '',
 'version_deleted_email_subject' => '',
 'version_info' => '版本資訊',
-'view' => '',
+'view' => '檢視',
 'view_online' => '線上流覽',
 'warning' => '警告',
 'wednesday' => 'Wednesday',
--- a/op/op.AttributeMgr.php
+++ b/op/op.AttributeMgr.php
@ -77,7 +77,7 @@ if ($action == "addattrdef") {
 	add_log_line("&action=addattrdef&name=".$name);
 }

-// delet attribute definition -----------------------------------------------
+// delete attribute definition -----------------------------------------------
 else if ($action == "removeattrdef") {

 	/* Check if the form data comes for a trusted request */
--- a/op/op.Settings.php
+++ b/op/op.Settings.php
@ -70,12 +70,14 @@ if ($action == "saveSettings")
  $settings->_enableUsersView = getBoolValue("enableUsersView");
  $settings->_enableFullSearch = getBoolValue("enableFullSearch");
 	$settings->_fullSearchEngine = $_POST["fullSearchEngine"];
+	$settings->_defaultSearchMethod = $_POST["defaultSearchMethod"];
  $settings->_enableClipboard = getBoolValue("enableClipboard");
  $settings->_enableDropUpload = getBoolValue("enableDropUpload");
  $settings->_enableFolderTree = getBoolValue("enableFolderTree");
  $settings->_enableRecursiveCount = getBoolValue("enableRecursiveCount");
  $settings->_maxRecursiveCount = intval($_POST["maxRecursiveCount"]);
  $settings->_enableLanguageSelector = getBoolValue("enableLanguageSelector");
+  $settings->_enableHelp = getBoolValue("enableHelp");
  $settings->_enableThemeSelector = getBoolValue("enableThemeSelector");
  $settings->_expandFolderTree = intval($_POST["expandFolderTree"]);
 	$settings->_stopWordsFile = $_POST["stopWordsFile"];
@ -103,6 +105,7 @@ if ($action == "saveSettings")

  // SETTINGS - SYSTEM - AUTHENTICATION
  $settings->_enableGuestLogin = getBoolValue("enableGuestLogin");
+  $settings->_enableGuestAutoLogin = getBoolValue("enableGuestAutoLogin");
  $settings->_restricted = getBoolValue("restricted");
  $settings->_enableUserImage = getBoolValue("enableUserImage");
  $settings->_disableSelfEdit = getBoolValue("disableSelfEdit");
--- a/out/out.DefaultKeywords.php
+++ b/out/out.DefaultKeywords.php
@ -40,7 +40,7 @@ $categories = $dms->getAllUserKeywordCategories($user->getID());
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'categories'=>$categories, 'selcategoryid'=>$selcategoryid));
 if($view) {
-	$view->show();
+	$view($_GET);
 	exit;
 }

--- a/out/out.EditUserData.php
+++ b/out/out.EditUserData.php
@ -38,7 +38,7 @@ if (!$user->isAdmin() && ($settings->_disableSelfEdit)) {
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'enableuserimage'=>$settings->_enableUserImage, 'enablelanguageselector'=>$settings->_enableLanguageSelector, 'enablethemeselector'=>$settings->_enableThemeSelector, 'passwordstrength'=>$settings->_passwordStrength, 'httproot'=>$settings->_httpRoot));
 if($view) {
-	$view->show();
+	$view($_GET);
 	exit;
 }

--- a/out/out.ManageNotify.php
+++ b/out/out.ManageNotify.php
@ -36,7 +36,7 @@ if ($user->isGuest()) {
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'cachedir'=>$settings->_cacheDir, 'previewWidthList'=>$settings->_previewWidthList));
 if($view) {
-	$view->show();
+	$view($_GET);
 	exit;
 }

--- a/out/out.Search.php
+++ b/out/out.Search.php
@ -61,7 +61,7 @@ if (isset($_GET["navBar"])) {
 	*/
 }

-if(isset($_GET["fullsearch"]) && $_GET["fullsearch"]) {
+if((isset($_GET["fullsearch"]) && $_GET["fullsearch"] || $settings->_defaultSearchMethod == 'fulltext') && $settings->_enableFullSearch) {
 // Search in Fulltext {{{
 	if (isset($_GET["query"]) && is_string($_GET["query"])) {
 		$query = $_GET["query"];
@ -409,7 +409,7 @@ if(count($entries) == 1) {
 	if($view) {
 		$view->setParam('totaldocs', $dcount /*resArr['totalDocs']*/);
 		$view->setParam('totalfolders', $fcount /*resArr['totalFolders']*/);
-		$view->setParam('fullsearch', (isset($_GET["fullsearch"]) && $_GET["fullsearch"]) ? true : false);
+		$view->setParam('fullsearch', ((isset($_GET["fullsearch"]) && $_GET["fullsearch"] || $settings->_defaultSearchMethod == 'fulltext') && $settings->_enableFullSearch) ? true : false);
 		$view->setParam('mode', isset($mode) ? $mode : '');
 		$view->setParam('resultmode', isset($resultmode) ? $resultmode : '');
 		$view->setParam('searchin', isset($searchin) ? $searchin : array());
--- a/out/out.Settings.php
+++ b/out/out.Settings.php
@ -35,7 +35,7 @@ if(!trim($settings->_encryptionKey))
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'settings'=>$settings, 'currenttab'=>(isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : '')));
 if($view) {
-	$view->show();
+	$view($_GET);
 	exit;
 }

--- a/out/out.SubstituteUser.php
+++ b/out/out.SubstituteUser.php
@ -38,7 +38,7 @@ if($view) {
 	$view->setParam('dms', $dms);
 	$view->setParam('user', $user);
 	$view->setParam('allusers', $allUsers);
-	$view->show();
+	$view($_GET);
 	exit;
 }

--- a/out/out.UserList.php
+++ b/out/out.UserList.php
@ -34,7 +34,7 @@ $allUsers = $dms->getAllUsers($settings->_sortUsersInList);
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 $view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'allusers'=>$allUsers, 'httproot'=>$settings->_httpRoot, 'quota'=>$settings->_quota, 'pwdexpiration'=>$settings->_passwordExpiration));
 if($view) {
-	$view->show();
+	$view($_GET);
 	exit;
 }

--- a/out/out.UsrMgr.php
+++ b/out/out.UsrMgr.php
@ -47,7 +47,7 @@ if(isset($_GET['userid']) && $_GET['userid']) {
 }

 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota, 'strictformcheck'=>$settings->_strictFormCheck));
 if($view) {
 	$view($_GET);
 }
--- a/styles/bootstrap/application.js
+++ b/styles/bootstrap/application.js
@ -54,7 +54,7 @@ $(document).ready( function() {
 		 * actually provided to update the input field, but here we use
 		 * it to set the document location. */
 		updater: function (item) {
-			document.location = "../op/op.Search.php?query=" + encodeURIComponent(item.substring(1));
+			document.location = "../out/out.Search.php?query=" + encodeURIComponent(item.substring(1));
 			return item;
 		},
 		/* Set a matcher that allows any returned value */
--- a/utils/adddoc.php
+++ b/utils/adddoc.php
@ -3,7 +3,7 @@ include("../inc/inc.ClassSettings.php");

 function usage() { /* {{{ */
 	echo "Usage:\n";
-	echo "  seeddms-adddoc [--config <file>] [-c <comment>] [-k <keywords>] [-s <number>] [-n <name>] [-V <version>] [-s <sequence>] [-t <mimetype>] [-h] [-v] -F <folder id> -f <filename>\n";
+	echo "  seeddms-adddoc [--config <file>] [-c <comment>] [-k <keywords>] [-s <number>] [-n <name>] [-V <version>] [-s <sequence>] [-t <mimetype>] [-a <attribute=value>] [-h] [-v] -F <folder id> -f <filename>\n";
 	echo "\n";
 	echo "Description:\n";
 	echo "  This program uploads a file into a folder of SeedDMS.\n";
@ -25,10 +25,12 @@ function usage() { /* {{{ */
 	echo "  -s <sequence>: set sequence of file\n";
 	echo "  -t <mimetype> set mimetype of file manually. Do not do that unless you know\n";
 	echo "      what you do. If not set, the mimetype will be determined automatically.\n";
+	echo "  -a <attribute=value>: Set a document attribute; can occur multiple times.\n";
+	echo "  -A <attribute=value>: Set a version attribute; can occur multiple times.\n";
 } /* }}} */

 $version = "0.0.1";
-$shortoptions = "F:c:C:k:K:s:V:u:f:n:t:hv";
+$shortoptions = "F:c:C:k:K:s:V:u:f:n:t:a:A:hv";
 $longoptions = array('help', 'version', 'config:');
 if(false === ($options = getopt($shortoptions, $longoptions))) {
 	usage();
@ -141,6 +143,59 @@ if(!$dms->checkVersion()) {
 	exit;
 }

+/* Parse document attributes.  */
+$document_attributes = array();
+if (isset($options['a'])) {
+	$docattr = array();
+	if (is_array($options['a'])) {
+		$docattr = $options['a'];
+	} else {
+		$docattr = array($options['a']);
+	}
+
+	foreach ($docattr as $thisAttribute) {
+		$attrKey = strstr($thisAttribute, '=', true);
+		$attrVal = substr(strstr($thisAttribute, '='), 1);
+		if (empty($attrKey) || empty($attrVal)) {
+			echo "Document attribute $thisAttribute not understood\n";
+			exit(1);
+		}
+		$attrdef = $dms->getAttributeDefinitionByName($attrKey);
+		if (!$attrdef) {
+			echo "Document attribute $attrKey unknown\n";
+			exit(1);
+		}
+		$document_attributes[$attrdef->getID()] = $attrVal;
+	}
+}
+
+/* Parse version attributes.  */
+$version_attributes = array();
+if (isset($options['A'])) {
+	$verattr = array();
+	if (is_array($options['A'])) {
+		$verattr = $options['A'];
+	} else {
+		$verattr = array($options['A']);
+	}
+
+	foreach ($verattr as $thisAttribute) {
+		$attrKey = strstr($thisAttribute, '=', true);
+		$attrVal = substr(strstr($thisAttribute, '='), 1);
+		if (empty($attrKey) || empty($attrVal)) {
+			echo "Version attribute $thisAttribute not understood\n";
+			exit(1);
+		}
+		$attrdef = $dms->getAttributeDefinitionByName($attrKey);
+		if (!$attrdef) {
+			echo "Version attribute $attrKey unknown\n";
+			exit(1);
+		}
+		$version_attributes[$attrdef->getID()] = $attrVal;
+	}
+}
+
+
 $dms->setRootFolderID($settings->_rootFolderID);
 $dms->setMaxDirID($settings->_maxDirID);
 $dms->setEnableConverting($settings->_enableConverting);
@ -201,7 +256,8 @@ $approvers = array();
 $res = $folder->addDocument($name, $comment, $expires, $user, $keywords,
                            $categories, $filetmp, basename($filename),
                            $filetype, $mimetype, $sequence, $reviewers,
-                            $approvers, $reqversion, $version_comment);
+                            $approvers, $reqversion, $version_comment,
+                            $document_attributes, $version_attributes);

 if (is_bool($res) && !$res) {
 	echo "Could not add document to folder\n";
--- a/utils/seeddms-adddoc
+++ b/utils/seeddms-adddoc
@ -1,6 +1,8 @@
-#!/bin/sh
-if [ -z ${SEEDDMS_HOME+x} ]; then
-	echo "Please set SEEDDMS_HOME before running this script";
-	exit 1;
+#!/usr/bin/env bash
+
+if [ -z "${SEEDDMS_HOME}" ]; then
+	echo 'Please set $SEEDDMS_HOME before running this script'
+	exit 1
 fi
-php -f ${SEEDDMS_HOME}/utils/adddoc.php -- $*
+
+exec php -f "${SEEDDMS_HOME}/utils/adddoc.php" -- "${@}"
--- a/utils/seeddms-createfolder
+++ b/utils/seeddms-createfolder
@ -1,6 +1,8 @@
-#!/bin/sh
-if [ -z ${SEEDDMS_HOME+x} ]; then
-	echo "Please set SEEDDMS_HOME before running this script";
-	exit 1;
+#!/usr/bin/env bash
+
+if [ -z "${SEEDDMS_HOME}" ]; then
+	echo 'Please set $SEEDDMS_HOME before running this script'
+	exit 1
 fi
-php -f ${SEEDDMS_HOME}/utils/createfolder.php -- $*
+
+exec php -f "${SEEDDMS_HOME}/utils/createfolder.php" -- "${@}"
--- a/utils/seeddms-indexer
+++ b/utils/seeddms-indexer
@ -1,6 +1,8 @@
-#!/bin/sh
-if [ -z ${SEEDDMS_HOME+x} ]; then
-	echo "Please set SEEDDMS_HOME before running this script";
-	exit 1;
+#!/usr/bin/env bash
+
+if [ -z "${SEEDDMS_HOME}" ]; then
+	echo 'Please set $SEEDDMS_HOME before running this script'
+	exit 1
 fi
-php -f ${SEEDDMS_HOME}/utils/indexer.php -- $*
+
+exec php -f "${SEEDDMS_HOME}/utils/indexer.php" -- "${@}"
--- a/utils/seeddms-xmldump
+++ b/utils/seeddms-xmldump
@ -1,6 +1,8 @@
-#!/bin/sh
-if [ -z ${SEEDDMS_HOME+x} ]; then
-	echo "Please set SEEDDMS_HOME before running this script";
-	exit 1;
+#!/usr/bin/env bash
+
+if [ -z "${SEEDDMS_HOME}" ]; then
+	echo 'Please set $SEEDDMS_HOME before running this script'
+	exit 1
 fi
-php -f ${SEEDDMS_HOME}/utils/xmldump -- $*
+
+exec php -f "${SEEDDMS_HOME}/utils/xmldump" -- "${@}"
--- a/views/bootstrap/class.BackupTools.php
+++ b/views/bootstrap/class.BackupTools.php
@ -32,7 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {

 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');

 		$this->printFolderChooserJs("form1");
 		$this->printFolderChooserJs("form2");
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@ -304,8 +304,10 @@ $(document).ready(function () {
 	//		echo "    <li><a href=\"../out/out.SearchForm.php?folderid=".$this->params['rootfolderid']."\">".getMLText("search")."</a></li>\n";
 			if ($this->params['enablecalendar']) echo "    <li><a href=\"../out/out.Calendar.php?mode=".$this->params['calendardefaultview']."\">".getMLText("calendar")."</a></li>\n";
 			if ($this->params['user']->isAdmin()) echo "    <li><a href=\"../out/out.AdminTools.php\">".getMLText("admin_tools")."</a></li>\n";
+			if($this->params['enablehelp']) {
 			$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
 			echo "    <li><a href=\"../out/out.Help.php?context=".$tmp[1]."\">".getMLText("help")."</a></li>\n";
+			}
 			echo "   </ul>\n";
 			echo "     <form action=\"../out/out.Search.php\" class=\"form-inline navbar-search pull-left\" autocomplete=\"off\">";
 			if ($folder!=null && is_object($folder) && !strcasecmp(get_class($folder), $dms->getClassname('folder'))) {
@ -317,9 +319,9 @@ $(document).ready(function () {
 			echo "      <input type=\"hidden\" name=\"searchin[]\" value=\"3\" />";
 			echo "      <input type=\"hidden\" name=\"searchin[]\" value=\"4\" />";
 			echo "      <input name=\"query\" class=\"search-query\" id=\"searchfield\" data-provide=\"typeahead\" type=\"text\" style=\"width: 150px;\" placeholder=\"".getMLText("search")."\"/>";
-			if($this->params['enablefullsearch']) {
-				echo "      <label class=\"checkbox\" style=\"color: #999999;\"><input type=\"checkbox\" name=\"fullsearch\" value=\"1\" title=\"".getMLText('fullsearch_hint')."\"/> ".getMLText('fullsearch')."</label>";
-			}
+//			if($this->params['enablefullsearch']) {
+//				echo "      <label class=\"checkbox\" style=\"color: #999999;\"><input type=\"checkbox\" name=\"fullsearch\" value=\"1\" title=\"".getMLText('fullsearch_hint')."\"/> ".getMLText('fullsearch')."</label>";
+//			}
 	//		echo "      <input type=\"submit\" value=\"".getMLText("search")."\" id=\"searchButton\" class=\"btn\"/>";
 			echo "</form>\n";
 			echo "    </div>\n";
--- a/views/bootstrap/class.Charts.php
+++ b/views/bootstrap/class.Charts.php
@ -35,7 +35,7 @@ class SeedDMS_View_Charts extends SeedDMS_Bootstrap_Style {
 		$data = $this->params['data'];
 		$type = $this->params['type'];

-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');

 ?>
 	$("<div id='tooltip'></div>").css({
--- a/views/bootstrap/class.DefaultKeywords.php
+++ b/views/bootstrap/class.DefaultKeywords.php
@ -31,6 +31,187 @@ require_once("class.Bootstrap.php");
 */
 class SeedDMS_View_DefaultKeywords extends SeedDMS_Bootstrap_Style {

+	function js() { /* {{{ */
+?>
+function checkForm()
+{
+	msg = new Array();
+
+	if($("#form .name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
+	if (msg != "")
+	{
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+
+function checkFormName()
+{
+	msg = new Array();
+
+	if($(".formn .name").val() == "") msg.push("<?php printMLText("js_no_name");?>");
+	if (msg != "")
+	{
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+
+function checkKeywordForm()
+{
+	msg = new Array();
+
+	if($(".formk .keywords").val() == "") msg.push("<?php printMLText("js_no_name");?>");
+	if (msg != "")
+	{
+  	noty({
+  		text: msg.join('<br />'),
+  		type: 'error',
+      dismissQueue: true,
+  		layout: 'topRight',
+  		theme: 'defaultTheme',
+			_timeout: 1500,
+  	});
+		return false;
+	}
+	else
+		return true;
+}
+
+$(document).ready( function() {
+	$('body').on('submit', '#form', function(ev){
+		if(checkForm()) return;
+		event.preventDefault();
+	});
+	$('body').on('submit', '.formk', function(ev){
+		if(checkKeywordForm()) return;
+		event.preventDefault();
+	});
+	$('body').on('submit', '.formn', function(ev){
+		if(checkFormName()) return;
+		event.preventDefault();
+	});
+	$( "#selector" ).change(function() {
+		$('div.ajax').trigger('update', {categoryid: $(this).val()});
+	});
+});
+<?php
+	} /* }}} */
+
+	function form() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$category = $dms->getKeywordCategory($this->params['selcategoryid']);
+
+		$this->showKeywordForm($category, $user);
+	} /* }}} */
+
+	function showKeywordForm($category, $user) { /* {{{ */
+		if(!$category) {
+?>
+			
+			<form class="form-inline" action="../op/op.DefaultKeywords.php" method="post" id="form">
+  		<?php echo createHiddenFieldWithKey('addcategory'); ?>
+			<input type="hidden" name="action" value="addcategory">
+			<?php printMLText("name");?>: <input type="text" class="name" name="name">
+			<input type="submit" class="btn" value="<?php printMLText("new_default_keyword_category"); ?>">
+			</form>
+<?php
+		} else {
+			$owner = $category->getOwner();
+			if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) return;
+?>
+			<table class="table-condensed">
+				<tr>
+					<td></td>
+					<td>
+						<form action="../op/op.DefaultKeywords.php" method="post">
+  						<?php echo createHiddenFieldWithKey('removecategory'); ?>
+							<input type="Hidden" name="action" value="removecategory">
+							<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
+							<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
+						</form>
+					</td>
+				</tr>
+				<tr>
+					<td><?php echo getMLText("name")?>:</td>
+					<td>
+						<form class="form-inline formn" action="../op/op.DefaultKeywords.php" method="post">
+  						<?php echo createHiddenFieldWithKey('editcategory'); ?>
+							<input type="hidden" name="action" value="editcategory">
+							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
+							<input name="name" class="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
+							<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
+						</form>
+					</td>
+				</tr>
+				<tr>
+					<td><?php echo getMLText("default_keywords")?>:</td>
+					<td>
+						<?php
+							$lists = $category->getKeywordLists();
+							if (count($lists) == 0)
+								print getMLText("no_default_keywords");
+							else
+								foreach ($lists as $list) {
+?>
+									<form class="form-inline formk" style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php">
+  								<?php echo createHiddenFieldWithKey('editkeywords'); ?>
+									<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
+									<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
+									<input type="Hidden" name="action" value="editkeywords">
+									<input name="keywords" class="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
+									<button class="btn" title="<?php echo getMLText("save")?>"><i class="icon-save"></i> <?php echo getMLText("save")?></button>
+									<!--	 <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
+									</form>
+									<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
+  								<?php echo createHiddenFieldWithKey('removekeywords'); ?>
+									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
+									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
+									<input type="hidden" name="action" value="removekeywords">
+									<button class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php echo getMLText("delete")?></button>
+									</form>
+									<br>
+						<?php }  ?>
+					</td>
+				</tr>
+				<tr>
+					<td></td>
+					<td>
+					  <form class="form-inline formk" action="../op/op.DefaultKeywords.php" method="post">
+  				  <?php echo createHiddenFieldWithKey('newkeywords'); ?>
+						<input type="Hidden" name="action" value="newkeywords">
+						<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
+						<input type="text" class="keywords" name="keywords">
+					
+					  <input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
+						</form>
+					</td>
+				</tr>
+
+			</table>
+<?php
+		}
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@ -42,75 +223,13 @@ class SeedDMS_View_DefaultKeywords extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("admin_tools"), "admin_tools");

-?>
-<script language="JavaScript">
-
-function checkForm(num)
-{
-	msg = new Array();
-	eval("var formObj = document.form" + num + ";");
-
-	if (formObj.name.value == "") msg.push("<?php printMLText("js_no_name");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-
-function checkKeywordForm(num)
-{
-	msg = new Array();
-	eval("var formObj = document.formk" + num + ";");
-
-	if (formObj.keywords.value == "") msg.push("<?php printMLText("js_no_name");?>");
-	if (msg != "")
-	{
-  	noty({
-  		text: msg.join('<br />'),
-  		type: 'error',
-      dismissQueue: true,
-  		layout: 'topRight',
-  		theme: 'defaultTheme',
-			_timeout: 1500,
-  	});
-		return false;
-	}
-	else
-		return true;
-}
-
-obj = -1;
-function showKeywords(selectObj) {
-	if (obj != -1)
-		obj.style.display = "none";
-
-	id = selectObj.options[selectObj.selectedIndex].value;
-	if (id == -1)
-		return;
-
-	obj = document.getElementById("keywords" + id);
-	obj.style.display = "";
-}
-</script>
-<?php
-
 		$this->contentHeading(getMLText("global_default_keywords"));
 ?>
 <div class="row-fluid">
 <div class="span4">
 <div class="well">
 	<?php echo getMLText("selection")?>:
-	<select onchange="showKeywords(this)" id="selector" class="span9">
+	<select id="selector" class="span9">
 		<option value="-1"><?php echo getMLText("choose_category")?>
 		<option value="0"><?php echo getMLText("new_default_keyword_category")?>
 <?php
@ -132,108 +251,11 @@ function showKeywords(selectObj) {
 </div>

 <div class="span8">
-<div class="well">
-
-<table class="table-condensed"><tr>
-		<td id="keywords0" style="display : none;">	
-			<form class="form-inline" action="../op/op.DefaultKeywords.php" method="post" name="form0" onsubmit="return checkForm('0');">
-  		<?php echo createHiddenFieldWithKey('addcategory'); ?>
-			<input type="hidden" name="action" value="addcategory">
-			<?php printMLText("name");?>: <input type="text" name="name">
-			<input type="submit" class="btn" value="<?php printMLText("new_default_keyword_category"); ?>">
-			</form>
-		</td>
-<?php
-		foreach ($categories as $category) {
-
-			$owner = $category->getOwner();
-			if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) continue;
-
-			print "<td id=\"keywords".$category->getID()."\" style=\"display : none;\">";	
-?>
-			<table class="table-condensed">
-				<tr>
-					<td></td>
-					<td>
-						<form action="../op/op.DefaultKeywords.php" method="post">
-  						<?php echo createHiddenFieldWithKey('removecategory'); ?>
-							<input type="Hidden" name="action" value="removecategory">
-							<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-							<button type="submit" class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php printMLText("rm_default_keyword_category");?></button>
-						</form>
-					</td>
-				</tr>
-				<tr>
-					<td><?php echo getMLText("name")?>:</td>
-					<td>
-						<form class="form-inline" action="../op/op.DefaultKeywords.php" method="post" name="form<?php echo $category->getID()?>" onsubmit="return checkForm('<?php echo $category->getID()?>');">
-  						<?php echo createHiddenFieldWithKey('editcategory'); ?>
-							<input type="hidden" name="action" value="editcategory">
-							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-							<input name="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">
-							<button type="submit" class="btn"><i class="icon-save"></i> <?php printMLText("save");?></button>
-						</form>
-					</td>
-				</tr>
-				<tr>
-					<td><?php echo getMLText("default_keywords")?>:</td>
-					<td>
-						<?php
-							$lists = $category->getKeywordLists();
-							if (count($lists) == 0)
-								print getMLText("no_default_keywords");
-							else
-								foreach ($lists as $list) {
-?>
-									<form class="form-inline" style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" name="formk<?php echo $list['id']?>" onsubmit="return checkKeywordForm('<?php echo $list['id']?>');">
-  								<?php echo createHiddenFieldWithKey('editkeywords'); ?>
-									<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-									<input type="Hidden" name="keywordsid" value="<?php echo $list["id"]?>">
-									<input type="Hidden" name="action" value="editkeywords">
-									<input name="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
-									<button class="btn" title="<?php echo getMLText("save")?>"><i class="icon-save"></i> <?php echo getMLText("save")?></button>
-									<!--	 <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
-									</form>
-									<form style="display: inline-block;" method="post" action="../op/op.DefaultKeywords.php" >
-  								<?php echo createHiddenFieldWithKey('removekeywords'); ?>
-									<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
-									<input type="hidden" name="keywordsid" value="<?php echo $list["id"]?>">
-									<input type="hidden" name="action" value="removekeywords">
-									<button class="btn" title="<?php echo getMLText("delete")?>"><i class="icon-remove"></i> <?php echo getMLText("delete")?></button>
-									</form>
-									<br>
-						<?php }  ?>
-					</td>
-				</tr>
-				<tr>
-					<td></td>
-					<td>
-					  <form class="form-inline" action="../op/op.DefaultKeywords.php" method="post">
-  				  <?php echo createHiddenFieldWithKey('newkeywords'); ?>
-						<input type="Hidden" name="action" value="newkeywords">
-						<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<input type="text" name="keywords">
-					
-					  <input type="submit" class="btn" value="<?php printMLText("new_default_keywords");?>">
-						</form>
-					</td>
-				</tr>
-
-			</table>
-		</td>
-<?php } ?>
-	</tr></table>
+	<div class="well">
+		<div class="ajax" data-view="DefaultKeywords" data-action="form" <?php echo ($selcategoryid ? "data-query=\"categoryid=".$selcategoryid."\"" : "") ?>></div>
+		</div>
+	</div>
 </div>
-</div>
-</div>
-
-<script language="JavaScript">
-
-sel = document.getElementById("selector");
-sel.selectedIndex=<?php print $selected ?>;
-showKeywords(sel);
-
-</script>

 <?php
 		$this->htmlEndPage();
--- a/views/bootstrap/class.DocumentAccess.php
+++ b/views/bootstrap/class.DocumentAccess.php
@ -41,7 +41,7 @@ class SeedDMS_View_DocumentAccess extends SeedDMS_Bootstrap_Style {
 	} /* }}} */

 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 ?>
 function checkForm()
 {
--- a/views/bootstrap/class.DocumentChooser.php
+++ b/views/bootstrap/class.DocumentChooser.php
@ -35,7 +35,7 @@ class SeedDMS_View_DocumentChooser extends SeedDMS_Bootstrap_Style {
 		$folder = $this->params['folder'];
 		$form = $this->params['form'];

-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 		$this->printNewTreeNavigationJs($folder->getID(), M_READ, 1, $form);
 	} /* }}} */

--- a/views/bootstrap/class.DocumentNotify.php
+++ b/views/bootstrap/class.DocumentNotify.php
@ -32,7 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_DocumentNotify extends SeedDMS_Bootstrap_Style {

 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 ?>
 function checkForm()
 {
--- a/views/bootstrap/class.EditUserData.php
+++ b/views/bootstrap/class.EditUserData.php
@ -31,30 +31,14 @@ require_once("class.Bootstrap.php");
 */
 class SeedDMS_View_EditUserData extends SeedDMS_Bootstrap_Style {

-	function show() { /* {{{ */
-		$dms = $this->params['dms'];
-		$user = $this->params['user'];
-		$enableuserimage = $this->params['enableuserimage'];
-		$enablelanguageselector = $this->params['enablelanguageselector'];
-		$enablethemeselector = $this->params['enablethemeselector'];
-		$passwordstrength = $this->params['passwordstrength'];
-		$httproot = $this->params['httproot'];
-
-		$this->htmlStartPage(getMLText("edit_user_details"));
-		$this->globalNavigation();
-		$this->contentStart();
-		$this->pageNavigation(getMLText("my_account"), "my_account");
-
+	function js() { /* {{{ */
 ?>
-
-<script language="JavaScript">
-
 function checkForm()
 {
 	msg = new Array();
-	if (document.form1.pwd.value != document.form1.pwdconf.value) msg.push("<?php printMLText("js_pwd_not_conf");?>");
-	if (document.form1.fullname.value == "") msg.push("<?php printMLText("js_no_name");?>");
-	if (document.form1.email.value == "") msg.push("<?php printMLText("js_no_email");?>");
+	if ($("#pwd").val() != $("#pwdconf").val()) msg.push("<?php printMLText("js_pwd_not_conf");?>");
+	if ($("#fullname").val() == "") msg.push("<?php printMLText("js_no_name");?>");
+	if ($("#email").val() == "") msg.push("<?php printMLText("js_no_email");?>");
 //	if (document.form1.comment.value == "") msg.push("<?php printMLText("js_no_comment");?>");
 	if (msg != "") {
  	noty({
@ -70,13 +54,34 @@ function checkForm()
 	else
 		return true;
 }
-</script>

+$(document).ready( function() {
+	$('body').on('submit', '#form', function(ev){
+		if(checkForm()) return;
+		event.preventDefault();
+	});
+});
 <?php
+	} /* }}} */
+
+	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
+		$enableuserimage = $this->params['enableuserimage'];
+		$enablelanguageselector = $this->params['enablelanguageselector'];
+		$enablethemeselector = $this->params['enablethemeselector'];
+		$passwordstrength = $this->params['passwordstrength'];
+		$httproot = $this->params['httproot'];
+
+		$this->htmlStartPage(getMLText("edit_user_details"));
+		$this->globalNavigation();
+		$this->contentStart();
+		$this->pageNavigation(getMLText("my_account"), "my_account");
+
 		$this->contentHeading(getMLText("edit_user_details"));
 		$this->contentContainerStart();
 ?>
-<form action="../op/op.EditUserData.php" enctype="multipart/form-data" method="post" name="form1" onsubmit="return checkForm();">
+<form action="../op/op.EditUserData.php" enctype="multipart/form-data" method="post" id="form">
 <table class="table-condensed">
 	<tr>
 		<td><?php printMLText("current_password");?>:</td>
@ -84,7 +89,7 @@ function checkForm()
 	</tr>
 	<tr>
 		<td><?php printMLText("new_password");?>:</td>
-		<td><input class="pwd" type="password" rel="strengthbar" name="pwd" size="30"></td>
+		<td><input class="pwd" type="password" rel="strengthbar" id="pwd" name="pwd" size="30"></td>
 	</tr>
 <?php
 	if($passwordstrength) {
@ -100,15 +105,15 @@ function checkForm()
 ?>
 	<tr>
 		<td><?php printMLText("confirm_pwd");?>:</td>
-		<td><input id="pwdconf" type="Password" name="pwdconf" size="30"></td>
+		<td><input id="pwdconf" type="Password" id="pwdconf" name="pwdconf" size="30"></td>
 	</tr>
 	<tr>
 		<td><?php printMLText("name");?>:</td>
-		<td><input type="text" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30"></td>
+		<td><input type="text" id="fullname" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30"></td>
 	</tr>
 	<tr>
 		<td><?php printMLText("email");?>:</td>
-		<td><input type="text" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30"></td>
+		<td><input type="text" id="email" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30"></td>
 	</tr>
 	<tr>
 		<td><?php printMLText("comment");?>:</td>
--- a/views/bootstrap/class.FolderChooser.php
+++ b/views/bootstrap/class.FolderChooser.php
@ -36,7 +36,7 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Bootstrap_Style {
 		$form = $this->params['form'];
 		$mode = $this->params['mode'];

-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 		$this->printNewTreeNavigationJs($rootfolderid, $mode, 0, $form);
 	} /* }}} */

--- a/views/bootstrap/class.KeywordChooser.php
+++ b/views/bootstrap/class.KeywordChooser.php
@ -33,7 +33,7 @@ class SeedDMS_View_KeywordChooser extends SeedDMS_Bootstrap_Style {

 	function js() { /* {{{ */
 		$form = $this->params['form'];
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 ?>
 var targetObj = document.<?php echo $form ?>.keywords;
 var myTA;
--- a/views/bootstrap/class.LogManagement.php
+++ b/views/bootstrap/class.LogManagement.php
@ -70,7 +70,7 @@ class SeedDMS_View_LogManagement extends SeedDMS_Bootstrap_Style {
 	} /* }}} */

 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 ?>
 $(document).ready( function() {
 	$('i.icon-arrow-up').on('click', function(e) {
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@ -148,6 +148,13 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		}
 	} /* }}} */

+	function js() { /* {{{ */
+		header('Content-Type: application/javascript');
+
+		$this->printFolderChooserJs("form1");
+		$this->printDocumentChooserJs("form2");
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$this->dms = $this->params['dms'];
 		$this->user = $this->params['user'];
@ -167,7 +174,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {

 		print "<form method=\"post\" action=\"../op/op.ManageNotify.php?type=folder&action=add\" name=\"form1\">";
 		$this->contentSubHeading(getMLText("choose_target_folder"));
-		$this->printFolderChooser("form1",M_READ);
+		$this->printFolderChooserHtml("form1",M_READ);
 		print "<label class=\"checkbox\">";
 		print "<input type=\"checkbox\" name=\"recursefolder\" value=\"1\">";
 		print getMLText("include_subdirectories");
@ -188,7 +195,7 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 		$this->contentSubHeading(getMLText("choose_target_document"));
 		/* 'form1' must be passed to printDocumentChooser() because the typeahead
 		 * function is currently hardcoded on this value */
-		$this->printDocumentChooser("form2");
+		$this->printDocumentChooserHtml("form2");
 		print "<br /><button type='submit' class='btn'><i class=\"icon-plus\"></i> ".getMLText("add")."</button>";
 		print "</form>";

--- a/views/bootstrap/class.MoveDocument.php
+++ b/views/bootstrap/class.MoveDocument.php
@ -32,7 +32,7 @@ require_once("class.Bootstrap.php");
 class SeedDMS_View_MoveDocument extends SeedDMS_Bootstrap_Style {

 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');

 		$this->printFolderChooserJs("form1");
 	} /* }}} */
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@ -48,7 +48,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 	} /* }}} */

 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');

 		$this->printFolderChooserJs("form1");
 		$this->printDeleteFolderButtonJs();
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@ -49,6 +49,16 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 		}
 	} /* }}} */

+	function js() { /* {{{ */
+?>
+		$(document).ready( function() {
+			$('#settingstab li a').click(function(event) {
+				$('#currenttab').val($(event.currentTarget).data('target').substring(1));
+			});
+		});
+<?php
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@ -62,15 +72,6 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 		$this->contentHeading(getMLText("settings"));

 ?>
-
-		<script language="JavaScript">
-		$(document).ready( function() {
-			$('#settingstab li a').click(function(event) {
-				$('#currenttab').val($(event.currentTarget).data('target').substring(1));
-			});
-		}); 
-		</script>
-
  <form action="../op/op.Settings.php" method="post" enctype="multipart/form-data" name="form0" >
  <input type="hidden" name="action" value="saveSettings" />
 	<input type="hidden" id="currenttab" name="currenttab" value="<?php echo $currenttab ? $currenttab : 'site'; ?>" />
@ -189,6 +190,15 @@ if(!is_writeable($settings->_configFilePath)) {
 					</select>
 				</td>
      </tr>
+      <tr title="<?php printMLText("settings_defaultSearchMethod_desc");?>">
+        <td><?php printMLText("settings_defaultSearchMethod");?>:</td>
+				<td>
+				  <select name="defaultSearchMethod">
+					  <option value="database" <?php if ($settings->_defaultSearchMethod=='database') echo "selected" ?>><?php printMLText("settings_defaultSearchMethod_valdatabase");?></option>
+						<option value="fulltext" <?php if ($settings->_defaultSearchMethod=='fulltext') echo "selected" ?>><?php printMLText("settings_defaultSearchMethod_valfulltext");?></option>
+					</select>
+				</td>
+      </tr>
      <tr title="<?php printMLText("settings_stopWordsFile_desc");?>">
        <td><?php printMLText("settings_stopWordsFile");?>:</td>
        <td><?php $this->showTextField("stopWordsFile", $settings->_stopWordsFile); ?></td>
@ -226,6 +236,10 @@ if(!is_writeable($settings->_configFilePath)) {
        <td><?php printMLText("settings_enableLanguageSelector");?>:</td>
        <td><input name="enableLanguageSelector" type="checkbox" <?php if ($settings->_enableLanguageSelector) echo "checked" ?> /></td>
      </tr>
+      <tr title="<?php printMLText("settings_enableHelp_desc");?>">
+        <td><?php printMLText("settings_enableHelp");?>:</td>
+        <td><input name="enableHelp" type="checkbox" <?php if ($settings->_enableHelp) echo "checked" ?> /></td>
+      </tr>
      <tr title="<?php printMLText("settings_enableThemeSelector_desc");?>">
        <td><?php printMLText("settings_enableThemeSelector");?>:</td>
        <td><input name="enableThemeSelector" type="checkbox" <?php if ($settings->_enableThemeSelector) echo "checked" ?> /></td>
@ -346,6 +360,10 @@ if(!is_writeable($settings->_configFilePath)) {
        <td><?php printMLText("settings_enableGuestLogin");?>:</td>
        <td><input name="enableGuestLogin" type="checkbox" <?php if ($settings->_enableGuestLogin) echo "checked" ?> /></td>
      </tr>
+      <tr title="<?php printMLText("settings_enableGuestAutoLogin_desc");?>">
+        <td><?php printMLText("settings_enableGuestAutoLogin");?>:</td>
+        <td><input name="enableGuestAutoLogin" type="checkbox" <?php if ($settings->_enableGuestAutoLogin) echo "checked" ?> /></td>
+      </tr>
      <tr title="<?php printMLText("settings_restricted_desc");?>">
        <td><?php printMLText("settings_restricted");?>:</td>
        <td><input name="restricted" type="checkbox" <?php if ($settings->_restricted) echo "checked" ?> /></td>
--- a/views/bootstrap/class.SubstituteUser.php
+++ b/views/bootstrap/class.SubstituteUser.php
@ -31,6 +31,9 @@ require_once("class.Bootstrap.php");
 */
 class SeedDMS_View_SubstituteUser extends SeedDMS_Bootstrap_Style {

+	function js() { /* {{{ */
+	} /* }}} */
+
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
--- a/views/bootstrap/class.Timeline.php
+++ b/views/bootstrap/class.Timeline.php
@ -121,12 +121,12 @@ class SeedDMS_View_Timeline extends SeedDMS_Bootstrap_Style {
 				);
 			}
 		}
-		header('Content-Type: application/json');
+		header('Content-Type: application/json'),
 		echo json_encode($jsondata);
 	} /* }}} */

 	function js() { /* {{{ */
-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 ?>
 $(document).ready(function () {
 	$('#update').click(function(ev){
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@ -59,15 +59,15 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 				print "<img width=\"50\" src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
 			echo "</td>";
 			echo "<td>";
-			echo $currUser->getFullName()." (".$currUser->getLogin().")<br />";
-			echo "<a href=\"mailto:".$currUser->getEmail()."\">".$currUser->getEmail()."</a><br />";
-			echo "<small>".$currUser->getComment()."</small>";
+			echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")<br />";
+			echo "<a href=\"mailto:".$currUser->getEmail()."\">".htmlspecialchars($currUser->getEmail())."</a><br />";
+			echo "<small>".htmlspecialchars($currUser->getComment())."</small>";
 			echo "</td>";
 			echo "<td>";
 			$groups = $currUser->getGroups();
 			if (count($groups) != 0) {
 				for ($j = 0; $j < count($groups); $j++)	{
-					print $groups[$j]->getName();
+					print htmlspecialchars($groups[$j]->getName());
 					if ($j +1 < count($groups))
 						print ", ";
 				}
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@ -33,6 +33,7 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {

 	function js() { /* {{{ */
 		$seluser = $this->params['seluser'];
+		$strictformcheck = $this->params['strictformcheck'];
 ?>
 function checkForm()
 {
@ -385,7 +386,7 @@ $(document).ready( function() {
 				foreach ($workflows as $workflow) {
 					print "<option value=\"".$workflow->getID()."\"";
 					$checked = false;
-					foreach($mandatoryworkflows as $mw) if($mw->getID() == $workflow->getID()) $checked = true;
+					if($mandatoryworkflows) foreach($mandatoryworkflows as $mw) if($mw->getID() == $workflow->getID()) $checked = true;
 					if($checked)
 						echo " selected=\"selected\"";
 					print ">". htmlspecialchars($workflow->getName())."</option>";
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@ -151,7 +151,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		$document = $this->params['document'];

-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 		$this->printTimelineJs('out.ViewDocument.php?action=timelinedata&documentid='.$document->getID(), 300, '', date('Y-m-d'));
 		$this->printDocumentChooserJs("form1");
 	} /* }}} */
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@ -78,7 +78,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style {
 		$expandFolderTree = $this->params['expandFolderTree'];
 		$enableDropUpload = $this->params['enableDropUpload'];

-		header('Content-Type: application/json');
+		header('Content-Type: application/javascript');
 ?>
 		function folderSelected(id, name) {
 			window.location = '../out/out.ViewFolder.php?folderid=' + id;
--- a/webdav/webdav.php
+++ b/webdav/webdav.php
@ -326,6 +326,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$info["props"][] = $this->mkprop("getcontentlength", filesize($this->dms->contentDir.'/'.$fspath));
 			if($keywords = $obj->getKeywords())
 				$info["props"][] = $this->mkprop("SeedDMS:", "keywords", $keywords);
+			$info["props"][] = $this->mkprop("SeedDMS:", "id", $obj->getID());
 			$info["props"][] = $this->mkprop("SeedDMS:", "version", $content->getVersion());
 			$status = $content->getStatus();
 			$info["props"][] = $this->mkprop("SeedDMS:", "status", $status['status']);
@ -338,17 +339,20 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			$info["props"][] = $this->mkprop("SeedDMS:", "comment", $comment);
 		$info["props"][] = $this->mkprop("SeedDMS:", "owner", $obj->getOwner()->getLogin());

-		// get additional properties from database
-				/*
-		$query = "SELECT ns, name, value 
-						FROM {$this->db_prefix}properties 
-					   WHERE path = '$path'";
-		$res = mysql_query($query);
-		while ($row = mysql_fetch_assoc($res)) {
-			$info["props"][] = $this->mkprop($row["ns"], $row["name"], $row["value"]);
+		$attributes = $obj->getAttributes();
+		if($attributes) {
+			foreach($attributes as $attribute) {
+				$attrdef = $attribute->getAttributeDefinition();
+				$valueset = $attrdef->getValueSetAsArray();
+				if($valueset && $attrdef->getMultipleValues()) {
+					$valuesetstr = $attrdef->getValueSet();
+					$delimiter = substr($valuesetstr, 0, 1);
+					$info["props"][] = $this->mkprop("SeedDMS:", str_replace(' ', '', $attrdef->getName()), $delimiter.implode($delimiter, $attribute->getValueAsArray()));
+				} else
+					$info["props"][] = $this->mkprop("SeedDMS:", str_replace(' ', '', $attrdef->getName()), $attribute->getValue());
+			}
 		}
-		mysql_free_result($res);
-				*/
+
 		return $info;
 	} /* }}} */

@ -898,16 +902,52 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
 			if ($prop["ns"] == "DAV:") {
 				$options["props"][$key]['status'] = "403 Forbidden";
 			} else {
-			$this->logger->log('PROPPATCH: set '.$prop["ns"].''.$prop["val"].' to '.$prop["val"], PEAR_LOG_INFO);
+				$this->logger->log('PROPPATCH: set '.$prop["ns"].''.$prop["val"].' to '.$prop["val"], PEAR_LOG_INFO);
 				if($prop["ns"] == "SeedDMS:") {
 					if (isset($prop["val"]))
 						$val = $prop["val"];
 					else
 						$val = '';
 					switch($prop["name"]) {
-						case "comment":
-							$obj->setComment($val);
-							break;
+					case "comment":
+						$obj->setComment($val);
+						break;
+					default:
+						if($attrdef = $this->dms->getAttributeDefinitionByName($prop["name"])) {
+							$valueset = $attrdef->getValueSetAsArray();
+							switch($attrdef->getType()) {
+							case SeedDMS_Core_AttributeDefinition::type_string:
+								if($valueset) {
+									if(in_array($val, $valueset)) {
+										$obj->setAttributeValue($attrdef, $val);
+									}
+								} else {
+									$obj->setAttributeValue($attrdef, $val);
+								}
+								break;
+							case SeedDMS_Core_AttributeDefinition::type_int:
+								if($valueset) {
+									if(in_array($val, $valueset)) {
+										$obj->setAttributeValue($attrdef, (int) $val);
+									}
+								} else {
+									$obj->setAttributeValue($attrdef, (int) $val);
+								}
+								break;
+							case SeedDMS_Core_AttributeDefinition::type_float:
+								if($valueset) {
+									if(in_array($val, $valueset)) {
+										$obj->setAttributeValue($attrdef, (float) $val);
+									}
+								} else {
+									$obj->setAttributeValue($attrdef, (float) $val);
+								}
+								break;
+							case SeedDMS_Core_AttributeDefinition::type_boolean:
+								$obj->setAttributeValue($attrdef, $val == 1 ? true : false);
+								break;
+							}
+						}
 					}
 				}
 			}