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 = "$v) + $tag .= " ".$k."=\"".$v."\""; $tag .= ">".($hsc ? htmlspecialchars($link) : $link).""; return $tag; } /* }}} */ 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; } 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() { ?> - + html_link('RemoveGroup', array('groupid'=>$group->getID()), array('class'=>'btn'), ' '.getMLText("rm_group"), false); ?> "; echo ""; if ($currUser->hasImage()) - print ""; + print "html_url('UserImage', array('userid'=>$currUser->getId()))."\" >"; echo ""; echo ""; echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")
"; @@ -105,11 +105,12 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style { } echo ""; echo ""; - echo "
"; - echo "getID()."\"> "; - if ($this->check_access('RemoveUser')) - echo "getID()."\">"; - echo "
"; + if($this->check_access(array('UsrMgr', 'RemoveUser'))) { + echo "
"; + echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '', false); + echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '', false); + echo "
"; + } echo ""; echo ""; } 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() { ?> - + html_link('RemoveUser', array('userid'=>$currUser->getID()), array('class'=>'btn'), ' '.getMLText("rm_user"), false); ?> hasImage()) - print ""; + print "html_url('UserImage', array('userid'=>$currUser->getId()))."\" >"; else printMLText("no_user_image"); ?>