move some more data/log paths missed before

[irc/quakenet/newserv.git] / chanserv / chanservprivs.c

diff --git a/chanserv/chanservprivs.c b/chanserv/chanservprivs.c
index 3b70fa71f62f59a1614ad79e72edb9a9298f8527..fd38ff2f66b7c43c11231106827bca4454840100 100644 (file)
--- a/chanserv/chanservprivs.c
+++ b/chanserv/chanservprivs.c
@@ -21,6 +21,7 @@ int cs_privcheck(int privnum, nick *np) {
   case QPRIV_VIEWAUTOLIMIT:
   case QPRIV_VIEWBANTIMER:
   case QPRIV_VIEWUSERFLAGS:
+  case QPRIV_VIEWCHANSUSPENSION:
     return (rup && UHasHelperPriv(rup));
     
   case QPRIV_VIEWCOMMENTS:
@@ -31,6 +32,7 @@ int cs_privcheck(int privnum, nick *np) {
   case QPRIV_CHANGEAUTOLIMIT:
   case QPRIV_CHANGEBANTIMER:
   case QPRIV_CHANGEUSERFLAGS:
+  case QPRIV_VIEWSUSPENDEDBY:
     return (np && rup && IsOper(np) && UHasOperPriv(rup));
     
   default: /* By default opers can override anything */
@@ -66,10 +68,10 @@ chanindex *cs_checkaccess(nick *np, const char *chan, unsigned int flags,
   if (rcp && rup)
     rcup=findreguseronchannel(rcp, rup);
   
-  if (!priv || !cs_privcheck(priv,np)) {
+  if (!cs_privcheck(priv,np)) {
     if ((flags & CA_VOICEPRIV) &&
        !(rcp && (CIsVoiceAll(rcp)) && 
-         !(cip->channel && (nickbanned(np, cip->channel) || IsInviteOnly(cip->channel)))) &&
+         !(cip->channel && (nickbanned_visible(np, cip->channel) || IsInviteOnly(cip->channel)))) &&
        !(rcup && (CUHasVoicePriv(rcup)))) {
       if (!quiet) chanservstdmessage(np, QM_NOACCESSONCHAN, cip->name->content, cmdname);
       return NULL;