projects / brisk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6bce5ab)
minor fixes and more info in usermgmt added
authorMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Sun, 25 May 2014 16:07:07 +0000 (18:07 +0200)
committerMatteo Nastasi (mop) <nastasi@alternativeoutput.it>
Sun, 25 May 2014 16:07:07 +0000 (18:07 +0200)
TODO.txt patch | blob | history
web/Obj/brisk.phh patch | blob | history
web/usermgmt.php patch | blob | history

diff --git a/TODO.txt b/TODO.txt
index f529897..5c96cc9 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -71,7 +71,7 @@
                            with password
 -------------------------------------------------------------------------
 
-     . More user info in the list
+     DONE . More user info in the list
      DONE . Manage date to display when a user was required
      . Email-address expiration check
      . Account expiration
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index c3cb777..6a9547d 100644 (file)
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -509,7 +509,7 @@ function escinput($s)
 
 function eschtml($s)
 {
-    return htmlentities($s);
+    return htmlentities($s, ENT_COMPAT, "UTF-8");
 }
 
 function esclfhtml($s)
diff --git a/web/usermgmt.php b/web/usermgmt.php
index 413e173..4741ec5 100644 (file)
--- a/web/usermgmt.php
+++ b/web/usermgmt.php
@@ -228,15 +228,19 @@ SELECT usr.*, guar.login AS guar_login
                 break;
             }
             $usr_n = pg_numrows($usr_pg);
-            $tab_lines = "";
+            $tab_lines = "<tr><th></th><th>User</th><th>Guar</th><th>Date</th></tr>";
             for ($i = 0 ; $i < $usr_n ; $i++) {
                 $usr_obj = pg_fetch_object($usr_pg, $i);
 
-                $tab_lines .= sprintf("<tr><td><input name=\"f_newuser%d\" type=\"checkbox\" CHECKED></td><td>%s</td><td></td></tr>\n",
-                                      $usr_obj->code, eschtml($usr_obj->login), eschtml($usr_obj->guar_login));
+                $tab_lines .= sprintf("<tr><td><input name=\"f_newuser%d\" type=\"checkbox\" CHECKED></td><td>%s</td><td>%s</td><td>%s</td></tr>\n",
+                                      $usr_obj->code, eschtml($usr_obj->login), eschtml($usr_obj->guar_login), $usr_obj->lintm);
             }
             ?>
 <html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Brisk: new imported users management.</title>
+</head>
 <body>
 <h2> New imported users management.</h2>
      <?php if ($status != "") { echo "$status"; } ?>
@@ -355,15 +359,20 @@ SELECT usr.*, guar.login AS guar_login
             }
 
             $usr_n = pg_numrows($usr_pg);
-            $tab_lines = "";
+            $tab_lines = "<tr><th></th><th>User</th><th>Guar</th><th>Date</th></tr>";
             for ($i = 0 ; $i < $usr_n ; $i++) {
                 $usr_obj = pg_fetch_object($usr_pg, $i);
 
-                $tab_lines .= sprintf("<tr><td><input name=\"f_newuser%d\" type=\"checkbox\" CHECKED></td><td>%s</td><td></td></tr>\n",
-                                      $usr_obj->code, eschtml($usr_obj->login), eschtml($usr_obj->guar_login));
+                $tab_lines .= sprintf("<tr><td><input name=\"f_newuser%d\" type=\"checkbox\" CHECKED></td><td>%s</td><td>%s</td><td>%s</td></tr>\n",
+                                      $usr_obj->code, eschtml($usr_obj->login), eschtml($usr_obj->guar_login),
+                                      $usr_obj->lintm);
             }
             ?>
 <html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Brisk: email verified user management.</title>
+</head>
      <body>
      <h2> E-mail verified user management.</h2>
      <?php if ($status != "") { echo "$status"; } ?>
@@ -386,4 +395,4 @@ SELECT usr.*, guar.login AS guar_login
 
 main();
 
-?>
\ No newline at end of file
+?>
Brisk - briscola chiamata in salsa Ajax: sources.