Merge branch 'develop' into hooks

CHANGELOG

@@ -28,6 +28,10 @@
 - set encoding of terms when adding document to full text index (Bug #66)
 - droped support for myisam database engine
 - add support for connecting to ldap servers without anonymous bind
+- if user has a mandatory workflow, don't him/her set a workflow on
+  insert/update of a document
+- fixed calculation of password strength when simple password strength
+  is set and user data is saved (Bug #69)
 
 --------------------------------------------------------------------------------
                      Changes in version 4.2.2

op/op.AddDocument.php

@@ -88,11 +88,6 @@ foreach($attributes_version as $attrdefid=>$attribute) {
 }
 
 
-if(isset($_POST["workflow"]))
-	$workflow = $dms->getWorkflow($_POST["workflow"]);
-else
-	$workflow = null;
-
 $reqversion = (int)$_POST["reqversion"];
 if ($reqversion<1) $reqversion=1;
 
@@ -184,6 +179,14 @@ foreach ($res as $r){
 	}
 }
 
+if(!$workflow = $user->getMandatoryWorkflow()) {
+	if(isset($_POST["workflow"]))
+		$workflow = $dms->getWorkflow($_POST["workflow"]);
+	else
+		$workflow = null;
+}
+
+
 if($settings->_dropFolderDir) {
 	if(isset($_POST["dropfolderfileform1"]) && $_POST["dropfolderfileform1"]) {
 		$fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileform1"];

op/op.UpdateDocument.php

@@ -168,6 +168,8 @@ if ($_FILES['userfile']['error'] == 0) {
 		}
 	}
 
+	$workflow = $user->getMandatoryWorkflow();
+
 	if(isset($_POST["attributes"]) && $_POST["attributes"]) {
 		$attributes = $_POST["attributes"];
 		foreach($attributes as $attrdefid=>$attribute) {
@@ -184,7 +186,7 @@ if ($_FILES['userfile']['error'] == 0) {
 		$attributes = array();
 	}
 
-	$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers, $version=0, $attributes);
+	$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $fileType, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow);
 	if (is_bool($contentResult) && !$contentResult) {
 		UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
 	}

op/op.UsrMgr.php

@@ -202,9 +202,12 @@ else if ($action == "edituser") {
 		if($settings->_passwordStrength) {
 			$ps = new Password_Strength();
 			$ps->set_password($_POST["pwd"]);
+			if($settings->_passwordStrengthAlgorithm == 'simple')
+				$ps->simple_calculate();
+			else
 				$ps->calculate();
 			$score = $ps->get_score();
-			if($score > $settings->_passwordStrength) {
+			if($score >= $settings->_passwordStrength) {
 				$editedUser->setPwd(md5($pwd));
 				$editedUser->setPwdExpiration($pwdexpiration);
 			} else {

views/bootstrap/class.AddDocument.php

@@ -215,9 +215,17 @@ function addFiles()
 			<div class="cbSelectTitle"><?php printMLText("workflow");?>:</div>
       </td>
       <td>
-        <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
 <?php
 				$mandatoryworkflow = $user->getMandatoryWorkflow();
+				if($mandatoryworkflow) {
+?>
+				<?php echo $mandatoryworkflow->getName(); ?>
+				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflow->getID(); ?>">
+<?php
+				} else {
+?>
+        <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
+<?php
 					$workflows=$dms->getAllWorkflows();
 					print "<option value=\"\">"."</option>";
 					foreach ($workflows as $workflow) {
@@ -228,6 +236,9 @@ function addFiles()
 					}
 ?>
         </select>
+<?php
+				}
+?>
       </td>
     </tr>
 		<tr>	

views/bootstrap/class.UpdateDocument.php

@@ -274,9 +274,17 @@ function checkForm()
 			<div class="cbSelectTitle"><?php printMLText("workflow");?>:</div>
       </td>
       <td>
-        <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
 <?php
 				$mandatoryworkflow = $user->getMandatoryWorkflow();
+				if($mandatoryworkflow) {
+?>
+				<?php echo $mandatoryworkflow->getName(); ?>
+				<input type="hidden" name="workflow" value="<?php echo $mandatoryworkflow->getID(); ?>">
+<?php
+				} else {
+?>
+        <select class="_chzn-select-deselect span9" name="workflow" data-placeholder="<?php printMLText('select_workflow'); ?>">
+<?php
 					$workflows=$dms->getAllWorkflows();
 					print "<option value=\"\">"."</option>";
 					foreach ($workflows as $workflow) {
@@ -287,6 +295,9 @@ function checkForm()
 					}
 ?>
         </select>
+<?php
+				}
+?>
       </td>
     </tr>
 		<tr>