gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-07 05:39:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2016-04-20 09:05:13 +02:00
commit c14aaf02a6
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/inc.ClassViewCommon.php
View File

@ -229,7 +229,8 @@ class SeedDMS_View_Common {
$url = $this->html_url($view, $urlparams); $url = $this->html_url($view, $urlparams);
$tag = "<a href=\"".$url."\""; $tag = "<a href=\"".$url."\"";
if($linkparams) 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>"; $tag .= ">".($hsc ? htmlspecialchars($link) : $link)."</a>";
return $tag; return $tag;
} /* }}} */ } /* }}} */

1
out/out.Settings.php
View File

@ -38,6 +38,7 @@ if(!trim($settings->_encryptionKey))
if($view) { if($view) {
$view->setParam('settings', $settings); $view->setParam('settings', $settings);
$view->setParam('currenttab', (isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : '')); $view->setParam('currenttab', (isset($_REQUEST['currenttab']) ? $_REQUEST['currenttab'] : ''));
$view->setParam('accessobject', $accessop);
$view($_GET); $view($_GET);
exit; exit;
} }

2
views/bootstrap/class.GroupMgr.php
View File

@ -169,7 +169,7 @@ $(document).ready( function() {
?> ?>
<tr> <tr>
<td></td> <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> </tr>
<?php <?php
} }

13
views/bootstrap/class.UserList.php
View File

@ -56,7 +56,7 @@ class SeedDMS_View_UserList extends SeedDMS_Bootstrap_Style {
echo "<tr>"; echo "<tr>";
echo "<td>"; echo "<td>";
if ($currUser->hasImage()) 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 "<td>"; echo "<td>";
echo htmlspecialchars($currUser->getFullName())." (".htmlspecialchars($currUser->getLogin()).")<br />"; 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 "<td>"; echo "<td>";
echo "<div class=\"list-action\">"; if($this->check_access(array('UsrMgr', 'RemoveUser'))) {
echo "<a href=\"../out/out.UsrMgr.php?userid=".$currUser->getID()."\"><i class=\"icon-edit\"></i></a> "; echo "<div class=\"list-action\">";
if ($this->check_access('RemoveUser')) echo $this->html_link('UsrMgr', array('userid'=>$currUser->getID()), array(), '<i class="icon-edit"></i>', false);
echo "<a href=\"../out/out.RemoveUser.php?userid=".$currUser->getID()."\"><i class=\"icon-remove\"></i></a>"; echo $this->html_link('RemoveUser', array('userid'=>$currUser->getID()), array(), '<i class="icon-remove"></i>', false);
echo "</div>"; echo "</div>";
}
echo "</td>"; echo "</td>";
echo "</tr>"; echo "</tr>";
} }

4
views/bootstrap/class.UsrMgr.php
View File

@ -189,7 +189,7 @@ $(document).ready( function() {
?> ?>
<tr> <tr>
<td></td> <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> </tr>
<?php <?php
} }
@ -292,7 +292,7 @@ $(document).ready( function() {
<td> <td>
<?php <?php
if ($currUser->hasImage()) 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 else
printMLText("no_user_image"); printMLText("no_user_image");
?> ?>