gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-23 01:51:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix output of log lines

Browse Source
This commit is contained in:
Uwe Steinmann 2020-07-27 15:30:30 +02:00
parent 4cc66dd2b9
commit 40a6de0353
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/class.UserListCsv.php
View File

@ -36,12 +36,12 @@ class SeedDMS_Controller_UserListCsv extends SeedDMS_Controller_Common {
$header = array('login', 'name', 'email', 'comment', 'role', 'quota', 'homefolder'); $header = array('login', 'name', 'email', 'comment', 'role', 'quota', 'homefolder');
for($i=1; $i<=$m; $i++) for($i=1; $i<=$m; $i++)
$header[] = 'group_'.$i; $header[] = 'group_'.$i;
fputcsv($fp, $header); fputcsv($fp, $header, ';');
foreach($allUsers as $u) { foreach($allUsers as $u) {
$data = array($u->getLogin(), $u->getFullName(), $u->getEmail(), $u->getComment(), $u->isAdmin() ? 'admin' : ($u->isGuest() ? 'guest' : 'user'), $u->getQuota(), $u->getHomeFolder() ? $u->getHomeFolder() : ''); $data = array($u->getLogin(), $u->getFullName(), $u->getEmail(), $u->getComment(), $u->isAdmin() ? 'admin' : ($u->isGuest() ? 'guest' : 'user'), $u->getQuota(), $u->getHomeFolder() ? $u->getHomeFolder() : '');
foreach($u->getGroups() as $g) foreach($u->getGroups() as $g)
$data[] = $g->getName(); $data[] = $g->getName();
fputcsv($fp, $data); fputcsv($fp, $data, ';');
} }
$efilename = 'userlist-'.date('Ymd-His').'.csv'; $efilename = 'userlist-'.date('Ymd-His').'.csv';
header("Content-Type: text/csv"); header("Content-Type: text/csv");

18
op/op.ImportUsers.php
View File

@ -127,7 +127,7 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
$newusers[] = $md; $newusers[] = $md;
} }
} }
// print_r($newusers); // echo "<pre>";print_r($newusers);echo "</pre>";
$makeupdate = !empty($_POST['update']); $makeupdate = !empty($_POST['update']);
foreach($newusers as $u) { foreach($newusers as $u) {
if($eu = $dms->getUserByLogin($u['login'])) { if($eu = $dms->getUserByLogin($u['login'])) {
@ -141,28 +141,28 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
if($makeupdate) if($makeupdate)
$eu->setEmail($u['email']); $eu->setEmail($u['email']);
} }
if(isset($u['comment'])) { if(isset($u['comment']) && $u['comment'] != $eu->getComment()) {
$log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Comment of user updated. '".$u['comment']."' != '".$eu->getComment()."'"); $log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Comment of user updated. '".$u['comment']."' != '".$eu->getComment()."'");
if($makeupdate) if($makeupdate)
$eu->setComment($u['comment']); $eu->setComment($u['comment']);
} }
if(isset($u['language'])) { if(isset($u['language']) && $u['language'] != $eu->getLanguage()) {
$log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Language of user updated. '".$u['language']."' != '".$eu->getLanguage()."'"); $log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Language of user updated. '".$u['language']."' != '".$eu->getLanguage()."'");
if($makeupdate) if($makeupdate)
$eu->setLanguage($u['language']); $eu->setLanguage($u['language']);
} }
if(isset($u['quota'])) { if(isset($u['quota']) && $u['quota'] != $eu->getQuota()) {
$log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Quota of user updated. '".$u['quota']."' != '".$eu->getQuota()."'"); $log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Quota of user updated. '".$u['quota']."' != '".$eu->getQuota()."'");
if($makeupdate) if($makeupdate)
$eu->setQuota($u['language']); $eu->setQuota($u['language']);
} }
if(isset($u['homefolder'])) { if(isset($u['homefolder']) && $u['homefolder']->getId() != $eu->getHomeFolder()) {
$log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Homefolder of user updated. '".($u['homefolder'] ? $u['homefolder']->getId() : '')."' != '".($eu->getHomeFolder() ? $eu->getHomeFolder()->getId() : '')."'"); $log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Homefolder of user updated. '".(is_object($u['homefolder']) ? $u['homefolder']->getId() : '')."' != '".($eu->getHomeFolder() ? $eu->getHomeFolder() : '')."'");
if($makeupdate) if($makeupdate)
$eu->setHomeFolder($u['homefolder']); $eu->setHomeFolder($u['homefolder']);
} }
if(isset($u['groups'])) { $func = function($o) {return $o->getID();};
$func = function($o) {return $o->getID();}; if(isset($u['groups']) && implode(',',array_map($func, $u['groups'])) != implode(',',array_map($func, $eu->getGroups()))) {
$log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Groups of user updated. '".implode(',',array_map($func, $u['groups']))."' != '".implode(',',array_map($func, $eu->getGroups()))."'"); $log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "Groups of user updated. '".implode(',',array_map($func, $u['groups']))."' != '".implode(',',array_map($func, $eu->getGroups()))."'");
if($makeupdate) { if($makeupdate) {
foreach($eu->getGroups() as $g) foreach($eu->getGroups() as $g)
@ -171,7 +171,7 @@ if (isset($_FILES['userdata']) && $_FILES['userdata']['error'] == 0) {
$eu->joinGroup($g); $eu->joinGroup($g);
} }
} }
$log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "User '".$u['name']."' updated."); // $log[] = array('id'=>$eu->getLogin(), 'type'=>'success', 'msg'=> "User '".$eu->getLogin()."' updated.");
} else { } else {
if(!empty($_POST['addnew'])) { if(!empty($_POST['addnew'])) {
if(!empty($u['login']) && !empty($u['name']) && !empty($u['email'])) { if(!empty($u['login']) && !empty($u['name']) && !empty($u['email'])) {

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

@ -87,7 +87,7 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Bootstrap_Style {
echo "<th>".getMLText('message')."</th></tr>\n"; echo "<th>".getMLText('message')."</th></tr>\n";
foreach($log as $item) { foreach($log as $item) {
$class = $item['type'] == 'success' ? 'success' : 'error'; $class = $item['type'] == 'success' ? 'success' : 'error';
echo "<tr class=\"".$class."\"><td>".$item['id']."</td><td>".$item['msg']."</td></tr>\n"; echo "<tr class=\"".$class."\"><td>".$item['id']."</td><td>".htmlspecialchars($item['msg'])."</td></tr>\n";
} }
echo "</table>"; echo "</table>";
} }