From b2715684a3b113564a121e42b61f12dd06179035 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 19 Nov 2019 18:21:34 +0100
Subject: [PATCH] use formField() instead of plain html

---
 .../class.RemoveUserFromProcesses.php         | 159 ++++++++++++------
 1 file changed, 111 insertions(+), 48 deletions(-)

diff --git a/views/bootstrap/class.RemoveUserFromProcesses.php b/views/bootstrap/class.RemoveUserFromProcesses.php
index 768f09c49..ec202ce24 100644
--- a/views/bootstrap/class.RemoveUserFromProcesses.php
+++ b/views/bootstrap/class.RemoveUserFromProcesses.php
@@ -80,66 +80,129 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Bootstrap_Style {
 		}
 ?>
 <?php if(isset($tmpr["0"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[review][]" value="0" checked> <?php echo getMLText('reviews_not_touched', array('no_reviews' => count($tmpr["0"]))); ?> <?php echo getMLText('reviews_not_touched_latest', array('no_reviews' => $cr["0"])); ?>
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('reviews_not_touched', array('no_reviews' => count($tmpr["0"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[review][]',
+				'value'=>'0',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('', ' '.getMLText('reviews_not_touched_latest', array('no_reviews' => $cr["0"])))
+			)
+		);
+?>
 <?php } ?>
 <?php if(isset($tmpr["1"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[review][]" value="1"> <?php echo getMLText('reviews_accepted', array('no_reviews' => count($tmpr["1"]))); ?> <?php echo getMLText('reviews_accepted_latest', array('no_reviews' => $cr["1"])); ?><br />
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('reviews_accepted', array('no_reviews' => count($tmpr["1"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[approval][]',
+				'value'=>'1',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('', ' '.getMLText('reviews_accepted_latest', array('no_reviews' => $cr["1"])))
+			)
+		);
+?>
 <?php } ?>
 <?php if(isset($tmpr["-1"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[review][]" value="-1"> <?php echo getMLText('reviews_rejected', array('no_reviews' => count($tmpr["-1"]))); ?> <?php echo getMLText('reviews_rejected_latest', array('no_reviews' => $cr["-1"])); ?><br />
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('reviews_rejected', array('no_reviews' => count($tmpr["-1"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[approval][]',
+				'value'=>'-1',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('', ' '.getMLText('reviews_rejected_latest', array('no_reviews' => $cr["-1"])))
+			)
+		);
+?>
 <?php } ?>
 
 <?php if(isset($tmpa["0"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[approval][]" value="0" checked> <?php echo getMLText('approvals_not_touched', array('no_approvals' => count($tmpa["0"]))); ?> <?php echo getMLText('approvals_not_touched_latest', array('no_approvals' => $ca["0"])); ?>
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('approvals_not_touched', array('no_approvals' => count($tmpa["0"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[approval][]',
+				'value'=>'0',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('', ' '.getMLText('approvals_not_touched_latest', array('no_approvals' => $ca["0"])))
+			)
+		);
+?>
 <?php } ?>
 <?php if(isset($tmpa["1"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[approval][]" value="1"> <?php echo getMLText('approvals_accepted', array('no_approvals' => count($tmpa["1"]))); ?> <?php echo getMLText('approvals_accepted_latest', array('no_approvals' => $ca["1"])); ?><br />
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('approvals_accepted', array('no_approvals' => count($tmpa["1"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[approval][]',
+				'value'=>'1',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('', ' '.getMLText('approvals_accepted_latest', array('no_approvals' => $ca["1"])))
+			)
+		);
+?>
 <?php } ?>
 <?php if(isset($tmpa["-1"])) { ?>
-<div class="control-group">
-	<div class="controls">
-		<label class="checkbox">
-	<input type="checkbox" name="status[approval][]" value="-1"> <?php echo getMLText('approvals_rejected', array('no_approvals' => count($tmpa["-1"]))); ?> <?php echo getMLText('approvals_rejected_latest', array('no_approvals' => $ca["-1"])); ?><br />
-		</label>
-	</div>
-</div>
+<?php
+		$this->formField(
+			getMLText('approvals_rejected', array('no_approvals' => count($tmpa["-1"]))),
+			array(
+				'element'=>'input',
+				'type'=>'checkbox',
+				'name'=>'status[approval][]',
+				'value'=>'-1',
+				'checked'=>true
+			),
+			array(
+				'field_wrap' => array('', ' '.getMLText('approvals_rejected_latest', array('no_approvals' => $ca["-1"])))
+			)
+		);
+?>
 <?php } ?>
-
-<div class="control-group">
-	<div class="controls">
-<button type="submit" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_user_from_processes");?></button>
-	</div>
-</div>
+<?php
+		/*
+		$options = array();
+		$allUsers = $dms->getAllUsers($sortusersinlist);
+		foreach ($allUsers as $currUser) {
+			if (!$currUser->isGuest())
+				$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), ($currUser->getID()==$user->getID()), array(array('data-subtitle', htmlspecialchars($currUser->getFullName()))));
+		}
+		$this->formField(
+			getMLText("user"),
+			array(
+				'element'=>'select',
+				'id'=>'newuser',
+				'name'=>'newuserid',
+				'class'=>'chzn-select',
+				'options'=>$options
+			)
+		);
+		 */
+		$this->formSubmit("<i class=\"icon-remove\"></i> ".getMLText('rm_user_from_processes'));
+?>
 
 </form>
 <?php