Re: dialup-admin patch

2003-09-16 Thread Ulrich Walcher
Forgot one case...


--- /usr/local/cvs/radiusd/dialup_admin/htdocs/show_groups.php3
2003-05-11 16:03
:37.0 +0200
+++ /usr/local/dialup_admin/htdocs/show_groups.php3 2003-09-16
15:17:24.
0 +0200
@@ -58,13 +58,23 @@
 $link = @da_sql_pconnect($config);
 if ($link){
$search = @da_sql_query($link,$config,
-   "SELECT COUNT(*),GroupName FROM $config[sql_usergroup_table]
GROUP BY Gr
oupName;");
+   "SELECT DISTINCT s.groupname FROM $config[sql_groupcheck_table]
CROSS JO
IN (SELECT DISTINCT u.groupname FROM $config[sql_groupreply_table] CROSS
JOIN $c
onfig[sql_usergroup_table] u) as s;");
if ($search){
if (@da_sql_num_rows($search,$config)){
while( $row =
@da_sql_fetch_array($search,$config) ){
$num++;
-   $group = $row[GroupName];
-   $num_members = $row['COUNT(*)'];
+   $group = $row[groupname];
+   $search2 = @da_sql_query($link,$config,
+   "SELECT COUNT(*) FROM
$config[sql_usergroup_tabl
e] WHERE groupname = '$group';");
+   if ($search2) {
+   if
(@da_sql_num_rows($search,$config)){
+   while( $row2 =
@da_sql_fetch_arr
ay($search2,$config) ){
+   $num_members =
$row2['co
unt'];
+   }
+   }
+   }
+   else
+   echo "Database query failed:
" . da_s
ql_error($link,$config) . "\n";
echo <<
$num


Am Fre, 2003-09-12 um 15.52 schrieb Ulrich Walcher:
> Hi,
> a little patch that solves the problem of groups with no members
> assigned not being displayed. (At least it works for Postgres).
> 
> OoLee
> 
> --- /usr/local/cvs/radiusd/dialup_admin/htdocs/show_groups.php3
> 2003-05-11 16:03:37.0 +0200
> +++ /usr/local/dialup_admin/htdocs/show_groups.php3 2003-09-12
> 15:45:18.0 +0200
> @@ -58,13 +58,23 @@
>  $link = @da_sql_pconnect($config);
>  if ($link){
> $search = @da_sql_query($link,$config,
> -   "SELECT COUNT(*),GroupName FROM $config[sql_usergroup_table]
> GROUP BY GroupName;");
> +   "SELECT DISTINCT c.groupname FROM $config[sql_groupcheck_table]
> c CROSS JOIN $config[sql_groupreply_table] r;");
> if ($search){
> if (@da_sql_num_rows($search,$config)){
> while( $row =
> @da_sql_fetch_array($search,$config) ){
> $num++;
> -   $group = $row[GroupName];
> -   $num_members = $row['COUNT(*)'];
> +   $group = $row[groupname];
> +   $search2 = @da_sql_query($link,$config,
> +   "SELECT COUNT(*) FROM
> $config[sql_usergroup_table] WHERE groupname = '$group';");
> +   if ($search2) {
> +   if
> (@da_sql_num_rows($search,$config)){
> +   while( $row2 =
> @da_sql_fetch_array($search2,$config) ){
> +   $num_members =
> $row2['count'];
> +   }
> +   }
> +   }
> +   else
> +   echo "Database query failed:
> " . da_sql_error($link,$config) . "\n";
> echo << 
> $num
> 
> 
> 
> - 
> List info/subscribe/unsubscribe? See http://www.freeradius.org/list/users.html
> 


- 
List info/subscribe/unsubscribe? See http://www.freeradius.org/list/users.html


dialup-admin patch

2003-09-12 Thread Ulrich Walcher
Hi,
a little patch that solves the problem of groups with no members
assigned not being displayed. (At least it works for Postgres).

OoLee

--- /usr/local/cvs/radiusd/dialup_admin/htdocs/show_groups.php3
2003-05-11 16:03:37.0 +0200
+++ /usr/local/dialup_admin/htdocs/show_groups.php3 2003-09-12
15:45:18.0 +0200
@@ -58,13 +58,23 @@
 $link = @da_sql_pconnect($config);
 if ($link){
$search = @da_sql_query($link,$config,
-   "SELECT COUNT(*),GroupName FROM $config[sql_usergroup_table]
GROUP BY GroupName;");
+   "SELECT DISTINCT c.groupname FROM $config[sql_groupcheck_table]
c CROSS JOIN $config[sql_groupreply_table] r;");
if ($search){
if (@da_sql_num_rows($search,$config)){
while( $row =
@da_sql_fetch_array($search,$config) ){
$num++;
-   $group = $row[GroupName];
-   $num_members = $row['COUNT(*)'];
+   $group = $row[groupname];
+   $search2 = @da_sql_query($link,$config,
+   "SELECT COUNT(*) FROM
$config[sql_usergroup_table] WHERE groupname = '$group';");
+   if ($search2) {
+   if
(@da_sql_num_rows($search,$config)){
+   while( $row2 =
@da_sql_fetch_array($search2,$config) ){
+   $num_members =
$row2['count'];
+   }
+   }
+   }
+   else
+   echo "Database query failed:
" . da_sql_error($link,$config) . "\n";
echo <<
$num



- 
List info/subscribe/unsubscribe? See http://www.freeradius.org/list/users.html