Prettied up the permissions page a bit

[gwvp.git] / gwvplib / gwvprepoadmin.php

diff --git a/gwvplib/gwvprepoadmin.php b/gwvplib/gwvprepoadmin.php
index 6552727..bcf9d25 100644 (file)
--- a/gwvplib/gwvprepoadmin.php
+++ b/gwvplib/gwvprepoadmin.php
@@ -315,10 +315,11 @@ function gwvp_ManageRepoPageBody()
        // visibility section
        $visin[0] = 0;
        echo "<table>";
-       echo "<tr><td>Allowed</td><td></td><td>All</td></tr>";
+       echo "<tr><th>Allowed</th><td></td><th>All</th></tr>";
        echo "<tr><td>";
        // list allowed users
        echo "<select name=\"vismembersin[]\" size=\"20\" multiple=\"true\">";
+       $ninvis = 0;
        foreach($repoperms as $v_perms) {
                if($v_perms["type"] == "visible") {
                        $who = $v_perms["ref"]; // now we need to disemble ref
@@ -328,8 +329,10 @@ function gwvp_ManageRepoPageBody()
                        $visin[$who] = true;
                        
                        echo "<option value=\"$pid\">$refid</option>";
+                       $ninvis++;
                }
        }
+       if($ninvis == 0) echo "<option>--------------</option>";
 
        echo "</select>";
        
@@ -340,21 +343,29 @@ function gwvp_ManageRepoPageBody()
        
        echo "</td><td>";
        // list all users/groups/specials
+       $noutvis = 0;
        echo "<select name=\"vismembersout[]\" size=\"20\" multiple=\"true\">";
        if(!isset($visin["anon"])) echo "<option value=\"anon\">Everyone</option>";
        if(!isset($visin["authed"])) echo "<option value=\"authed\">All Authenticated User</option>";
        foreach($groups as $u_groups) {
                $gname = $u_groups["name"];
                $gid = $u_groups["id"];
-               if(!gwvp_IsGroupAdmin(null, $gid)) if(!isset($visin["group:$gid"])) echo "<option value=\"group:$gid\">Group: $gname</option>";
+               if(!gwvp_IsGroupAdmin(null, $gid)) if(!isset($visin["group:$gid"])) {
+                       echo "<option value=\"group:$gid\">Group: $gname</option>";
+                       $noutvis++;
+               }
        }
        foreach($users as $u_users) {
                $uid = $u_users["id"];
                $email = $u_users["email"];
                $username = $u_users["username"];
                $fullname = $u_users["fullname"];
-               if(!gwvp_IsUserAdmin(null, null, $uid)) if(!isset($visin["user:$uid"])) echo "<option value=\"user:$uid\">User: $username</option>";
+               if(!gwvp_IsUserAdmin(null, null, $uid)) if(!isset($visin["user:$uid"])) {
+                       echo "<option value=\"user:$uid\">User: $username</option>";
+                       $noutvis++;
+               }
        }
+       if($noutvis == 0) echo "<option>-------------------</option>";
        echo "</select>";
        
        echo "</td></tr>";
@@ -366,10 +377,11 @@ function gwvp_ManageRepoPageBody()
        // Read/clone/pull section
        $readin[0] = 0;
        echo "<table>";
-       echo "<tr><td>Allowed</td><td></td><td>All</td></tr>";
+       echo "<tr><th>Allowed</th><td></td><th>All</th></tr>";
        echo "<tr><td>";
        // list allowed users
        echo "<select name=\"readmembersin[]\" size=\"20\" multiple=\"true\">";
+       $ninread = 0;
        foreach($repoperms as $v_perms) {
                if($v_perms["type"] == "read") {
                        $who = $v_perms["ref"]; // now we need to disemble ref
@@ -379,8 +391,10 @@ function gwvp_ManageRepoPageBody()
                        $readin[$who] = true;
                        
                        echo "<option value=\"$pid\">$refid</option>";
+                       $ninread++;
                }
        }
+       if($ninread == 0) echo "<option>-------------------</option>";
 
        echo "</select>";
        
@@ -392,20 +406,28 @@ function gwvp_ManageRepoPageBody()
        echo "</td><td>";
        // list all users/groups/specials
        echo "<select name=\"readmembersout[]\" size=\"20\" multiple=\"true\">";
+       $noutread = 0;
        if(!isset($readin["anon"])) echo "<option value=\"anon\">Everyone</option>";
        if(!isset($readin["authed"])) echo "<option value=\"authed\">All Authenticated User</option>";
        foreach($groups as $u_groups) {
                $gname = $u_groups["name"];
                $gid = $u_groups["id"];
-               if(!gwvp_IsGroupAdmin(null, $gid)) if(!isset($readin["group:$gid"])) echo "<option value=\"group:$gid\">Group: $gname</option>";
+               if(!gwvp_IsGroupAdmin(null, $gid)) if(!isset($readin["group:$gid"])) {
+                       echo "<option value=\"group:$gid\">Group: $gname</option>";
+                       $noutread++;
+               }
        }
        foreach($users as $u_users) {
                $uid = $u_users["id"];
                $email = $u_users["email"];
                $username = $u_users["username"];
                $fullname = $u_users["fullname"];
-               if(!gwvp_IsUserAdmin(null, null, $uid)) if(!isset($readin["user:$uid"])) echo "<option value=\"user:$uid\">User: $username</option>";
+               if(!gwvp_IsUserAdmin(null, null, $uid)) if(!isset($readin["user:$uid"])) {
+                       echo "<option value=\"user:$uid\">User: $username</option>";
+                       $noutread++;
+               }
        }
+       if($noutread == 0) echo "<option>-------------------</option>";
        echo "</select>";
        
        echo "</td></tr>";
@@ -417,10 +439,11 @@ function gwvp_ManageRepoPageBody()
        // write/push section
        $writein[0] = 0;
        echo "<table>";
-       echo "<tr><td>Allowed</td><td></td><td>All</td></tr>";
+       echo "<tr><th>Allowed</th><td></td><th>All</th></tr>";
        echo "<tr><td>";
        // list allowed users
        echo "<select name=\"writemembersin[]\" size=\"20\" multiple=\"true\">";
+       $ninwrite = 0;
        foreach($repoperms as $v_perms) {
                if($v_perms["type"] == "write") {
                        $who = $v_perms["ref"]; // now we need to disemble ref
@@ -430,9 +453,10 @@ function gwvp_ManageRepoPageBody()
                        $writein[$who] = true;
                        
                        echo "<option value=\"$pid\">$refid</option>";
+                       $ninwrite++;
                }
        }
-
+       if($ninwrite == 0) echo "<option>-------------------</option>";
        echo "</select>";
        
        echo "</td><td>";
@@ -443,20 +467,28 @@ function gwvp_ManageRepoPageBody()
        echo "</td><td>";
        // list all users/groups/specials
        echo "<select name=\"writemembersout[]\" size=\"20\" multiple=\"true\">";
-       if(!isset($writein["anon"])) echo "<option value=\"anon\">Everyone</option>";
+       $noutwrite = 0;
+       // cant have anon for writes if(!isset($writein["anon"])) echo "<option value=\"anon\">Everyone</option>";
        if(!isset($writein["authed"])) echo "<option value=\"authed\">All Authenticated User</option>";
        foreach($groups as $u_groups) {
                $gname = $u_groups["name"];
                $gid = $u_groups["id"];
-               if(!gwvp_IsGroupAdmin(null, $gid)) if(!isset($writein["group:$gid"])) echo "<option value=\"group:$gid\">Group: $gname</option>";
+               if(!gwvp_IsGroupAdmin(null, $gid)) if(!isset($writein["group:$gid"])) {
+                       $noutwrite++;
+                       echo "<option value=\"group:$gid\">Group: $gname</option>";
+               }
        }
        foreach($users as $u_users) {
                $uid = $u_users["id"];
                $email = $u_users["email"];
                $username = $u_users["username"];
                $fullname = $u_users["fullname"];
-               if(!gwvp_IsUserAdmin(null, null, $uid)) if(!isset($writein["user:$uid"])) echo "<option value=\"user:$uid\">User: $username</option>";
+               if(!gwvp_IsUserAdmin(null, null, $uid)) if(!isset($writein["user:$uid"])) {
+                       $noutwrite++;
+                       echo "<option value=\"user:$uid\">User: $username</option>";
+               }
        }
+       if($noutwrite == 0) echo "<option>-------------------</option>";
        echo "</select>";
        
        echo "</td></tr>";