From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 7 Sep 2010 21:01:12 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.01~739
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=b4100154cdbc3a4142debcade4afad62f6de81d4;hp=1265ad6805f0c63cca47b35f6cb59cbac9807752;p=citadel.git

Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
---

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index d68d3345b..989ce41b9 100644
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -1557,8 +1557,9 @@ void cmd_invt_kick(char *iuser, int op) {
 	 * These commands are only allowed by aides, room aides,
 	 * and room namespace owners
 	 */
-	if (is_room_aide()
-	   || (atol(CC->room.QRname) == CC->user.usernum) ) {
+	if (is_room_aide()) {
+		/* access granted */
+	} else if ( ((atol(CC->room.QRname) == CC->user.usernum) ) && (CC->user.usernum != 0) ) {
 		/* access granted */
 	} else {
 		/* access denied */
diff --git a/webcit/bbsview_renderer.c b/webcit/bbsview_renderer.c
index 193e10915..3472b99d8 100644
--- a/webcit/bbsview_renderer.c
+++ b/webcit/bbsview_renderer.c
@@ -3,23 +3,24 @@
  *
  * Note: we briefly had a dynamic UI for this.  I thought it was cool, but
  * it was not received well by the user community.  If you want to play
- * with it, go get r8256 of bbsview_renderer.c and have fun.
+ * with it, go get commit dcf99fe61379b78436c387ea3f89ebfd4ffaf635 of
+ * bbsview_renderer.c and have fun.
  *
  * Copyright (c) 1996-2010 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define RANGE 5
@@ -193,8 +194,9 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
 		BBS->num_pages = (BBS->num_msgs / Stat->maxmsgs) + 1;
 	}
 
-	/* If the requested page number is "whichever page on which msg#xxxxx starts"
-	 * then find the page number which contains that message.
+	/* If the requested page number is -4,
+	 * it means "whichever page on which msg#xxxxx starts"
+	 * Change to the page number which contains that message.
 	 */
 	if (BBS->requested_page == (-4)) {
 		if (BBS->num_msgs == 0) {
@@ -212,8 +214,9 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
 		}
 	}
 
-	/* If the requested page number is "whichever page on which new messages start"
-	 * then change that to an actual page number now.
+	/* If the requested page number is -3,
+	 * it means "whichever page on which new messages start"
+	 * Change that to an actual page number now.
 	 */
 	if (BBS->requested_page == (-3)) {
 		if (BBS->num_msgs == 0) {