From 4590a14de1fb430acae7b1ee7f894f93288861e4 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 09:01:20 +0200
Subject: [PATCH 1/5] fix html_link(), link attributes can't be added

---
 inc/inc.ClassViewCommon.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/inc.ClassViewCommon.php b/inc/inc.ClassViewCommon.php
index 00ecbe8f3..791586658 100644
--- a/inc/inc.ClassViewCommon.php
+++ b/inc/inc.ClassViewCommon.php
@@ -229,7 +229,8 @@ class SeedDMS_View_Common {
 		$url = $this->html_url($view, $urlparams);
 		$tag = "<a href=\"".$url."\"";
 		if($linkparams)
-			array_walk($linkparams, function($v, $k) {$tag .= " ".$k."=\"".$v."\"";});
+			foreach($linkparams as $k=>$v)
+				$tag .= " ".$k."=\"".$v."\"";
 		$tag .= ">".($hsc ? htmlspecialchars($link) : $link)."</a>";
 		return $tag;
 	} /* }}} */

From 5912354f098a89671220fefd2aac0255ac13b1c0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 09:01:59 +0200
Subject: [PATCH 2/5] set accessobject in view

---
 out/out.Settings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/out/out.Settings.php b/out/out.Settings.php
index 271f089ac..7446e6e3f 100644
--- a/out/out.Settings.php
+++ b/out/out.Settings.php
@@ -38,6 +38,7 @@ if(!trim($settings->_encryptionKey))
 if($view) {
 	$view->setParam('settings', $settings);
 	$view->setParam('currenttab', (isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : ''));
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }

From ae3c5faef5e0f1fc254812c9b2af7141b644d405 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 09:02:30 +0200
Subject: [PATCH 3/5] use html_link()

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

diff --git a/views/bootstrap/class.GroupMgr.php b/views/bootstrap/class.GroupMgr.php
index 951e19309..2438f17e7 100644
--- a/views/bootstrap/class.GroupMgr.php
+++ b/views/bootstrap/class.GroupMgr.php
@@ -169,7 +169,7 @@ $(document).ready( function() {
 ?>
 		<tr>
 			<td></td>
-			<td><a href="../out/out.RemoveGroup.php?groupid=<?php print $group->getID();?>" class="btn"><i class="icon-remove"></i> <?php printMLText("rm_group");?></a></td>
+			<td><?php echo $this->html_link('RemoveGroup', array('groupid'=>$group->getID()), array('class'=>'btn'), '<i class="icon-remove"></i> '.getMLText("rm_group"), false); ?></td>
 		</tr>
 <?php
 		}

From 7ed8801f46a1418c7a62427a5e16c3d4b77b6c9c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 09:02:57 +0200
Subject: [PATCH 4/5] user html_url() and html_link()

---
 views/bootstrap/class.UserList.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/views/bootstrap/class.UserList.php b/views/bootstrap/class.UserList.php
index 931f7e3fc..339829b94 100644
--- a/views/bootstrap/class.UserList.php
+++ b/views/bootstrap/class.UserList.php
@@ -56,7 +56,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			echo "<tr>";
 			echo "<td>";
 			if ($currUser->hasImage())
-				print "<img width=\"50\" src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
+				print "<img width=\"50\" src=\"".$this->html_url('UserImage', array('userid'=>$currUser->getId()))."\" >";
 			echo "</td>";
 			echo "<td>";
 			echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")<br />";
@@ -105,11 +105,12 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
 			}
 			echo "</td>";
 			echo "<td>";
-			echo "<div class=\"list-action\">";
-			echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> ";
-			if ($this->check_access('RemoveUser'))
-     	echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"icon-remove\"></i></a>";
-			echo "</div>";
+			if($this->check_access(array('UsrMgr', 'RemoveUser'))) {
+				echo "<div class=\"list-action\">";
+				echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '<i class="icon-edit"></i>', false);
+				echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="icon-remove"></i>', false);
+				echo "</div>";
+			}
 			echo "</td>";
 			echo "</tr>";
 		}

From dccb4c476a32c61d19bf98607347ca0e76f8464f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 20 Apr 2016 09:03:15 +0200
Subject: [PATCH 5/5] use html_url() for image

---
 views/bootstrap/class.UsrMgr.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 6b4560857..e241b0a37 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -189,7 +189,7 @@ $(document).ready( function() {
 ?>
 		<tr>
 			<td></td>
-			<td><a class="btn" href="../out/out.RemoveUser.php?userid=<?php print $currUser->getID();?>"><i class="icon-remove"></i> <?php printMLText("rm_user");?></a></td>
+			<td><?php echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array('class'=>'btn'), '<i class="icon-remove"></i> '.getMLText("rm_user"), false); ?></td>
 		</tr>
 <?php
 	}
@@ -292,7 +292,7 @@ $(document).ready( function() {
 			<td>
 <?php
 					if ($currUser->hasImage())
-						print "<img src=\"".$httproot . "out/out.UserImage.php?userid=".$currUser->getId()."\">";
+						print "<img src=\"".$this->html_url('UserImage', array('userid'=>$currUser->getId()))."\" >";
 					else
 						printMLText("no_user_image");
 ?>