[geeklog-cvs] geeklog: Display a "Service" column in the Admin's list of users...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/649d19f400b6
changeset: 6424:649d19f400b6
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Oct 04 21:04:23 2008 +0200
description:
Display a "Service" column in the Admin's list of users when remote auth is activated

diffstat:

2 files changed, 17 insertions(+), 5 deletions(-)
public_html/admin/user.php |   20 +++++++++++++++-----
public_html/docs/history   |    2 ++

diffs (59 lines):

diff -r f202bb4307a5 -r 649d19f400b6 public_html/admin/user.php
--- a/public_html/admin/user.php	Sat Oct 04 20:46:44 2008 +0200
+++ b/public_html/admin/user.php	Sat Oct 04 21:04:23 2008 +0200
@@ -361,7 +361,7 @@
 
 function listusers()
 {
-    global $_CONF, $_TABLES, $LANG_ADMIN, $LANG28, $_IMAGE_TYPE;
+    global $_CONF, $_TABLES, $LANG_ADMIN, $LANG04, $LANG28, $_IMAGE_TYPE;
 
     require_once $_CONF['path_system'] . 'lib-admin.php';
 
@@ -380,10 +380,14 @@
                     array('text' => $LANG28[37], 'field' => $_TABLES['users'] . '.uid', 'sort' => true),
                     array('text' => $LANG28[3], 'field' => 'username', 'sort' => true),
                     array('text' => $LANG28[4], 'field' => 'fullname', 'sort' => true),
-                    array('text' => $login_text, 'field' => $login_field, 'sort' => true)
+                    array('text' => $login_text, 'field' => $login_field, 'sort' => true),
+                    array('text' => $LANG28[7], 'field' => 'email', 'sort' => true)
     );
 
-    $header_arr[] = array('text' => $LANG28[7], 'field' => 'email', 'sort' => true);
+    if ($_CONF['user_login_method']['openid'] ||
+        $_CONF['user_login_method']['3rdparty']) {
+        $header_arr[] = array('text' => $LANG04[121], 'field' => 'remoteservice', 'sort' => true);
+    }
 
     $defsort_arr = array('field'     => $_TABLES['users'] . '.uid',
                          'direction' => 'ASC');
@@ -414,9 +418,15 @@
         'help_url'   => ''
     );
 
+    $join_userinfo   = '';
+    $select_userinfo = '';
     if ($_CONF['lastlogin']) {
-        $join_userinfo="LEFT JOIN {$_TABLES['userinfo']} ON {$_TABLES['users']}.uid={$_TABLES['userinfo']}.uid ";
-        $select_userinfo=",lastlogin";
+        $join_userinfo .= "LEFT JOIN {$_TABLES['userinfo']} ON {$_TABLES['users']}.uid={$_TABLES['userinfo']}.uid ";
+        $select_userinfo .= ",lastlogin";
+    }
+    if ($_CONF['user_login_method']['openid'] ||
+        $_CONF['user_login_method']['3rdparty']) {
+        $select_userinfo .= ',remoteservice';
     }
     $sql = "SELECT {$_TABLES['users']}.uid,username,fullname,email,photo,status,regdate$select_userinfo "
          . "FROM {$_TABLES['users']} $join_userinfo WHERE 1=1";
diff -r f202bb4307a5 -r 649d19f400b6 public_html/docs/history
--- a/public_html/docs/history	Sat Oct 04 20:46:44 2008 +0200
+++ b/public_html/docs/history	Sat Oct 04 21:04:23 2008 +0200
@@ -3,6 +3,8 @@
 ??? ??, 2008 (1.5.2)
 ------------
 
+- Display a "Service" column in the Admin's list of users when remote auth is
+  activated [Dirk]
 - Introduced new function COM_showMessageText to display a free-form text in a
   "System Message" box (feature request #0000676) [Dirk]
 - Introduced new function COM_showMessageFromParameter for easy and consistent