diff --git a/views/blue/class.AddDocument.php b/views/blue/class.AddDocument.php
index e729d0687..e9f9e0fac 100644
--- a/views/blue/class.AddDocument.php
+++ b/views/blue/class.AddDocument.php
@@ -87,7 +87,7 @@ class SeedDMS_View_AddDocument extends SeedDMS_Blue_Style {
 		
 		// Retrieve a list of all users and groups that have review / approve
 		// privileges.
-		$docAccess = $folder->getApproversList();
+		$docAccess = $folder->getReadAccessList();
 		?>
 		<table>
 		<tr>
@@ -112,7 +112,7 @@ class SeedDMS_View_AddDocument extends SeedDMS_Blue_Style {
 		<table>
 		<tr>
 			<td><?php printMLText("name");?>:</td>
-			<td><input name="name" size="60"></td>
+			<td><input type="text" name="name" size="60"></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("comment");?>:</td>
@@ -167,14 +167,14 @@ class SeedDMS_View_AddDocument extends SeedDMS_Blue_Style {
 		<table>
 		<tr>
 			<td><?php printMLText("version");?>:</td>
-			<td><input name="reqversion" value="1"></td>
+			<td><input type="text" name="reqversion" value="1"></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("local_file");?>:</td>
 			<td>
 			<a href="javascript:addFiles()"><?php printMLtext("add_multiple_files") ?></a>
 			<ol id="files">
-			<li><input type="File" name="userfile[]" size="60"></li>
+			<li><input type="file" name="userfile[]" size="60"></li>
 			</ol>
 			</td>
 		</tr>
diff --git a/views/blue/class.AddEvent.php b/views/blue/class.AddEvent.php
index 36bec3443..d97b59b4a 100644
--- a/views/blue/class.AddEvent.php
+++ b/views/blue/class.AddEvent.php
@@ -81,7 +81,7 @@ function checkForm()
 			<td><textarea name="comment" rows="4" cols="80"></textarea></td>
 		</tr>
 		<tr>
-			<td colspan="2"><br><input type="Submit" value="<?php printMLText("add_event");?>"></td>
+			<td colspan="2"><br><input type="submit" value="<?php printMLText("add_event");?>"></td>
 		</tr>
 	</table>
 </form>
diff --git a/views/blue/class.AddFile.php b/views/blue/class.AddFile.php
index 8a77013da..9fef01dab 100644
--- a/views/blue/class.AddFile.php
+++ b/views/blue/class.AddFile.php
@@ -88,7 +88,7 @@ function checkForm()
 </tr>
 <tr>
 	<td><?php printMLText("name");?>:</td>
-	<td><input name="name" size="60"></td>
+	<td><input type="text" name="name" size="60"></td>
 </tr>
 <tr>
 	<td><?php printMLText("comment");?>:</td>
diff --git a/views/blue/class.AddMultiDocument.php b/views/blue/class.AddMultiDocument.php
index 29f145f58..b8555a908 100644
--- a/views/blue/class.AddMultiDocument.php
+++ b/views/blue/class.AddMultiDocument.php
@@ -57,7 +57,7 @@ function chooseCategory(form, cats) {
 
 	// Retrieve a list of all users and groups that have review / approve
 	// privileges.
-	$docAccess = $folder->getApproversList();
+	$docAccess = $folder->getReadAccessList();
 
 	$this->printUploadApplet('../op/op.AddMultiDocument.php', array('folderid'=>$folder->getId()));
 
diff --git a/views/blue/class.AddSubFolder.php b/views/blue/class.AddSubFolder.php
index b982c73dc..72711e0c0 100644
--- a/views/blue/class.AddSubFolder.php
+++ b/views/blue/class.AddSubFolder.php
@@ -72,7 +72,7 @@ function checkForm()
 	<table>
 		<tr>
 			<td class="inputDescription"><?php printMLText("name");?>:</td>
-			<td><input name="name" size="60"></td>
+			<td><input type="text" name="name" size="60"></td>
 		</tr>
 		<tr>
 			<td valign="top" class="inputDescription"><?php printMLText("comment");?>:</td>
@@ -88,7 +88,7 @@ function checkForm()
 		foreach($attrdefs as $attrdef) {
 ?>
 <tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
+	<td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
 	<td><?php $this->printAttributeEditField($attrdef, '') ?></td>
 </tr>
 <?php
diff --git a/views/blue/class.ApproveDocument.php b/views/blue/class.ApproveDocument.php
index 2354e054e..b2bc11091 100644
--- a/views/blue/class.ApproveDocument.php
+++ b/views/blue/class.ApproveDocument.php
@@ -104,21 +104,25 @@ function checkGrpForm()
 				print "</tr></tbody></table><br>\n";
 			}
 ?>
-	<form method="POST" action="../op/op.ApproveDocument.php" name="form1" onsubmit="return checkIndForm();">
+	<form method="post" action="../op/op.ApproveDocument.php" name="form1" onsubmit="return checkIndForm();">
+	<?php echo createHiddenFieldWithKey('approvedocument'); ?>
 	<table>
 	<tr><td><?php printMLText("comment")?>:</td>
 	<td><textarea name="comment" cols="80" rows="4"></textarea>
 	</td></tr>
 	<tr><td><?php printMLText("approval_status")?>:</td>
 	<td><select name="approvalStatus">
-	<option value=''></option>
+<?php if($approvalStatus['status'] != 1) { ?>
 	<option value='1'><?php printMLText("status_approved")?></option>
+<?php } ?>
+<?php if($approvalStatus['status'] != -1) { ?>
 	<option value='-1'><?php printMLText("rejected")?></option>
+<?php } ?>
 	</select>
 	</td></tr><tr><td></td><td>
 	<input type='hidden' name='approvalType' value='ind'/>
 	<input type='hidden' name='documentid' value='<?php echo $document->getId() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion() ?>'/>
+	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
 	<input type='submit' name='indApproval' value='<?php printMLText("submit_approval")?>'/>
 	</td></tr></table>
 	</form>
@@ -144,6 +148,7 @@ function checkGrpForm()
 
 ?>
 	<form method="POST" action="../op/op.ApproveDocument.php" name="form1" onsubmit="return checkGrpForm();">
+	<?php echo createHiddenFieldWithKey('approvedocument'); ?>
 	<table>
 	<tr><td><?php printMLText("comment")?>:</td>
 	<td><textarea name="comment" cols="80" rows="4"></textarea>
@@ -151,16 +156,19 @@ function checkGrpForm()
 	<tr><td><?php printMLText("approval_status")?>:</td>
 	<td>
 	<select name="approvalStatus">
-	<option value=''></option>
+<?php if($approvalStatus['status'] != 1) { ?>
 	<option value='1'><?php printMLText("status_approved")?></option>
+<?php } ?>
+<?php if($approvalStatus['status'] != -1) { ?>
 	<option value='-1'><?php printMLText("rejected")?></option>
+<?php } ?>
 	</select>
 	</td></tr>
 	<tr><td></td><td>
 	<input type='hidden' name='approvalGroup' value="<?php echo $approvalStatus['required']; ?>" />
 	<input type='hidden' name='approvalType' value='grp'/>
 	<input type='hidden' name='documentid' value='<?php echo $document->getId() ?>'/>
-	<input type='hidden' name='version' value='<?php echo $version ?>'/>
+	<input type='hidden' name='version' value='<?php echo $latestContent->getVersion(); ?>'/>
 	<input type='submit' name='groupApproval' value='<?php printMLText("submit_approval")?>'/></td></tr>
 	</table>
 	</form>
diff --git a/views/blue/class.AttributeMgr.php b/views/blue/class.AttributeMgr.php
index 0d0bb1658..1ae4ed4a7 100644
--- a/views/blue/class.AttributeMgr.php
+++ b/views/blue/class.AttributeMgr.php
@@ -69,40 +69,39 @@ function showAttributeDefinitions(selectObj) {
 				<option value="0"><?php echo getMLText("new_attrdef")?>
 
 <?php
-				
-				$selected=0;
-				$count=2;
-				if($attrdefs) {
-					foreach ($attrdefs as $attrdef) {
-					
-						if (isset($_GET["attrdefid"]) && $attrdef->getID()==$_GET["attrdefid"]) $selected=$count;				
-						switch($attrdef->getObjType()) {
-							case SeedDMS_Core_AttributeDefinition::objtype_all:
-								$ot = getMLText("all");
-								break;
-							case SeedDMS_Core_AttributeDefinition::objtype_folder:
-								$ot = getMLText("folder");
-								break;
-							case SeedDMS_Core_AttributeDefinition::objtype_document:
-								$ot = getMLText("document");
-								break;
-							case SeedDMS_Core_AttributeDefinition::objtype_documentcontent:
-								$ot = getMLText("version");
-								break;
-						}
-						print "<option value=\"".$attrdef->getID()."\">" . htmlspecialchars($attrdef->getName() ." (".$ot.")");
-						$count++;
-					}
+		$selected=0;
+		$count=2;
+		if($attrdefs) {
+			foreach ($attrdefs as $attrdef) {
+			
+				if (isset($_GET["attrdefid"]) && $attrdef->getID()==$_GET["attrdefid"]) $selected=$count;				
+				switch($attrdef->getObjType()) {
+					case SeedDMS_Core_AttributeDefinition::objtype_all:
+						$ot = getMLText("all");
+						break;
+					case SeedDMS_Core_AttributeDefinition::objtype_folder:
+						$ot = getMLText("folder");
+						break;
+					case SeedDMS_Core_AttributeDefinition::objtype_document:
+						$ot = getMLText("document");
+						break;
+					case SeedDMS_Core_AttributeDefinition::objtype_documentcontent:
+						$ot = getMLText("version");
+						break;
 				}
+				print "<option value=\"".$attrdef->getID()."\">" . htmlspecialchars($attrdef->getName() ." (".$ot.")");
+				$count++;
+			}
+		}
 ?>
-			</select>
-			&nbsp;&nbsp;
-		</td>
+	</select>
+	&nbsp;&nbsp;
+	</td>
 
 		<td id="attrdefs0" style="display : none;">	
 			<form action="../op/op.AttributeMgr.php" method="post">
   		<?php echo createHiddenFieldWithKey('addattrdef'); ?>
-			<input type="Hidden" name="action" value="addattrdef">
+			<input type="hidden" name="action" value="addattrdef">
 			<table>
 				<tr>
 					<td><?php printMLText("attrdef_name");?>:</td><td><input type="text" name="name"></td>
@@ -141,20 +140,20 @@ function showAttributeDefinitions(selectObj) {
 					<tr>
 						<td colspan="2">
 <?php
-			if(!$attrdef->isUsed()) {
+					if(!$attrdef->isUsed()) {
 ?>
 							<form style="display: inline-block;" method="post" action="../op/op.AttributeMgr.php" >
 							<?php echo createHiddenFieldWithKey('removeattrdef'); ?>
-							<input type="Hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>">
-							<input type="Hidden" name="action" value="removeattrdef">
+							<input type="hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>">
+							<input type="hidden" name="action" value="removeattrdef">
 							<input value="<?php echo getMLText("rm_attrdef")?>" type="submit">
 							</form>
 <?php
-			} else {
+					} else {
 ?>
 							<p><?php echo getMLText('attrdef_in_use') ?></p>
 <?php
-			}
+					}
 ?>
 						</td>
 					</tr>
@@ -172,7 +171,7 @@ function showAttributeDefinitions(selectObj) {
 								<?php printMLText("attrdef_name");?>:
 						</td>
 						<td>
-							<input name="name" value="<?php echo htmlspecialchars($attrdef->getName()) ?>">
+							<input type="text" name="name" value="<?php echo htmlspecialchars($attrdef->getName()) ?>">
 						</td>
 					</tr>
 					<tr>
@@ -180,7 +179,7 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_type");?>:
 						</td>
 						<td>
-							<select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>>Integer</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>>Float</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>>String</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>>Boolean</option></select><br />
+							<select name="type"><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>>Integer</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>>Float</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>>String</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>>Boolean</option></select>
 						</td>
 					</tr>
 					<tr>
@@ -188,7 +187,7 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_objtype");?>:
 						</td>
 						<td>
-							<select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>>Folder</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>>Document</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>>Document content</option></select><br />
+							<select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>">All</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>>Folder</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>>Document</option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>>Document content</option></select>
 						</td>
 					</tr>
 					<tr>
@@ -196,7 +195,7 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_multiple");?>:
 						</td>
 						<td>
-							<input type="checkbox" value="1" name="multiple" /><br />
+							<input type="checkbox" value="1" name="multiple" <?php echo $attrdef->getMultipleValues() ? "checked" : "" ?>/>
 						</td>
 					</tr>
 					<tr>
@@ -204,7 +203,7 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_minvalues");?>:
 						</td>
 						<td>
-							<input type="text" value="<?php echo $attrdef->getMinValues() ?>" name="minvalues" /><br />
+							<input type="text" value="<?php echo $attrdef->getMinValues() ?>" name="minvalues" />
 						</td>
 					</tr>
 					<tr>
@@ -212,7 +211,7 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_maxvalues");?>:
 						</td>
 						<td>
-							<input type="text" value="<?php echo $attrdef->getMaxValues() ?>" name="maxvalues" /><br />
+							<input type="text" value="<?php echo $attrdef->getMaxValues() ?>" name="maxvalues" />
 						</td>
 					</tr>
 					<tr>
@@ -220,12 +219,13 @@ function showAttributeDefinitions(selectObj) {
 							<?php printMLText("attrdef_valueset");?>:
 						</td>
 						<td>
-							<input type="text" value="<?php echo $attrdef->getValueSet() ?>" name="valueset" /><br />
+							<input type="text" value="<?php echo $attrdef->getValueSet() ?>" name="valueset" />
 						</td>
 					</tr>
 					<tr>
+						<td></td>
 						<td>
-							<input type="Submit" value="<?php printMLText("save");?>">
+							<input type="submit" value="<?php printMLText("save");?>">
 						</td>
 					</tr>
 					</form>
diff --git a/views/blue/class.BackupTools.php b/views/blue/class.BackupTools.php
index e002cf8be..72c67868d 100644
--- a/views/blue/class.BackupTools.php
+++ b/views/blue/class.BackupTools.php
@@ -42,7 +42,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Blue_Style {
 
 		$this->contentHeading(getMLText("backup_tools"));
 		$this->contentContainerStart();
-		print getMLText("space_used_on_data_folder")." : ".formatted_size(dskspace($contentdir));
+		print getMLText("space_used_on_data_folder")." : ".SeedDMS_Core_File::format_filesize(dskspace($contentdir));
 		$this->contentContainerEnd();
 
 		// versioning file creation ////////////////////////////////////////////////////
@@ -109,7 +109,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Blue_Style {
 			if (is_object($folder)) print "<td>".htmlspecialchars($folder->getName())."</td>\n";
 			else print "<td>".getMLText("unknown_id")."</td>\n";
 			print "<td>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
-			print "<td>".formatted_size(filesize($contentdir.$entry))."</td>\n";
+			print "<td>".SeedDMS_Core_File::format_filesize(filesize($contentdir.$entry))."</td>\n";
 			print "<td><ul class=\"actions\">";
 			print "<li><a href=\"out.RemoveArchive.php?arkname=".$entry."\">".getMLText("backup_remove")."</a></li>";
 			print "</ul></td>\n";	
@@ -164,7 +164,7 @@ class SeedDMS_View_BackupTools extends SeedDMS_Blue_Style {
 			print "<tr>\n";
 			print "<td><a href=\"../op/op.Download.php?dumpname=".$entry."\">".$entry."</a></td>\n";
 			print "<td>".getLongReadableDate(filectime($contentdir.$entry))."</td>\n";
-			print "<td>".formatted_size(filesize($contentdir.$entry))."</td>\n";
+			print "<td>".SeedDMS_Core_File::format_filesize(filesize($contentdir.$entry))."</td>\n";
 			print "<td><ul class=\"actions\">";
 			print "<li><a href=\"out.RemoveDump.php?dumpname=".$entry."\">".getMLText("dump_remove")."</a></li>";
 			print "</ul></td>\n";	
diff --git a/views/blue/class.Calendar.php b/views/blue/class.Calendar.php
index 5324c7b94..cc9ebbf41 100644
--- a/views/blue/class.Calendar.php
+++ b/views/blue/class.Calendar.php
@@ -55,7 +55,7 @@ class SeedDMS_View_Calendar extends SeedDMS_Blue_Style {
 		
 		$this->dayNames = array();
 		foreach ( $this->dayNamesLong as $dn ){
-			 $this->dayNames[] = substr($dn,0,2);   
+			 $this->dayNames[] = substr($dn,0,3);   
 		}         
 	} /* }}} */
 
diff --git a/views/blue/class.Categories.php b/views/blue/class.Categories.php
index a79704a6d..caf638c6d 100644
--- a/views/blue/class.Categories.php
+++ b/views/blue/class.Categories.php
@@ -87,7 +87,7 @@ function showCategories(selectObj) {
   		<?php echo createHiddenFieldWithKey('addcategory'); ?>
 			<input type="Hidden" name="action" value="addcategory">
 			<?php printMLText("name");?> : <input name="name">
-			<input type="Submit" value="<?php printMLText("new_document_category"); ?>">
+			<input type="submit" value="<?php printMLText("new_document_category"); ?>">
 			</form>
 		</td>
 	
@@ -128,8 +128,8 @@ function showCategories(selectObj) {
   		        <?php echo createHiddenFieldWithKey('editcategory'); ?>
 							<input type="Hidden" name="action" value="editcategory">
 							<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-							<input name="name" value="<?php echo htmlspecialchars($category->getName()) ?>">&nbsp;
-							<input type="Submit" value="<?php printMLText("save");?>">
+							<input name="name" type="text" value="<?php echo htmlspecialchars($category->getName()) ?>">&nbsp;
+							<input type="submit" value="<?php printMLText("save");?>">
 						</form>
 					</td>
 				</tr>
diff --git a/views/blue/class.DefaultKeywords.php b/views/blue/class.DefaultKeywords.php
index 4ff0c6d98..f0288db04 100644
--- a/views/blue/class.DefaultKeywords.php
+++ b/views/blue/class.DefaultKeywords.php
@@ -35,24 +35,23 @@ class SeedDMS_View_DefaultKeywords extends SeedDMS_Blue_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$categories = $this->params['categories'];
-		$selcategory = $this->params['selcategory'];
+		$selcategoryid = $this->params['selcategoryid'];
 
 $this->htmlStartPage(getMLText("admin_tools"));
 $this->globalNavigation();
 $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
 
 ?>
-
 <script language="JavaScript">
 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 = "";
 }
@@ -78,8 +77,8 @@ function showKeywords(selectObj) {
 		
 			$owner = $category->getOwner();
 			if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) continue;
-			
-			if ($categoryid && $category->getID()==$selcategoryid) $selected=$count;				
+
+			if ($selcategoryid && $category->getID()==$selcategoryid) $selected=$count;				
 			print "<option value=\"".$category->getID()."\">" . htmlspecialchars($category->getName());
 			$count++;
 		}
@@ -92,18 +91,16 @@ function showKeywords(selectObj) {
 			<form action="../op/op.DefaultKeywords.php" method="post">
   		<?php echo createHiddenFieldWithKey('addcategory'); ?>
 			<input type="Hidden" name="action" value="addcategory">
-			<?php printMLText("name");?> : <input name="name">
-			<input type="Submit" value="<?php printMLText("new_default_keyword_category"); ?>">
+			<?php printMLText("name");?>: <input type="text" name="name">
+			<input type="submit" value="<?php printMLText("new_default_keyword_category"); ?>">
 			</form>
 		</td>
-	
-<?php	
-	
+<?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>
@@ -127,10 +124,10 @@ function showKeywords(selectObj) {
 					<td>
 						<form 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" value="<?php echo htmlspecialchars($category->getName()) ?>">&nbsp;
-							<input type="Submit" value="<?php printMLText("save");?>">
+							<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()) ?>">&nbsp;
+							<input type="submit" value="<?php printMLText("save");?>">
 						</form>
 					</td>
 				</tr>
@@ -149,27 +146,27 @@ function showKeywords(selectObj) {
 								print getMLText("no_default_keywords");
 							else
 								foreach ($lists as $list) {
-						?>
+?>
 									<form 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" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
+									<input name="keywords" type="text" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
 									<input name="action" value="editkeywords" type="Image" src="images/save.gif" title="<?php echo getMLText("save")?>" style="border: 0px;">
 									<!--	 <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">
+									<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">
 									<input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" style="border: 0px;">
 									</form>
 									<br>
 						<?php }  ?>
 					</td>
-				</tr>			
+				</tr>
 				<tr>
 					<form action="../op/op.DefaultKeywords.php" method="post">
   				<?php echo createHiddenFieldWithKey('newkeywords'); ?>
@@ -177,16 +174,16 @@ function showKeywords(selectObj) {
 					<td>
 						<input type="Hidden" name="action" value="newkeywords">
 						<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<input name="keywords">
+						<input type="text" name="keywords">
 					</td>
 					</form>
 				</tr>
-				
+
 			</table>
 		</td>
 <?php } ?>
 	</tr></table>
-	
+
 <script language="JavaScript">
 
 sel = document.getElementById("selector");
@@ -195,7 +192,6 @@ showKeywords(sel);
 
 </script>
 
-	
 <?php
 		$this->contentContainerEnd();
 		$this->htmlEndPage();
diff --git a/views/blue/class.DocumentAccess.php b/views/blue/class.DocumentAccess.php
index 89f8a24ec..4844a9254 100644
--- a/views/blue/class.DocumentAccess.php
+++ b/views/blue/class.DocumentAccess.php
@@ -31,14 +31,14 @@ require_once("class.BlueStyle.php");
  */
 class SeedDMS_View_DocumentAccess extends SeedDMS_Blue_Style {
 
-	function printAccessModeSelection($defMode) {
+	function printAccessModeSelection($defMode) { /* {{{ */
 		print "<select name=\"mode\">\n";
 		print "\t<option value=\"".M_NONE."\"" . (($defMode == M_NONE) ? " selected" : "") . ">" . getMLText("access_mode_none") . "</option>\n";
 		print "\t<option value=\"".M_READ."\"" . (($defMode == M_READ) ? " selected" : "") . ">" . getMLText("access_mode_read") . "</option>\n";
 		print "\t<option value=\"".M_READWRITE."\"" . (($defMode == M_READWRITE) ? " selected" : "") . ">" . getMLText("access_mode_readwrite") . "</option>\n";
 		print "\t<option value=\"".M_ALL."\"" . (($defMode == M_ALL) ? " selected" : "") . ">" . getMLText("access_mode_all") . "</option>\n";
 		print "</select>\n";
-	}
+	} /* }}} */
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -98,7 +98,7 @@ function checkForm()
 	}
 	?>
 	</select>
-	<input type="Submit" value="<?php printMLText("save")?>">
+	<input type="submit" value="<?php printMLText("save")?>">
 	</form>
 <?php
 
@@ -172,8 +172,8 @@ function checkForm()
 				print "<td><span class=\"actions\">\n";
 				echo createHiddenFieldWithKey('documentaccess')."\n";
 				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
-				print "<input type=\"Hidden\" name=\"action\" value=\"editaccess\">\n";
-				print "<input type=\"Hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
+				print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">\n";
+				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
 				print "<input type=\"Image\" class=\"mimeicon\" src=\"images/save.gif\">".getMLText("save")." ";
 				print "</span></td>\n";
 				print "</form>\n";
@@ -181,8 +181,8 @@ function checkForm()
 				print "<form action=\"../op/op.DocumentAccess.php\">\n";
 				echo createHiddenFieldWithKey('documentaccess')."\n";
 				print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
-				print "<input type=\"Hidden\" name=\"action\" value=\"delaccess\">\n";
-				print "<input type=\"Hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
+				print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
+				print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
 				print "<input type=\"Image\" class=\"mimeicon\" src=\"images/del.gif\">".getMLText("delete")." ";
 				print "</form>\n";
 				print "<span></td>\n";
@@ -270,7 +270,7 @@ function checkForm()
 </td>
 </tr>
 <tr>
-<td colspan="2"><input type="Submit" value="<?php printMLText("add");?>"></td>
+<td colspan="2"><input type="submit" value="<?php printMLText("add");?>"></td>
 </tr>
 </table>
 </form>
diff --git a/views/blue/class.DocumentChooser.php b/views/blue/class.DocumentChooser.php
index e4d483ac2..ee807dcdb 100644
--- a/views/blue/class.DocumentChooser.php
+++ b/views/blue/class.DocumentChooser.php
@@ -103,29 +103,11 @@ class SeedDMS_View_DocumentChooser extends SeedDMS_Blue_Style {
 ?>
 
 <script language="JavaScript">
-function decodeString(s) {
-	s = new String(s);
-	s = s.replace(/&amp;/, "&");
-	s = s.replace(/&#0037;/, "%"); // percent
-	s = s.replace(/&quot;/, "\""); // double quote
-	s = s.replace(/&#0047;&#0042;/, "/*"); // start of comment
-	s = s.replace(/&#0042;&#0047;/, "*/"); // end of comment
-	s = s.replace(/&lt;/, "<");
-	s = s.replace(/&gt;/, ">");
-	s = s.replace(/&#0061;/, "=");
-	s = s.replace(/&#0041;/, ")");
-	s = s.replace(/&#0040;/, "(");
-	s = s.replace(/&#0039;/, "'");
-	s = s.replace(/&#0043;/, "+");
-
-	return s;
-}
-
 var targetName;
 var targetID;
 
 function documentSelected(id, name) {
-	targetName.value = name; //decodeString(name);
+	targetName.value = name;
 	targetID.value = id;
 	window.close();
 	return true;
diff --git a/views/blue/class.DocumentNotify.php b/views/blue/class.DocumentNotify.php
index e7dfad861..004c67d47 100644
--- a/views/blue/class.DocumentNotify.php
+++ b/views/blue/class.DocumentNotify.php
@@ -101,8 +101,8 @@ function checkForm()
 <br>
 
 <form action="../op/op.DocumentNotify.php" name="form1" onsubmit="return checkForm();">
-<input type="Hidden" name="documentid" value="<?php print $document->getID()?>">
-<input type="Hidden" name="action" value="addnotify">
+<input type="hidden" name="documentid" value="<?php print $document->getID()?>">
+<input type="hidden" name="action" value="addnotify">
 <table>
 	<tr>
 		<td><?php printMLText("user");?>:</td>
diff --git a/views/blue/class.DropFolderChooser.php b/views/blue/class.DropFolderChooser.php
index 7f33fa8e7..295a10e14 100644
--- a/views/blue/class.DropFolderChooser.php
+++ b/views/blue/class.DropFolderChooser.php
@@ -50,17 +50,22 @@ var targetName = opener.document.<?php echo $form?>.dropfolderfile<?php print $f
 		$this->contentContainerStart();
 
 		$dir = $dropfolderdir.'/'.$user->getLogin();
-		if(is_dir($dir)) {
-			$d = dir($dir);
-			echo "<table>\n";
-			while (false !== ($entry = $d->read())) {
-				if($entry != '..' && $entry != '.') {
-					if(!is_dir($entry)) {
-						echo "<tr><td><span style=\"cursor: pointer;\" onClick=\"targetName.value = '".$entry."'; window.close();\">".$entry."</span></td><td>".filesize($dir.'/'.$entry)."</td></tr>\n";
+		/* Check if we are still looking in the configured directory and
+		 * not somewhere else, e.g. if the login was '../test'
+		 */
+		if(dirname($dir) == $dropfolderdir) {
+			if(is_dir($dir)) {
+				$d = dir($dir);
+				echo "<table>\n";
+				while (false !== ($entry = $d->read())) {
+					if($entry != '..' && $entry != '.') {
+						if(!is_dir($entry)) {
+							echo "<tr><td><span style=\"cursor: pointer;\" onClick=\"targetName.value = '".$entry."'; window.close();\">".$entry."</span></td><td align=\"right\">".SeedDMS_Core_File::format_filesize(filesize($dir.'/'.$entry))."</td></tr>\n";
+						}
 					}
 				}
+				echo "</table>\n";
 			}
-			echo "</table>\n";
 		}
 
 		$this->contentContainerEnd();
diff --git a/views/blue/class.EditAttributes.php b/views/blue/class.EditAttributes.php
index dd6894ab3..a2075bc69 100644
--- a/views/blue/class.EditAttributes.php
+++ b/views/blue/class.EditAttributes.php
@@ -64,7 +64,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Blue_Style {
 			}
 ?>
 		<tr>
-			<td colspan="2"><br><input type="Submit" value="<?php printMLText("save") ?>"></td>
+			<td colspan="2"><br><input type="submit" value="<?php printMLText("save") ?>"></td>
 		</tr>
 	</table>
 </form>
diff --git a/views/blue/class.EditFolder.php b/views/blue/class.EditFolder.php
index 2801eef50..142389903 100644
--- a/views/blue/class.EditFolder.php
+++ b/views/blue/class.EditFolder.php
@@ -76,7 +76,7 @@ function checkForm()
 <table>
 <tr>
 <td><?php printMLText("name");?>:</td>
-<td><input name="name" value="<?php print htmlspecialchars($folder->getName());?>" size="60"></td>
+<td><input type="text" name="name" value="<?php print htmlspecialchars($folder->getName());?>" size="60"></td>
 </tr>
 <tr>
 <td><?php printMLText("comment");?>:</td>
@@ -104,7 +104,7 @@ function checkForm()
 		}
 ?>
 <tr>
-<td colspan="2"><input type="Submit" value="<?php printMLText("save"); ?>"></td>
+<td colspan="2"><input type="submit" value="<?php printMLText("save"); ?>"></td>
 </tr>
 </table>
 </form>
diff --git a/views/blue/class.EditUserData.php b/views/blue/class.EditUserData.php
index 02bf866ee..af2ad10ee 100644
--- a/views/blue/class.EditUserData.php
+++ b/views/blue/class.EditUserData.php
@@ -71,11 +71,11 @@ function checkForm()
 <table>
 	<tr>
 		<td><?php printMLText("current_password");?>:</td>
-		<td><input id="currentpwd" type="Password" name="currentpwd" size="30"></td>
+		<td><input id="currentpwd" type="password" name="currentpwd" size="30"></td>
 	</tr>
 	<tr>
 		<td><?php printMLText("new_password");?>:</td>
-		<td><input class="pwd" rel="outerstrength" type="Password" name="pwd" size="30"> <div id="outerstrength" style="min-width: 100px; height: 14px; display: inline-block; border: 1px solid black; padding: 1px;"><div id="innerstrength" style="width: 0px; height: 14px; display: inline-block; border: 0px; padding: 0px; background-color: red;">&nbsp;</div> <div id="strength" style="display: inline-block;"></div></div></td>
+		<td><input class="pwd" rel="outerstrength" type="password" name="pwd" size="30"> <div id="outerstrength" style="min-width: 100px; height: 14px; display: inline-block; border: 1px solid black; padding: 1px;"><div id="innerstrength" style="width: 0px; height: 14px; display: inline-block; border: 0px; padding: 0px; background-color: red;">&nbsp;</div> <div id="strength" style="display: inline-block;"></div></div></td>
 	</tr>
 	<tr>
 		<td><?php printMLText("confirm_pwd");?>:</td>
@@ -83,11 +83,11 @@ function checkForm()
 	</tr>
 	<tr>
 		<td><?php printMLText("name");?>:</td>
-		<td><input name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30"></td>
+		<td><input type="text" name="fullname" value="<?php print htmlspecialchars($user->getFullName());?>" size="30"></td>
 	</tr>
 	<tr>
 		<td><?php printMLText("email");?>:</td>
-		<td><input name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30"></td>
+		<td><input type="text" name="email" value="<?php print htmlspecialchars($user->getEmail());?>" size="30"></td>
 	</tr>
 	<tr>
 		<td><?php printMLText("comment");?>:</td>
@@ -111,10 +111,37 @@ function checkForm()
 		<td><?php printMLText("new_user_image");?>:</td>
 		<td><input type="file" name="userfile" accept="image/jpeg" size="30"></td>
 	</tr>
+	<tr>
+		<td><?php printMLText("language");?>:</td>
+		<td>
+			<select name="language">
+<?php
+			$languages = getLanguages();
+			foreach ($languages as $currLang) {
+				print "<option value=\"".$currLang."\" ".(($user->getLanguage()==$currLang) ? "selected" : "").">".$currLang."</option>";
+			}
+?>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td><?php printMLText("theme");?>:</td>
+		<td>
+			<select name="theme">
+<?php
+			$languages = getLanguages();
+			$themes = UI::getStyles();
+			foreach ($themes as $currTheme) {
+				print "<option value=\"".$currTheme."\" ".(($user->getTheme()==$currTheme) ? "selected" : "").">".$currTheme."</option>";
+			}
+?>
+			</select>
+		</td>
+	</tr>
 <?php	} ?>
 
 	<tr>
-		<td colspan="2"><input type="Submit" value="<?php printMLText("submit_userinfo") ?>"></td>
+		<td colspan="2"><input type="submit" value="<?php printMLText("submit_userinfo") ?>"></td>
 	</tr>
 </table>
 </form>
diff --git a/views/blue/class.FolderAccess.php b/views/blue/class.FolderAccess.php
index 0945c8a8b..0e0ff4677 100644
--- a/views/blue/class.FolderAccess.php
+++ b/views/blue/class.FolderAccess.php
@@ -30,14 +30,14 @@ require_once("class.BlueStyle.php");
  * @version    Release: @package_version@
  */
 class SeedDMS_View_FolderAccess extends SeedDMS_Blue_Style {
-	function printAccessModeSelection($defMode) {
+	function printAccessModeSelection($defMode) { /* {{{ */
 		print "<select name=\"mode\">\n";
 		print "\t<option value=\"".M_NONE."\"" . (($defMode == M_NONE) ? " selected" : "") . ">" . getMLText("access_mode_none") . "\n";
 		print "\t<option value=\"".M_READ."\"" . (($defMode == M_READ) ? " selected" : "") . ">" . getMLText("access_mode_read") . "\n";
 		print "\t<option value=\"".M_READWRITE."\"" . (($defMode == M_READWRITE) ? " selected" : "") . ">" . getMLText("access_mode_readwrite") . "\n";
 		print "\t<option value=\"".M_ALL."\"" . (($defMode == M_ALL) ? " selected" : "") . ">" . getMLText("access_mode_all") . "\n";
 		print "</select>\n";
-	}
+	} /* }}} */
 
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
@@ -94,7 +94,7 @@ function checkForm()
 			}
 ?>
 	</select>
-	<input type="Submit" value="<?php printMLText("save")?>">
+	<input type="submit" value="<?php printMLText("save")?>">
 	</form>
 	<?php
 		}
@@ -146,7 +146,7 @@ function checkForm()
 	<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
 	<input type="Hidden" name="action" value="setdefault">
 	<?php $this->printAccessModeSelection($folder->getDefaultAccess()); ?>
-	<input type="Submit" value="<?php printMLText("save");?>">
+	<input type="submit" value="<?php printMLText("save");?>">
 </form>
 
 <?php
@@ -262,7 +262,7 @@ function checkForm()
 </td>
 </tr>
 <tr>
-<td colspan="2"><input type="Submit" value="<?php printMLText("add");?>"></td>
+<td colspan="2"><input type="submit" value="<?php printMLText("add");?>"></td>
 </tr>
 </table>
 </form>
diff --git a/views/blue/class.FolderChooser.php b/views/blue/class.FolderChooser.php
index 90fc2e218..d37073368 100644
--- a/views/blue/class.FolderChooser.php
+++ b/views/blue/class.FolderChooser.php
@@ -45,39 +45,16 @@ class SeedDMS_View_FolderChooser extends SeedDMS_Blue_Style {
 ?>
 
 <script language="JavaScript">
-
 function toggleTree(id){
-	
 	obj = document.getElementById("tree" + id);
-	
 	if ( obj.style.display == "none" ) obj.style.display = "";
 	else obj.style.display = "none";
-	
-}
-
-function decodeString(s) {
-	s = new String(s);
-	s = s.replace(/&amp;/, "&");
-	s = s.replace(/&#0037;/, "%"); // percent
-	s = s.replace(/&quot;/, "\""); // double quote
-	s = s.replace(/&#0047;&#0042;/, "/*"); // start of comment
-	s = s.replace(/&#0042;&#0047;/, "*/"); // end of comment
-	s = s.replace(/&lt;/, "<");
-	s = s.replace(/&gt;/, ">");
-	s = s.replace(/&#0061;/, "=");
-	s = s.replace(/&#0041;/, ")");
-	s = s.replace(/&#0040;/, "(");
-	s = s.replace(/&#0039;/, "'");
-	s = s.replace(/&#0043;/, "+");
-
-	return s;
 }
 
 var targetName;
 var targetID;
 
 function folderSelected(id, name) {
-//	targetName.value = decodeString(name);
 	targetName.value = name;
 	targetID.value = id;
 	window.close();
diff --git a/views/blue/class.GroupMgr.php b/views/blue/class.GroupMgr.php
index dd505a9e8..adcd7d287 100644
--- a/views/blue/class.GroupMgr.php
+++ b/views/blue/class.GroupMgr.php
@@ -34,6 +34,7 @@ class SeedDMS_View_GroupMgr extends SeedDMS_Blue_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$selgroup = $this->params['selgroup'];
 		$allUsers = $this->params['allusers'];
 		$allGroups = $this->params['allgroups'];
 		$strictformcheck = $this->params['strictformcheck'];
@@ -93,7 +94,6 @@ function showUser(selectObj) {
 	obj = document.getElementById("keywords" + id);
 	obj.style.display = "";
 }
-
 </script>
 <?php
 		$this->contentHeading(getMLText("group_management"));
@@ -111,8 +111,7 @@ function showUser(selectObj) {
 		$selected=0;
 		$count=2;
 		foreach ($allGroups as $group) {
-			
-			if (isset($_GET["groupid"]) && $group->getID()==$_GET["groupid"]) $selected=$count;
+			if ($selgroup && $group->getID()==$selgroup->getID()) $selected=$count;
 			print "<option value=\"".$group->getID()."\">" . htmlspecialchars($group->getName());
 			$count++;
 		}
@@ -136,7 +135,7 @@ function showUser(selectObj) {
 			<td><textarea name="comment" rows="4" cols="50"></textarea></td>
 		</tr>
 		<tr>
-			<td colspan="2"><input type="Submit" value="<?php printMLText("add_group");?>"></td>
+			<td colspan="2"><input type="submit" value="<?php printMLText("add_group");?>"></td>
 		</tr>
 	</table>
 	</form>	
@@ -144,21 +143,12 @@ function showUser(selectObj) {
 	</td>
 	
 <?php	
-
 		foreach ($allGroups as $group) {
-		
 			print "<td id=\"keywords".$group->getID()."\" style=\"display : none;\">";
-			
 			$this->contentSubHeading(getMLText("group")." : ".htmlspecialchars($group->getName()));
-		
 ?>
-	
 	<a href="../out/out.RemoveGroup.php?groupid=<?php print $group->getID();?>"><img src="images/del.gif" width="15" height="15" border="0" align="absmiddle" alt=""> <?php printMLText("rm_group");?></a>
-
-
 	<?php	$this->contentSubHeading(getMLText("edit_group"));?>
-		
-	
 	<form action="../op/op.GroupMgr.php" name="form<?php print $group->getID();?>_1" method="post" onsubmit="return checkForm1('<?php print $group->getID();?>');">
 	<?php echo createHiddenFieldWithKey('editgroup'); ?>
 	<input type="Hidden" name="groupid" value="<?php print $group->getID();?>">
@@ -203,9 +193,7 @@ function showUser(selectObj) {
 		</table>
 		
 <?php
-
 			$this->contentSubHeading(getMLText("add_member"));
-
 ?>
 		
 		<form action="../op/op.GroupMgr.php" method="POST" name="form<?php print $group->getID();?>_2" onsubmit="return checkForm2('<?php print $group->getID();?>');">
diff --git a/views/blue/class.Info.php b/views/blue/class.Info.php
index d05f57ccf..ee4150009 100644
--- a/views/blue/class.Info.php
+++ b/views/blue/class.Info.php
@@ -39,9 +39,6 @@ class SeedDMS_View_Info extends SeedDMS_Blue_Style {
 		$this->htmlStartPage($version->banner());
 		$this->globalNavigation();
 		$this->pageNavigation($version->banner());
-		$this->contentContainerStart();
-		phpinfo();
-		$this->contentContainerEnd();
 		$this->htmlEndPage();
 	} /* }}} */
 }
diff --git a/views/blue/class.KeywordChooser.php b/views/blue/class.KeywordChooser.php
index 96cf9138d..126e9d4b9 100644
--- a/views/blue/class.KeywordChooser.php
+++ b/views/blue/class.KeywordChooser.php
@@ -43,7 +43,6 @@ class SeedDMS_View_KeywordChooser extends SeedDMS_Blue_Style {
 var targetObj = opener.document.<?php echo $target ?>;
 var myTA;
 
-
 function insertKeywords(keywords) {
 
 	if (navigator.appName == "Microsoft Internet Explorer") {
diff --git a/views/blue/class.MoveDocument.php b/views/blue/class.MoveDocument.php
index 13f44bb0c..b3bcb5124 100644
--- a/views/blue/class.MoveDocument.php
+++ b/views/blue/class.MoveDocument.php
@@ -44,14 +44,14 @@ class SeedDMS_View_MoveDocument extends SeedDMS_Blue_Style {
 		$this->contentContainerStart();
 ?>
 <form action="../op/op.MoveDocument.php" name="form1">
-	<input type="Hidden" name="documentid" value="<?php print $document->getID();?>">
+	<input type="hidden" name="documentid" value="<?php print $document->getID();?>">
 	<table>
 		<tr>
 			<td><?php printMLText("choose_target_folder");?>:</td>
 			<td><?php $this->printFolderChooser("form1", M_READWRITE);?></td>
 		</tr>
 		<tr>
-			<td colspan="2"><br><input type="Submit" value="<?php printMLText("move");?>"></td>
+			<td colspan="2"><br><input type="submit" value="<?php printMLText("move");?>"></td>
 		</tr>
 	</table>
 </form>
diff --git a/views/blue/class.MoveFolder.php b/views/blue/class.MoveFolder.php
index 4750656a1..902873c9c 100644
--- a/views/blue/class.MoveFolder.php
+++ b/views/blue/class.MoveFolder.php
@@ -52,7 +52,7 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Blue_Style {
 			<td><?php $this->printFolderChooser("form1", M_READWRITE, $folder->getID());?></td>
 		</tr>
 		<tr>
-			<td colspan="2"><input type="Submit" value="<?php printMLText("move_folder"); ?>"></td>
+			<td colspan="2"><input type="ubmit" value="<?php printMLText("move_folder"); ?>"></td>
 		</tr>
 	</table>
 	</form>
diff --git a/views/blue/class.ObjectCheck.php b/views/blue/class.ObjectCheck.php
index 775135884..e17ddc525 100644
--- a/views/blue/class.ObjectCheck.php
+++ b/views/blue/class.ObjectCheck.php
@@ -64,7 +64,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Blue_Style {
 
 		$subfolders = $folder->getSubFolders();
 		foreach($subfolders as $subfolder) {
-			$this->tree($dms, $subfolder, $indent.'  ', $path.$folder->getId().':');
+			$this->tree($dms, $subfolder, $repair, $path.$folder->getId().':', $indent.'  ');
 		}
 		$path .= $folder->getId().':';
 		$documents = $folder->getDocuments();
@@ -146,9 +146,13 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Blue_Style {
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
-		$versions = $this->params['unlinkedcontent'];
+		$unlinkedversions = $this->params['unlinkedcontent'];
+		$nofilesizeversions = $this->params['nofilesizeversions'];
+		$nochecksumversions = $this->params['nochecksumversions'];
 		$repair = $this->params['repair'];
 		$unlink = $this->params['unlink'];
+		$setfilesize = $this->params['setfilesize'];
+		$setchecksum = $this->params['setchecksum'];
 
 		$this->htmlStartPage(getMLText("admin_tools"));
 		$this->globalNavigation();
@@ -167,11 +171,11 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Blue_Style {
 		print "<th>".getMLText("error")."</th>\n";
 		print "<th></th>\n";
 		print "</tr>\n</thead>\n<tbody>\n";
-		$needsrepair = false;
-		$this->tree($folder, $repair);
+		$this->needsrepair = false;
+		$this->tree($dms, $folder, $repair);
 		print "</tbody></table>\n";
 
-		if($needsrepair && $repair == 0) {
+		if($this->needsrepair && $repair == 0) {
 			echo '<p><a href="out.ObjectCheck.php?repair=1">'.getMLText('do_object_repair').'</a></p>';
 		}
 		$this->contentContainerEnd();
@@ -182,7 +186,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Blue_Style {
 			echo "<p>".getMLText('unlinking_objects')."</p>";
 		}
 
-		if($versions) {
+		if($unlinkedversions) {
 			print "<table class=\"folderView\">";
 			print "<thead>\n<tr>\n";
 			print "<th>".getMLText("document")."</th>\n";
@@ -191,7 +195,7 @@ class SeedDMS_View_ObjectCheck extends SeedDMS_Blue_Style {
 			print "<th>".getMLText("mimetype")."</th>\n";
 			print "<th></th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
-			foreach($versions as $version) {
+			foreach($unlinkedversions as $version) {
 				$doc = $version->getDocument();
 				print "<tr><td>".$doc->getId()."</td><td>".$version->getVersion()."</td><td>".$version->getOriginalFileName()."</td><td>".$version->getMimeType()."</td>";
 				if($unlink) {
diff --git a/views/blue/class.OverrideContentStatus.php b/views/blue/class.OverrideContentStatus.php
index 32b9ab5df..3259da4f4 100644
--- a/views/blue/class.OverrideContentStatus.php
+++ b/views/blue/class.OverrideContentStatus.php
@@ -72,10 +72,10 @@ function checkForm()
 ?>
 <form method="post" action="../op/op.OverrideContentStatus.php" name="form1" onsubmit="return checkForm();">
 <table>
-<tr><td><?php echo(printMLText("comment")); ?></td>
+<tr><td><?php echo(printMLText("comment")); ?>:</td>
 <td><textarea name="comment" cols="40" rows="4"></textarea>
 </td></tr>
-<tr><td><?php echo(printMLText("status")); ?></td>
+<tr><td><?php echo(printMLText("status")); ?>:</td>
 <td><select name="overrideStatus">
 <option value=''></option>
 <?php
diff --git a/views/blue/class.PasswordForgotten.php b/views/blue/class.PasswordForgotten.php
index 2b3de34bb..d9e9ffd99 100644
--- a/views/blue/class.PasswordForgotten.php
+++ b/views/blue/class.PasswordForgotten.php
@@ -49,15 +49,15 @@ class SeedDMS_View_PasswordForgotten extends SeedDMS_Blue_Style {
   <p><?php printMLText("password_forgotten_text"); ?></p>
 	<table border="0">
 		<tr>
-			<td><?php printMLText("login");?></td>
-			<td><input name="login" id="login"></td>
+			<td><?php printMLText("login");?>:</td>
+			<td><input type="text" name="login" id="login"></td>
 		</tr>
 		<tr>
-			<td><?php printMLText("email");?></td>
-			<td><input name="email" id="email"></td>
+			<td><?php printMLText("email");?>:</td>
+			<td><input type="text" name="email" id="email"></td>
 		</tr>
 		<tr>
-			<td colspan="2"><input type="Submit" value="<?php printMLText("submit_password_forgotten") ?>"></td>
+			<td colspan="2"><input type="submit" value="<?php printMLText("submit_password_forgotten") ?>"></td>
 		</tr>
 	</table>
 </form>
diff --git a/views/blue/class.RemoveDocument.php b/views/blue/class.RemoveDocument.php
index 1ef670f5a..5df57bdb2 100644
--- a/views/blue/class.RemoveDocument.php
+++ b/views/blue/class.RemoveDocument.php
@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveDocument extends SeedDMS_Blue_Style {
 <p>
 <?php printMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName())));?>
 </p>
-<p><input type="Submit" value="<?php printMLText("rm_document");?>"></p>
+<p><input type="submit" value="<?php printMLText("rm_document");?>"></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/blue/class.RemoveDocumentFile.php b/views/blue/class.RemoveDocumentFile.php
index 2a25fd9d3..0582ea966 100644
--- a/views/blue/class.RemoveDocumentFile.php
+++ b/views/blue/class.RemoveDocumentFile.php
@@ -50,7 +50,7 @@ class SeedDMS_View_RemoveDocumentFile extends SeedDMS_Blue_Style {
 	<input type="Hidden" name="documentid" value="<?php echo $document->getID()?>">
 	<input type="Hidden" name="fileid" value="<?php echo $file->getID()?>">
 	<p><?php printMLText("confirm_rm_file", array ("documentname" => htmlspecialchars($document->getName()), "name" => htmlspecialchars($file->getName())));?></p>
-	<input type="Submit" value="<?php printMLText("rm_file");?>">
+	<input type="submit" value="<?php printMLText("rm_file");?>">
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/blue/class.RemoveFolder.php b/views/blue/class.RemoveFolder.php
index 906faef92..711332d0b 100644
--- a/views/blue/class.RemoveFolder.php
+++ b/views/blue/class.RemoveFolder.php
@@ -44,13 +44,13 @@ class SeedDMS_View_RemoveFolder extends SeedDMS_Blue_Style {
 		$this->contentContainerStart();
 ?>
 <form action="../op/op.RemoveFolder.php" method="post" name="form1">
-	<input type="Hidden" name="folderid" value="<?php print $folderid;?>">
+	<input type="Hidden" name="folderid" value="<?php print $folder->getID();?>">
 	<input type="Hidden" name="showtree" value="<?php echo showtree();?>">
   <?php echo createHiddenFieldWithKey('removefolder'); ?>
 	<p>
 	<?php printMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName())));?>
 	</p>
-	<p><input type="Submit" value="<?php printMLText("rm_folder");?>"></p>
+	<p><input type="submit" value="<?php printMLText("rm_folder");?>"></p>
 </form>
 <?php
 		$this->contentContainerEnd();
diff --git a/views/blue/class.ReviewDocument.php b/views/blue/class.ReviewDocument.php
index bea3fbdf9..546d3003f 100644
--- a/views/blue/class.ReviewDocument.php
+++ b/views/blue/class.ReviewDocument.php
@@ -110,9 +110,12 @@ function checkGrpForm()
 	</td></tr>
 	<tr><td><?php printMLText("review_status")?></td>
 	<td><select name="reviewStatus">
-	<option value=''></option>
+<?php if($reviewStatus['status'] != 1) { ?>
 	<option value='1'><?php printMLText("status_reviewed")?></option>
+<?php } ?>
+<?php if($reviewStatus['status'] != -1) { ?>
 	<option value='-1'><?php printMLText("rejected")?></option>
+<?php } ?>
 	</select>
 	</td></tr><tr><td></td><td>
 	<input type='hidden' name='reviewType' value='ind'/>
@@ -150,9 +153,12 @@ function checkGrpForm()
 	<tr><td><?php printMLText("review_status")?>:</td>
 	<td>
 	<select name="reviewStatus">
-	<option value=''></option>
+<?php if($reviewStatus['status'] != 1) { ?>
 	<option value='1'><?php printMLText("status_reviewed")?></option>
+<?php } ?>
+<?php if($reviewStatus['status'] != -1) { ?>
 	<option value='-1'><?php printMLText("rejected")?></option>
+<?php } ?>
 	</select>
 	</td></tr>
 	<tr><td></td><td>
diff --git a/views/blue/class.ReviewSummary.php b/views/blue/class.ReviewSummary.php
index e234359a1..07a37fcf1 100644
--- a/views/blue/class.ReviewSummary.php
+++ b/views/blue/class.ReviewSummary.php
@@ -32,6 +32,8 @@ require_once("class.BlueStyle.php");
 class SeedDMS_View_ReviewSummary extends SeedDMS_Blue_Style {
 
 	function show() { /* {{{ */
+		$dms = $this->params['dms'];
+		$user = $this->params['user'];
 
 		if (!$db->createTemporaryTable("ttstatid")) {
 			UI::exitError(getMLText("review_summary"),getMLText("internal_error_exit"));
diff --git a/views/blue/class.SearchForm.php b/views/blue/class.SearchForm.php
index 5b0e8428f..6285c3fe7 100644
--- a/views/blue/class.SearchForm.php
+++ b/views/blue/class.SearchForm.php
@@ -100,10 +100,10 @@ function chooseKeywords(target) {
 <tr>
 <td><?php printMLText("search_in");?>:</td>
 <td><ul class="actions">
-<li class="first"><input type="Checkbox" id="keywords" name="searchin[]" value="1"><label for="keywords"><?php printMLText("keywords");?></label> (<?php printMLText('documents_only'); ?>)</li>
-<li><input type="Checkbox" name="searchin[]" id="searchName" value="2"><label for="searchName"><?php printMLText("name");?></label></li>
-<li><input type="Checkbox" name="searchin[]" id="comment" value="3"><label for="comment"><?php printMLText("comment");?></label></li>
-<li><input type="Checkbox" name="searchin[]" id="attributes" value="4"><label for="attributes"><?php printMLText("attributes");?></label></li>
+<li class="first"><input type="checkbox" id="keywords" name="searchin[]" value="1"><label for="keywords"><?php printMLText("keywords");?></label> (<?php printMLText('documents_only'); ?>)</li>
+<li><input type="checkbox" name="searchin[]" id="searchName" value="2"><label for="searchName"><?php printMLText("name");?></label></li>
+<li><input type="checkbox" name="searchin[]" id="comment" value="3"><label for="comment"><?php printMLText("comment");?></label></li>
+<li><input type="checkbox" name="searchin[]" id="attributes" value="4"><label for="attributes"><?php printMLText("attributes");?></label></li>
 </ul>
 </td>
 </tr>
@@ -252,7 +252,7 @@ echo "</td>\n</tr>\n";
 </td>
 </tr>
 <tr>
-<td colspan="2"><input type="Submit" value="<?php printMLText("search"); ?>"></td>
+<td colspan="2"><input type="submit" value="<?php printMLText("search"); ?>"></td>
 </tr>
 </table>
 
diff --git a/views/blue/class.SearchFulltext.php b/views/blue/class.SearchFulltext.php
index e94fd9537..9a69b2b06 100644
--- a/views/blue/class.SearchFulltext.php
+++ b/views/blue/class.SearchFulltext.php
@@ -108,7 +108,8 @@ class SeedDMS_View_SearchFulltext extends SeedDMS_Blue_Style {
 				
 				$owner = $document->getOwner();
 				print "<td>".htmlspecialchars($owner->getFullName())."</td>";
-				print "<td>".getOverallStatusText($lc->getStatus()). "</td>";
+				$display_status=$lc->getStatus();
+				print "<td>".getOverallStatusText($display_status["status"]). "</td>";
 
 				print "<td class=\"center\">".$lc->getVersion()."</td>";
 				
diff --git a/views/blue/class.SetReviewersApprovers.php b/views/blue/class.SetReviewersApprovers.php
index 34f752102..9ea5630d9 100644
--- a/views/blue/class.SetReviewersApprovers.php
+++ b/views/blue/class.SetReviewersApprovers.php
@@ -46,7 +46,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Blue_Style {
 		$this->contentHeading(getMLText("change_assignments"));
 
 		// Retrieve a list of all users and groups that have review / approve privileges.
-		$docAccess = $document->getApproversList();
+		$docAccess = $document->getReadAccessList();
 
 		// Retrieve list of currently assigned reviewers and approvers, along with
 		// their latest status.
@@ -88,9 +88,7 @@ class SeedDMS_View_SetReviewersApprovers extends SeedDMS_Blue_Style {
 <?php
 
 		$res=$user->getMandatoryReviewers();
-
 		foreach ($docAccess["users"] as $usr) {
-
 			$mandatory=false;
 			foreach ($res as $r) if ($r['reviewerUserID']==$usr->getID()) $mandatory=true;
 			
diff --git a/views/blue/class.Settings.php b/views/blue/class.Settings.php
index ac9dfd4d9..04d930104 100644
--- a/views/blue/class.Settings.php
+++ b/views/blue/class.Settings.php
@@ -66,7 +66,7 @@ function ShowHide(strId)
 </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" name="action" value="saveSettings" />
 <?php
 if(!is_writeable($settings->_configFilePath)) {
 	echo "<p>".getMLText("settings_notwritable")."</p>";
@@ -87,11 +87,11 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_Display");?></b></td> </tr>
       <tr title="<?php printMLText("settings_siteName_desc");?>">
         <td><?php printMLText("settings_siteName");?>:</td>
-        <td><input name="siteName" value="<?php echo $settings->_siteName ?>"/></td>
+        <td><input type="text" name="siteName" value="<?php echo $settings->_siteName ?>"/></td>
       </tr>
       <tr title="<?php printMLText("settings_footNote_desc");?>">
         <td><?php printMLText("settings_footNote");?>:</td>
-        <td><input name="footNote" value="<?php echo $settings->_footNote ?>" size="100"/></td>
+        <td><input type="text" name="footNote" value="<?php echo $settings->_footNote ?>" size="100"/></td>
       </tr>
       <tr title="<?php printMLText("settings_printDisclaimer_desc");?>">
         <td><?php printMLText("settings_printDisclaimer");?>:</td>
@@ -142,7 +142,7 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_viewOnlineFileTypes_desc");?>">
         <td><?php printMLText("settings_viewOnlineFileTypes");?>:</td>
-        <td><input name="viewOnlineFileTypes" value="<?php echo $settings->getViewOnlineFileTypesToString() ?>" size="100" /></td>
+        <td><input type="text" name="viewOnlineFileTypes" value="<?php echo $settings->getViewOnlineFileTypesToString() ?>" size="100" /></td>
       </tr>
       <tr title="<?php printMLText("settings_enableConverting_desc");?>">
         <td><?php printMLText("settings_enableConverting");?>:</td>
@@ -162,7 +162,7 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_stopWordsFile_desc");?>">
         <td><?php printMLText("settings_stopWordsFile");?>:</td>
-        <td><input name="stopWordsFile" value="<?php echo $settings->_stopWordsFile; ?>" size="100" /></td>
+        <td><input type="text" name="stopWordsFile" value="<?php echo $settings->_stopWordsFile; ?>" size="100" /></td>
       </tr>
       <tr title="<?php printMLText("settings_enableFolderTree_desc");?>">
         <td><?php printMLText("settings_enableFolderTree");?>:</td>
@@ -228,27 +228,27 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_Server");?></b></td> </tr>
       <tr title="<?php printMLText("settings_rootDir_desc");?>">
         <td><?php printMLText("settings_rootDir");?>:</td>
-        <td><input name="rootDir" value="<?php echo $settings->_rootDir ?>" size="100" /></td>
+        <td><input type="text" name="rootDir" value="<?php echo $settings->_rootDir ?>" size="100" /></td>
       </tr>
       <tr title="<?php printMLText("settings_httpRoot_desc");?>">
         <td><?php printMLText("settings_httpRoot");?>:</td>
-        <td><input name="httpRoot" value="<?php echo $settings->_httpRoot ?>" size="100" /></td>
+        <td><input type="text" name="httpRoot" value="<?php echo $settings->_httpRoot ?>" size="100" /></td>
       </tr>
       <tr title="<?php printMLText("settings_contentDir_desc");?>">
         <td><?php printMLText("settings_contentDir");?>:</td>
-        <td><input name="contentDir" value="<?php echo $settings->_contentDir ?>" size="100" /></td>
+        <td><input type="text" name="contentDir" value="<?php echo $settings->_contentDir ?>" size="100" /></td>
       </tr>
       <tr title="<?php printMLText("settings_stagingDir_desc");?>">
         <td><?php printMLText("settings_stagingDir");?>:</td>
-        <td><input name="stagingDir" value="<?php echo $settings->_stagingDir ?>" size="100" /></td>
+        <td><input type="text" name="stagingDir" value="<?php echo $settings->_stagingDir ?>" size="100" /></td>
       </tr>
       <tr title="<?php printMLText("settings_luceneDir_desc");?>">
         <td><?php printMLText("settings_luceneDir");?>:</td>
-        <td><input name="luceneDir" value="<?php echo $settings->_luceneDir ?>" size="100" /></td>
+        <td><input type="text" name="luceneDir" value="<?php echo $settings->_luceneDir ?>" size="100" /></td>
       </tr>
       <tr title="<?php printMLText("settings_dropFolderDir_desc");?>">
         <td><?php printMLText("settings_dropFolderDir");?>:</td>
-        <td><input name="dropFolderDir" value="<?php echo $settings->_dropFolderDir ?>" size="100" /></td>
+        <td><input type="text" name="dropFolderDir" value="<?php echo $settings->_dropFolderDir ?>" size="100" /></td>
       </tr>
       <tr title="<?php printMLText("settings_logFileEnable_desc");?>">
         <td><?php printMLText("settings_logFileEnable");?>:</td>
@@ -269,7 +269,7 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_partitionSize_desc");?>">
         <td><?php printMLText("settings_partitionSize");?>:</td>
-        <td><input name="partitionSize" value="<?php echo $settings->_partitionSize ?>" size="100" /></td>
+        <td><input type="text" name="partitionSize" value="<?php echo $settings->_partitionSize ?>" size="100" /></td>
       </tr>
       <!--
         -- SETTINGS - SYSTEM - AUTHENTICATION
@@ -297,7 +297,7 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_passwordЅtrength_desc");?>">
         <td><?php printMLText("settings_passwordStrength");?>:</td>
-        <td><input name="passwordStrength" value="<?php echo $settings->_passwordStrength; ?>" size="2" /></td>
+        <td><input type="text" name="passwordStrength" value="<?php echo $settings->_passwordStrength; ?>" size="2" /></td>
       </tr>
       <tr title="<?php printMLText("settings_passwordStrengthAlgorithm_desc");?>">
         <td><?php printMLText("settings_passwordStrengthAlgorithm");?>:</td>
@@ -326,7 +326,11 @@ if(!is_writeable($settings->_configFilePath)) {
       </tr>
       <tr title="<?php printMLText("settings_encryptionKey_desc");?>">
         <td><?php printMLText("settings_encryptionKey");?>:</td>
-        <td><input name="encryptionKey" value="<?php echo $settings->_encryptionKey; ?>" size="32" /></td>
+        <td><input type="text" name="encryptionKey" value="<?php echo $settings->_encryptionKey; ?>" size="32" /></td>
+      </tr>
+      <tr title="<?php printMLText("settings_cookieLifetime_desc");?>">
+        <td><?php printMLText("settings_cookieLifetime");?>:</td>
+        <td><input type="text" name="cookieLifetime" value="<?php echo $settings->_cookieLifetime; ?>" size="32" /></td>
       </tr>
 
       <!-- TODO Connectors -->
@@ -335,29 +339,25 @@ if(!is_writeable($settings->_configFilePath)) {
         -- SETTINGS - SYSTEM - DATABASE
       -->
       <tr ><td><b> <?php printMLText("settings_Database");?></b></td> </tr>
-      <tr title="<?php printMLText("settings_ADOdbPath_desc");?>">
-        <td><?php printMLText("settings_ADOdbPath");?>:</td>
-        <td><input name="ADOdbPath" value="<?php echo $settings->_ADOdbPath ?>" size="100" /></td>
-      </tr>
       <tr title="<?php printMLText("settings_dbDriver_desc");?>">
         <td><?php printMLText("settings_dbDriver");?>:</td>
-        <td><input name="dbDriver" value="<?php echo $settings->_dbDriver ?>" /></td>
+        <td><input type="text" name="dbDriver" value="<?php echo $settings->_dbDriver ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_dbHostname_desc");?>">
         <td><?php printMLText("settings_dbHostname");?>:</td>
-        <td><input name="dbHostname" value="<?php echo $settings->_dbHostname ?>" /></td>
+        <td><input type="text" name="dbHostname" value="<?php echo $settings->_dbHostname ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_dbDatabase_desc");?>">
         <td><?php printMLText("settings_dbDatabase");?>:</td>
-        <td><input name="dbDatabase" value="<?php echo $settings->_dbDatabase ?>" /></td>
+        <td><input type="text" name="dbDatabase" value="<?php echo $settings->_dbDatabase ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_dbUser_desc");?>">
         <td><?php printMLText("settings_dbUser");?>:</td>
-        <td><input name="dbUser" value="<?php echo $settings->_dbUser ?>" /></td>
+        <td><input type="text" name="dbUser" value="<?php echo $settings->_dbUser ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_dbPass_desc");?>">
         <td><?php printMLText("settings_dbPass");?>:</td>
-        <td><input name="dbPass" value="<?php echo $settings->_dbPass ?>" type="password" /></td>
+        <td><input type="text" name="dbPass" value="<?php echo $settings->_dbPass ?>" type="password" /></td>
       </tr>
 
      <!--
@@ -366,15 +366,15 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_SMTP");?></b></td> </tr>
       <tr title="<?php printMLText("settings_smtpServer_desc");?>">
         <td><?php printMLText("settings_smtpServer");?>:</td>
-        <td><input name="smtpServer" value="<?php echo $settings->_smtpServer ?>" /></td>
+        <td><input type="text" name="smtpServer" value="<?php echo $settings->_smtpServer ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_smtpPort_desc");?>">
         <td><?php printMLText("settings_smtpPort");?>:</td>
-        <td><input name="smtpPort" value="<?php echo $settings->_smtpPort ?>" /></td>
+        <td><input type="text" name="smtpPort" value="<?php echo $settings->_smtpPort ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_smtpSendFrom_desc");?>">
         <td><?php printMLText("settings_smtpSendFrom");?>:</td>
-        <td><input name="smtpSendFrom" value="<?php echo $settings->_smtpSendFrom ?>" /></td>
+        <td><input type="text" name="smtpSendFrom" value="<?php echo $settings->_smtpSendFrom ?>" /></td>
       </tr>
 
     </table>
@@ -390,11 +390,11 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_Display");?></b></td> </tr>
       <tr title="<?php printMLText("settings_siteDefaultPage_desc");?>">
         <td><?php printMLText("settings_siteDefaultPage");?>:</td>
-        <td><input name="siteDefaultPage" value="<?php echo $settings->_siteDefaultPage ?>" size="100" /></td>
+        <td><input type="text" name="siteDefaultPage" value="<?php echo $settings->_siteDefaultPage ?>" size="100" /></td>
       </tr>
       <tr title="<?php printMLText("settings_rootFolderID_desc");?>">
         <td><?php printMLText("settings_rootFolderID");?>:</td>
-        <td><input name="rootFolderID" value="<?php echo $settings->_rootFolderID ?>" /></td>
+        <td><input type="text" name="rootFolderID" value="<?php echo $settings->_rootFolderID ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_titleDisplayHack_desc");?>">
         <td><?php printMLText("settings_titleDisplayHack");?>:</td>
@@ -407,20 +407,29 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_Authentication");?></b></td> </tr>
       <tr title="<?php printMLText("settings_guestID_desc");?>">
         <td><?php printMLText("settings_guestID");?>:</td>
-        <td><input name="guestID" value="<?php echo $settings->_guestID ?>" /></td>
+        <td><input type="text" name="guestID" value="<?php echo $settings->_guestID ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_adminIP_desc");?>">
         <td><?php printMLText("settings_adminIP");?>:</td>
-        <td><input name="adminIP" value="<?php echo $settings->_adminIP ?>" /></td>
+        <td><input type="text" name="adminIP" value="<?php echo $settings->_adminIP ?>" /></td>
       </tr>
 
       <!--
         -- SETTINGS - ADVANCED - EDITION
       -->
       <tr ><td><b> <?php printMLText("settings_Edition");?></b></td> </tr>
+      <tr title="<?php printMLText("settings_workflowMode_desc");?>">
+        <td><?php printMLText("settings_workflowMode");?>:</td>
+        <td>
+				  <select name="workflowMode">
+					  <option value="traditional" <?php if ($settings->_workflowMode=='traditional') echo "selected" ?>><?php printMLText("settings_workflowMode_valtraditional");?></option>
+						<option value="advanced" <?php if ($settings->_workflowMode=='advanced') echo "selected" ?>><?php printMLText("settings_workflowMode_valadvanced");?></option>
+					</select>
+				</td>
+      </tr>
       <tr title="<?php printMLText("settings_versioningFileName_desc");?>">
         <td><?php printMLText("settings_versioningFileName");?>:</td>
-        <td><input name="versioningFileName" value="<?php echo $settings->_versioningFileName ?>" /></td>
+        <td><input type="text" name="versioningFileName" value="<?php echo $settings->_versioningFileName ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_enableAdminRevApp_desc");?>">
         <td><?php printMLText("settings_enableAdminRevApp");?>:</td>
@@ -434,6 +443,10 @@ if(!is_writeable($settings->_configFilePath)) {
         <td><?php printMLText("settings_enableVersionModification");?>:</td>
         <td><input name="enableVersionModification" type="checkbox" <?php if ($settings->_enableVersionModification) echo "checked" ?> /></td>
       </tr>
+      <tr title="<?php printMLText("settings_enableDuplicateDocNames_desc");?>">
+        <td><?php printMLText("settings_enableDuplicateDocNames");?>:</td>
+        <td><input name="enableDuplicateDocNames" type="checkbox" <?php if ($settings->_enableDuplicateDocNames) echo "checked" ?> /></td>
+      </tr>
 
       <!--
         -- SETTINGS - ADVANCED - NOTIFICATION
@@ -454,27 +467,31 @@ if(!is_writeable($settings->_configFilePath)) {
       <tr ><td><b> <?php printMLText("settings_Server");?></b></td> </tr>
       <tr title="<?php printMLText("settings_coreDir_desc");?>">
         <td><?php printMLText("settings_coreDir");?>:</td>
-        <td><input name="coreDir" value="<?php echo $settings->_coreDir ?>" size="100" /></td>
+        <td><input type="text" name="coreDir" value="<?php echo $settings->_coreDir ?>" size="100" /></td>
       </tr>
       <tr title="<?php printMLText("settings_luceneClassDir_desc");?>">
         <td><?php printMLText("settings_luceneClassDir");?>:</td>
-        <td><input name="luceneClassDir" value="<?php echo $settings->_luceneClassDir ?>" size="100" /></td>
+        <td><input type="text" name="luceneClassDir" value="<?php echo $settings->_luceneClassDir ?>" size="100" /></td>
+      </tr>
+      <tr title="<?php printMLText("settings_extraPath_desc");?>">
+        <td><?php printMLText("settings_extraPath");?>:</td>
+        <td><input type="text" name="extraPath" value="<?php echo $settings->_extraPath ?>" size="100" /></td>
       </tr>
       <tr title="<?php printMLText("settings_contentOffsetDir_desc");?>">
         <td><?php printMLText("settings_contentOffsetDir");?>:</td>
-        <td><input name="contentOffsetDir" value="<?php echo $settings->_contentOffsetDir ?>" /></td>
+        <td><input type="text" name="contentOffsetDir" value="<?php echo $settings->_contentOffsetDir ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_maxDirID_desc");?>">
         <td><?php printMLText("settings_maxDirID");?>:</td>
-        <td><input name="maxDirID" value="<?php echo $settings->_maxDirID ?>" /></td>
+        <td><input type="text" name="maxDirID" value="<?php echo $settings->_maxDirID ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_updateNotifyTime_desc");?>">
         <td><?php printMLText("settings_updateNotifyTime");?>:</td>
-        <td><input name="updateNotifyTime" value="<?php echo $settings->_updateNotifyTime ?>" /></td>
+        <td><input type="text" name="updateNotifyTime" value="<?php echo $settings->_updateNotifyTime ?>" /></td>
       </tr>
       <tr title="<?php printMLText("settings_maxExecutionTime_desc");?>">
         <td><?php printMLText("settings_maxExecutionTime");?>:</td>
-        <td><input name="maxExecutionTime" value="<?php echo $settings->_maxExecutionTime ?>" /></td>
+        <td><input type="text" name="maxExecutionTime" value="<?php echo $settings->_maxExecutionTime ?>" /></td>
       </tr>
 
       <tr ><td><b> <?php printMLText("index_converters");?></b></td> </tr>
@@ -483,7 +500,7 @@ if(!is_writeable($settings->_configFilePath)) {
 ?>
       <tr title="<?php echo $mimetype;?>">
         <td><?php echo $mimetype;?>:</td>
-        <td><input name="converters[<?php echo $mimetype;?>]" value="<?php echo $cmd ?>" size="100" /></td>
+        <td><input type="text" name="converters[<?php echo $mimetype;?>]" value="<?php echo $cmd ?>" size="100" /></td>
       </tr>
 <?php
 	}
diff --git a/views/blue/class.Statistic.php b/views/blue/class.Statistic.php
index 742e838a5..d9596f937 100644
--- a/views/blue/class.Statistic.php
+++ b/views/blue/class.Statistic.php
@@ -77,7 +77,7 @@ class SeedDMS_View_Statistic extends SeedDMS_Blue_Style {
 
 		print "</ul>";
 
-		print "<small>".formatted_size($folder_size).", ".$doc_count." ".getMLText("documents")."</small>\n";
+		print "<small>".SeedDMS_Core_File::format_filesize($folder_size).", ".$doc_count." ".getMLText("documents")."</small>\n";
 
 		print "</li>";
 
@@ -114,7 +114,7 @@ class SeedDMS_View_Statistic extends SeedDMS_Blue_Style {
 
 		if (! $document->inheritsAccess()) $this->printAccessList($document);
 
-		print "<small>".formatted_size($folder_size).", ".$local_file_count." ".getMLText("files")."</small>\n";
+		print "<small>".SeedDMS_Core_File::format_filesize($folder_size).", ".$local_file_count." ".getMLText("files")."</small>\n";
 
 		print "</li>";
 
diff --git a/views/blue/class.UpdateDocument.php b/views/blue/class.UpdateDocument.php
index a59289d69..a1ed9f22b 100644
--- a/views/blue/class.UpdateDocument.php
+++ b/views/blue/class.UpdateDocument.php
@@ -122,7 +122,7 @@ function checkForm()
 
 
 <form action="../op/op.UpdateDocument.php" enctype="multipart/form-data" method="post" name="form1" onsubmit="return checkForm();">
-	<input type="Hidden" name="documentid" value="<?php print $document->getID(); ?>">
+	<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
 	<table>
 	
 		<tr>
@@ -144,7 +144,7 @@ function checkForm()
 		<tr>
 			<td><?php printMLText("expires");?>:</td>
 			<td class="standardText">
-				<input type="Radio" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
+				<input type="radio" name="expires" value="false"<?php if (!$document->expires()) print " checked";?>><?php printMLText("does_not_expire");?><br>
 				<input type="radio" name="expires" value="true"<?php if ($document->expires()) print " checked";?>><?php $this->printDateChooser(-1, "exp");?>
 			</td>
 		</tr>
@@ -153,17 +153,16 @@ function checkForm()
 	if($attrdefs) {
 		foreach($attrdefs as $attrdef) {
 ?>
-<tr>
-	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
-	<td><?php $this->printAttributeEditField($attrdef, '') ?></td>
-</tr>
+    <tr>
+	    <td><?php echo htmlspecialchars($attrdef->getName()); ?>:</td>
+	    <td><?php $this->printAttributeEditField($attrdef, '') ?></td>
+    </tr>
 <?php
 		}
 	}
 ?>
 		<tr>
 			<td colspan=2>
-			
 				<?php $this->contentSubHeading(getMLText("assign_reviewers")); ?>
 
 				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
@@ -171,11 +170,8 @@ function checkForm()
 				<ul class="cbSelectList">
 <?php
 				$res=$user->getMandatoryReviewers();
-
 				foreach ($docAccess["users"] as $usr) {
-
-					if ($usr->getID()==$user->getID()) continue; 
-
+					if ($usr->getID()==$user->getID()) continue;
 					$mandatory=false;
 					foreach ($res as $r) if ($r['reviewerUserID']==$usr->getID()) $mandatory=true;
 
@@ -208,9 +204,7 @@ function checkForm()
 				<ul class="cbSelectList">
 <?php
 				$res=$user->getMandatoryApprovers();
-
 				foreach ($docAccess["users"] as $usr) {
-				
 					if ($usr->getID()==$user->getID()) continue; 
 
 					$mandatory=false;
diff --git a/views/blue/class.UserDefaultKeywords.php b/views/blue/class.UserDefaultKeywords.php
index 9e58b9259..3024ad4fb 100644
--- a/views/blue/class.UserDefaultKeywords.php
+++ b/views/blue/class.UserDefaultKeywords.php
@@ -85,11 +85,11 @@ function showKeywords(selectObj) {
 
 		<td id="keywords0" style="display : none;">
 			<form action="../op/op.UserDefaultKeywords.php" method="post" name="addcategory">
-			<input type="Hidden" name="action" value="addcategory">
-			<?php printMLText("name");?> : <input name="name">
+			<input type="hidden" name="action" value="addcategory">
+			<?php printMLText("name");?> : <input type="text" name="name">
 			<input type="Submit" value="<?php printMLText("new_default_keyword_category"); ?>">
 			</form>
-		<td>
+		</td>
 <?php
 		foreach ($categories as $category) {
 			$owner = $category->getOwner();
@@ -112,10 +112,10 @@ function showKeywords(selectObj) {
 					<td><?php echo getMLText("name")?>:</td>
 					<td>
 						<form action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo "category".$category->getID()?>">
-							<input type="Hidden" name="action" value="editcategory">
-							<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
+							<input type="hidden" name="action" value="editcategory">
+							<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
 							<input name="name" value="<?php echo htmlspecialchars($category->getName())?>">
-							<input type="Submit" value="<?php printMLText("save");?>">
+							<input type="submit" value="<?php printMLText("save");?>">
 						</form>
 					</td>
 				</tr>
@@ -133,12 +133,12 @@ function showKeywords(selectObj) {
 								print getMLText("no_default_keywords");
 							else
 								foreach ($lists as $list) {
-						?>
+?>
 									<form action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo "cat".$category->getID().".".$list["id"]?>">
 									<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" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
+									<input type="text" name="keywords" value="<?php echo htmlspecialchars($list["keywords"]) ?>">
 									<input name="action" value="editkeywords" type="Image" src="images/save.gif" title="<?php echo getMLText("save")?>" border="0">
 									<!--	 <input name="action" value="removekeywords" type="Image" src="images/del.gif" title="<?php echo getMLText("delete")?>" border="0"> &nbsp; -->
 									<a href="../op/op.UserDefaultKeywords.php?categoryid=<?php echo $category->getID()?>&keywordsid=<?php echo $list["id"]?>&action=removekeywords"><img src="images/del.gif" title="<?php echo getMLText("delete")?>" border=0></a>
@@ -151,15 +151,14 @@ function showKeywords(selectObj) {
 					<form action="../op/op.UserDefaultKeywords.php" method="post" name="<?php echo $category->getID().".add"?>">
 					<td><input type="Submit" value="<?php printMLText("new_default_keywords");?>"></td>
 					<td>
-						<input type="Hidden" name="action" value="newkeywords">
-						<input type="Hidden" name="categoryid" value="<?php echo $category->getID()?>">
-						<input name="keywords">
+						<input type="hidden" name="action" value="newkeywords">
+						<input type="hidden" name="categoryid" value="<?php echo $category->getID()?>">
+						<input type="text" name="keywords">
 					</td>
 					</form>
 				</tr>
 			</table>
 		</td>
-
 <?php } ?>
 	</tr></table>
 
diff --git a/views/blue/class.UsrMgr.php b/views/blue/class.UsrMgr.php
index 2eee05373..dbb94e533 100644
--- a/views/blue/class.UsrMgr.php
+++ b/views/blue/class.UsrMgr.php
@@ -34,6 +34,7 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Blue_Style {
 	function show() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
+		$seluser = $this->params['seluser'];
 		$users = $this->params['allusers'];
 		$groups = $this->params['allgroups'];
 		$passwordstrength = $this->params['passwordstrength'];
@@ -92,15 +93,14 @@ function showUser(selectObj) {
 <select onchange="showUser(this)" id="selector">
 <option value="-1"><?php echo getMLText("choose_user")?>
 <option value="0"><?php echo getMLText("add_user")?>
-
 <?php
-	$selected=0;
-	$count=2;
-	foreach ($users as $currUser) {
-		if (isset($_GET["userid"]) && $currUser->getID()==$_GET["userid"]) $selected=$count;
-		print "<option value=\"".$currUser->getID()."\">" . htmlspecialchars($currUser->getLogin() . " - ". $currUser->getFullName());
-		$count++;
-}
+		$selected=0;
+		$count=2;
+		foreach ($users as $currUser) {
+			if ($seluser && $currUser->getID()==$seluser->getID()) $selected=$count;
+			print "<option value=\"".$currUser->getID()."\">" . htmlspecialchars($currUser->getLogin() . " - ". $currUser->getFullName());
+			$count++;
+		}
 ?>
 </select>
 &nbsp;&nbsp;
@@ -114,7 +114,7 @@ function showUser(selectObj) {
 	<table>
 		<tr>
 			<td><?php printMLText("user_login");?>:</td>
-			<td><input name="login"></td>
+			<td><input type="text" name="login"></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("password");?>:</td>
@@ -122,7 +122,7 @@ function showUser(selectObj) {
 		</tr>
 		<tr>
 			<td><?php printMLText("confirm_pwd");?>:</td>
-			<td><input type="Password" name="pwdconf"></td>
+			<td><input type="password" name="pwdconf"></td>
 		</tr>
 <?php
 		if($passwordexpiration > 0) {
@@ -136,11 +136,11 @@ function showUser(selectObj) {
 ?>
 		<tr>
 			<td><?php printMLText("user_name");?>:</td>
-			<td><input name="name"></td>
+			<td><input type="text" name="name"></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("email");?>:</td>
-			<td><input name="email"></td>
+			<td><input type="text" name="email"></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("comment");?>:</td>
@@ -159,14 +159,14 @@ function showUser(selectObj) {
 			<td><input type="checkbox" name="isdisabled" value="1"></td>
 		</tr>
 
-		<?php if ($enableuserimage){ ?>
+<?php if ($enableuserimage){ ?>
 
-			<tr>
-				<td><?php printMLText("user_image");?>:</td>
-				<td><input type="File" name="userfile"></td>
-			</tr>
+		<tr>
+			<td><?php printMLText("user_image");?>:</td>
+			<td><input type="File" name="userfile"></td>
+		</tr>
 
-		<?php } ?>
+<?php } ?>
 
 		<tr>
 			<td><?php printMLText("reviewers");?>:</td>
@@ -249,16 +249,16 @@ function showUser(selectObj) {
 
 	<form action="../op/op.UsrMgr.php" method="post" enctype="multipart/form-data" name="form<?php print $currUser->getID();?>" onsubmit="return checkForm('<?php print $currUser->getID();?>');">
 	<?php echo createHiddenFieldWithKey('edituser'); ?>
-	<input type="Hidden" name="userid" value="<?php print $currUser->getID();?>">
-	<input type="Hidden" name="action" value="edituser">
+	<input type="hidden" name="userid" value="<?php print $currUser->getID();?>">
+	<input type="hidden" name="action" value="edituser">
 	<table>
 		<tr>
 			<td><?php printMLText("user_login");?>:</td>
-			<td><input name="login" value="<?php print htmlspecialchars($currUser->getLogin());?>"></td>
+			<td><input type="text" name="login" value="<?php print htmlspecialchars($currUser->getLogin());?>"></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("password");?>:</td>
-			<td><input type="Password" class="pwd" rel="outerstrength<?php echo $currUser->getID(); ?>" name="pwd"> <div id="outerstrength<?php echo $currUser->getID(); ?>" style="min-width: 100px; height: 14px; display: inline-block; border: 1px solid black; padding: 1px;"><div id="innerstrength" style="width: 0px; height: 14px; display: inline-block; border: 0px; padding: 0px; background-color: red;">&nbsp;</div> <div id="strength" style="display: inline-block;"></td>
+			<td><input type="password" class="pwd" rel="outerstrength<?php echo $currUser->getID(); ?>" name="pwd"> <div id="outerstrength<?php echo $currUser->getID(); ?>" style="min-width: 100px; height: 14px; display: inline-block; border: 1px solid black; padding: 1px;"><div id="innerstrength" style="width: 0px; height: 14px; display: inline-block; border: 0px; padding: 0px; background-color: red;">&nbsp;</div> <div id="strength" style="display: inline-block;"></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("confirm_pwd");?>:</td>
@@ -276,11 +276,11 @@ function showUser(selectObj) {
 ?>
 		<tr>
 			<td><?php printMLText("user_name");?>:</td>
-			<td><input name="name" value="<?php print htmlspecialchars($currUser->getFullName());?>"></td>
+			<td><input type="text" name="name" value="<?php print htmlspecialchars($currUser->getFullName());?>"></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("email");?>:</td>
-			<td><input name="email" value="<?php print htmlspecialchars($currUser->getEmail()) ;?>"></td>
+			<td><input type="text" name="email" value="<?php print htmlspecialchars($currUser->getEmail()) ;?>"></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("comment");?>:</td>
@@ -299,25 +299,25 @@ function showUser(selectObj) {
 			<td><input type="checkbox" name="isdisabled" value="1"<?php print ($currUser->isDisabled() ? " checked='checked'" : "");?>></td>
 		</tr>
 
-		<?php if ($enableuserimage){ ?>
+<?php if ($enableuserimage){ ?>
 
-			<tr>
-				<td><?php printMLText("user_image");?>:</td>
-				<td>
-					<?php
-						if ($currUser->hasImage())
-							print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
-						else
-							printMLText("no_user_image");
-					?>
-				</td>
-			</tr>
-			<tr>
-				<td><?php printMLText("new_user_image");?>:</td>
-				<td><input type="file" name="userfile" accept="image/jpeg"></td>
-			</tr>
+		<tr>
+			<td><?php printMLText("user_image");?>:</td>
+			<td>
+<?php
+					if ($currUser->hasImage())
+						print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
+					else
+						printMLText("no_user_image");
+?>
+			</td>
+		</tr>
+		<tr>
+			<td><?php printMLText("new_user_image");?>:</td>
+			<td><input type="file" name="userfile" accept="image/jpeg"></td>
+		</tr>
 
-		<?php } ?>
+<?php } ?>
 
 
 		<tr>
@@ -340,7 +340,7 @@ function showUser(selectObj) {
 
 					print "<li class=\"cbSelectItem\"><input id='revUsr".$usr->getID()."' type='checkbox' ".($checked?"checked='checked' ":"")."name='usrReviewers[]' value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin())."</li>\n";
 				}
-				?>
+?>
 				</ul>
 				</div>
 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
@@ -354,7 +354,7 @@ function showUser(selectObj) {
 
 					print "<li class=\"cbSelectItem\"><input id='revGrp".$grp->getID()."' type='checkbox' ".($checked?"checked='checked' ":"")."name='grpReviewers[]' value='". $grp->getID() ."'>".htmlspecialchars($grp->getName())."</li>\n";
 				}
-				?>
+?>
 				</ul>
 				</div>
 			</td>
@@ -366,12 +366,9 @@ function showUser(selectObj) {
 				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
 				<div class="cbSelectContainer">
 				<ul class="cbSelectList">
-				<?php
-
+<?php
 				$res=$currUser->getMandatoryApprovers();
-
 				foreach ($users as $usr) {
-
 					if ($usr->isGuest() || ($usr->getID() == $currUser->getID()))
 						continue;
 
@@ -380,13 +377,13 @@ function showUser(selectObj) {
 
 					print "<li class=\"cbSelectItem\"><input id='appUsr".$usr->getID()."' type='checkbox' ".($checked?"checked='checked' ":"")."name='usrApprovers[]' value='". $usr->getID() ."'>".htmlspecialchars($usr->getLogin())."</li>\n";
 				}
-				?>
+?>
 				</ul>
 				</div>
 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
 				<div class="cbSelectContainer">
 				<ul class="cbSelectList">
-				<?php
+<?php
 				foreach ($groups as $grp) {
 
 					$checked=false;
@@ -394,7 +391,7 @@ function showUser(selectObj) {
 
 					print "<li class=\"cbSelectItem\"><input id='revGrp".$grp->getID()."' type='checkbox' ".($checked?"checked='checked' ":"")."name='grpApprovers[]' value='". $grp->getID() ."'>".htmlspecialchars($grp->getName())."</li>\n";
 				}
-				?>
+?>
 				</ul>
 				</div>
 			</td>
diff --git a/views/blue/class.ViewFolder.php b/views/blue/class.ViewFolder.php
index 18696bed7..19f2c9a97 100644
--- a/views/blue/class.ViewFolder.php
+++ b/views/blue/class.ViewFolder.php
@@ -71,7 +71,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Blue_Style {
 		<?php
 			}
 		}
-		print "</table>\n";
+		echo "</table>\n";
 		$this->contentContainerEnd();
 
 		$this->contentHeading(getMLText("folder_contents"));