s/owner/admin/ throughout the source code and docs.

[irc/rqf/shadowircd.git] / src / channel.c

diff --git a/src/channel.c b/src/channel.c
index dbcd78ef27f979887acc7b4a66b3dc8473235b1d..02d5c3d52d88837fe032a64147f170e2959fb1e0 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -186,7 +186,7 @@ find_channel_status(struct membership *msptr, int combine)
 
        p = buffer;
 
-       if(is_owner(msptr))
+       if(is_admin(msptr))
        {
                if(!combine)
                        return "!";
@@ -233,18 +233,18 @@ is_halfop(struct membership *msptr)
                return 0;
 }
 
-/* is_owner()
+/* is_admin()
  *
- * input    - membership to check for owner
- * output   - 1 if the user is an owner, 0 if the user is not or owner 
+ * input    - membership to check for admin
+ * output   - 1 if the user is an admin, 0 if the user is not or admin 
  * is disabled.
  * side effects - 
  *
  */
 int
-is_owner(struct membership *msptr)
+is_admin(struct membership *msptr)
 {
-       if(!ConfigChannel.use_owner)
+       if(!ConfigChannel.use_admin)
                return 0;
        if(is_chmode_a(msptr))
                return 1;
@@ -255,13 +255,13 @@ is_owner(struct membership *msptr)
 /* is_any_op()
  *
  * input       - membership to check for ops
- * output      - 1 if the user is op, halfop, or owner, 0 elsewise
+ * output      - 1 if the user is op, halfop, or admin, 0 elsewise
  * side effects - 
  */
 int
 is_any_op(struct membership *msptr)
 {
-       if(is_chanop(msptr) || is_halfop(msptr) || is_owner(msptr))
+       if(is_chanop(msptr) || is_halfop(msptr) || is_admin(msptr))
                return 1;
        else
                return 0;
@@ -270,13 +270,13 @@ is_any_op(struct membership *msptr)
 /* is_chanop_voiced()
  *
  * input       - memebership to check for status
- * output      - 1 if the user is op, halfop, owner, or voice, 0 elsewise
+ * output      - 1 if the user is op, halfop, admin, or voice, 0 elsewise
  * side effects -
  */
 int
 is_chanop_voiced(struct membership *msptr)
 {
-       if(is_chanop(msptr) || is_voiced(msptr) || is_halfop(msptr) || is_owner(msptr))
+       if(is_chanop(msptr) || is_voiced(msptr) || is_halfop(msptr) || is_admin(msptr))
                return 1;
        else
                return 0;
@@ -291,11 +291,11 @@ is_chanop_voiced(struct membership *msptr)
 int
 can_kick_deop(struct membership *source, struct membership *target)
 {
-       if(is_chanop(source) && !is_owner(target))
+       if(is_chanop(source) && !is_admin(target))
                return 1;
        else if(is_halfop(source) && !is_any_op(target))
                return 1;
-       else if(is_owner(source))
+       else if(is_admin(source))
                return 1;
 
        return 0;