updated the chanserv section in webcpanel

8 files changed, 186 insertions, 115 deletions

diff --git a/modules/extra/webcpanel/templates/default/chanserv/access.html b/modules/extra/webcpanel/templates/default/chanserv/access.html
index 5b02c068a..5364a4e94 100644
--- a/modules/extra/webcpanel/templates/default/chanserv/access.html
+++ b/modules/extra/webcpanel/templates/default/chanserv/access.html
@@ -1,4 +1,5 @@
 {INCLUDE header.html}
+{INCLUDE chanserv/chanlist.html}
 		<div class="panel-heading">Access List</div>
 		<div class="panel-body">
 			{FOR M IN MESSAGES}
@@ -7,64 +8,71 @@
 			</div>
 			{END FOR}
 
-			{IF EXISTS ACCESSES}
-			<table id="tableNSAccess" class="table table-hover">
-				<thead>
-					<tr>
-						<th>Mask</th>
-						<th>Access</th>
-						<th>Creator</th>
-						<th></th>
-					</tr>
-				</thead>
-				<tbody>
-				{FOR MASK,ACCESS,CREATOR,ACCESS_CHANGE IN MASKS,ACCESSES,CREATORS,ACCESS_CHANGES}
-					<tr>
-						<td style="font-weight: bold;">{MASK}</td>
-						<td>{ACCESS}</td>
-						<td>{CREATOR}</td>
-						{IF EQ ACCESS_CHANGE YES}
-						<td><a href="/chanserv/access?channel={ESCAPED_CHANNEL}&mask={MASK}&del=1" class="btn btn-sm btn-danger">Delete</a></td>
-						{END IF}
-					</tr>
-				{END FOR}
-				</tbody>
-			</table>
+			{IF EXISTS STOP}
 			{ELSE}
-			<em>Access list is empty.</em>
-			{END IF}
+				{IF EXISTS ACCESSES}
+				<table id="tableNSAccess" class="table table-hover">
+					<thead>
+						<tr>
+							<th>Mask</th>
+							<th>Access</th>
+							<th>Creator</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+					{FOR MASK,ACCESS,CREATOR IN MASKS,ACCESSES,CREATORS}
+						<tr>
+							<td style="font-weight: bold;">{MASK}</td>
+							<td>{ACCESS}</td>
+							<td>{CREATOR}</td>
+							{IF EQ ACCESS_CHANGE YES}
+							<td><a href="/chanserv/access?channel={ESCAPED_CHANNEL}&mask={MASK}&del=1" class="btn btn-sm btn-danger">Delete</a></td>
+							{ELSE}
+							<td></td>
+							{END IF}
+						</tr>
+					{END FOR}
+					</tbody>
+				</table>
+				{ELSE}
+				<em>Access list is empty.</em>
+				{END IF}
 
-			<hr>
+				<hr>
 
-			<h4>Add an access entry</h4>
-			<form class="form-horizontal" method="post" action="/chanserv/access?channel={ESCAPED_CHANNEL}">
-				<div class="form-group">
-					<label class="control-label col-lg-2" for="mask">Mask:</label>
-					<div class="col-lg-6">
-						<input class="form-control" type="text" name="mask" id="mask" placeholder="Valid HostMask">
+				{IF EQ ACCESS_CHANGE YES}
+				<h4>Add an access entry</h4>
+				<form class="form-horizontal" method="post" action="/chanserv/access?channel={ESCAPED_CHANNEL}">
+					<div class="form-group">
+						<label class="control-label col-lg-2" for="mask">Mask:</label>
+						<div class="col-lg-6">
+							<input class="form-control" type="text" name="mask" id="mask" placeholder="Valid HostMask">
+						</div>
 					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label col-lg-2" for="access">Access:</label>
-					<div class="col-lg-6">
-						<input class="form-control" type="text" name="access" id="access" placeholder="Access level">
+					<div class="form-group">
+						<label class="control-label col-lg-2" for="access">Access:</label>
+						<div class="col-lg-6">
+							<input class="form-control" type="text" name="access" id="access" placeholder="Access level">
+						</div>
 					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label col-lg-2" for="reason">Provider:</label>
-					<div class="col-lg-6">
-						<select name="provider" class="form-control">
-							{FOR PROVIDER IN PROVIDERS}
-								<option value="{PROVIDER}">{PROVIDER}</option>
-							{END FOR}
-						</select>
+					<div class="form-group">
+						<label class="control-label col-lg-2" for="reason">Provider:</label>
+						<div class="col-lg-6">
+							<select name="provider" class="form-control">
+								{FOR PROVIDER IN PROVIDERS}
+									<option value="{PROVIDER}">{PROVIDER}</option>
+								{END FOR}
+							</select>
+						</div>
 					</div>
-				</div>
-				<div class="form-group">
-					<div class="col-lg-offset-2 col-lg-6">
-						<button type="submit" class="btn btn-primary">Send</button>
+					<div class="form-group">
+						<div class="col-lg-offset-2 col-lg-6">
+							<button type="submit" class="btn btn-primary">Send</button>
+						</div>
 					</div>
-				</div>
-			</form>
+				</form>
+				{END IF}
+			{END IF}
 		</div>
 {INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/chanserv/akick.html b/modules/extra/webcpanel/templates/default/chanserv/akick.html
index 3b6a2f190..1483cd660 100644
--- a/modules/extra/webcpanel/templates/default/chanserv/akick.html
+++ b/modules/extra/webcpanel/templates/default/chanserv/akick.html
@@ -1,4 +1,5 @@
 {INCLUDE header.html}
+{INCLUDE chanserv/chanlist.html}
 		<div class="panel-heading">Akick List</div>
 		<div class="panel-body">
 			{FOR M IN MESSAGES}
@@ -7,52 +8,55 @@
 			</div>
 			{END FOR}
 
-			{IF EXISTS MASKS}
-			<table id="tableNSAccess" class="table table-hover">
-				<thead>
-					<tr>
-						<th>Mask</th>
-						<th>Reason</th>
-						<th>Creator</th>
-						<th></th>
-					</tr>
-				</thead>
-				<tbody>
-				{FOR MASK,REASON,CREATOR IN MASKS,REASONS,CREATORS}
-					<tr>
-						<td style="font-weight: bold;">{MASK}</td>
-						<td>{REASON}</td>
-						<td>{CREATOR}</td>
-						<td><a href="/chanserv/akick?channel={ESCAPED_CHANNEL}&mask={MASK}&del=1" class="btn btn-sm btn-danger">Delete</a></td>
-					</tr>
-				{END FOR}
-				</tbody>
-			</table>
+			{IF EXISTS STOP}
 			{ELSE}
-			<em>Akick list is empty.</em>
-			{END IF}
+				{IF EXISTS MASKS}
+				<table id="tableNSAccess" class="table table-hover">
+					<thead>
+						<tr>
+							<th>Mask</th>
+							<th>Reason</th>
+							<th>Creator</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+					{FOR MASK,REASON,CREATOR IN MASKS,REASONS,CREATORS}
+						<tr>
+							<td style="font-weight: bold;">{MASK}</td>
+							<td>{REASON}</td>
+							<td>{CREATOR}</td>
+							<td><a href="/chanserv/akick?channel={ESCAPED_CHANNEL}&mask={MASK}&del=1" class="btn btn-sm btn-danger">Delete</a></td>
+						</tr>
+					{END FOR}
+					</tbody>
+				</table>
+				{ELSE}
+				<em>Akick list is empty.</em>
+				{END IF}
 
-			<hr>
+				<hr>
 
-			<h4>Add an akick entry</h4>
-			<form class="form-horizontal" method="post" action="/chanserv/akick?channel={ESCAPED_CHANNEL}">
-				<div class="form-group">
-					<label class="control-label col-lg-2" for="mask">Mask:</label>
-					<div class="col-lg-6">
-						<input class="form-control" type="text" name="mask" id="mask" placeholder="Valid HostMask">
+				<h4>Add an akick entry</h4>
+				<form class="form-horizontal" method="post" action="/chanserv/akick?channel={ESCAPED_CHANNEL}">
+					<div class="form-group">
+						<label class="control-label col-lg-2" for="mask">Mask:</label>
+						<div class="col-lg-6">
+							<input class="form-control" type="text" name="mask" id="mask" placeholder="Valid HostMask">
+						</div>
 					</div>
-				</div>
-				<div class="form-group">
-					<label class="control-label col-lg-2" for="reason">Reason:</label>
-					<div class="col-lg-6">
-						<input class="form-control" type="text" name="reason" id="reason" placeholder="Reason for AKICK">
+					<div class="form-group">
+						<label class="control-label col-lg-2" for="reason">Reason:</label>
+						<div class="col-lg-6">
+							<input class="form-control" type="text" name="reason" id="reason" placeholder="Reason for AKICK">
+						</div>
 					</div>
-				</div>
-				<div class="form-group">
-					<div class="col-lg-offset-2 col-lg-6">
-						<button type="submit" class="btn btn-primary">Send</button>
+					<div class="form-group">
+						<div class="col-lg-offset-2 col-lg-6">
+							<button type="submit" class="btn btn-primary">Send</button>
+						</div>
 					</div>
-				</div>
-			</form>
+				</form>
+			{END IF}
 		</div>
 {INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/chanserv/chanlist.html b/modules/extra/webcpanel/templates/default/chanserv/chanlist.html
new file mode 100644
index 000000000..50e3a60f6
--- /dev/null
+++ b/modules/extra/webcpanel/templates/default/chanserv/chanlist.html
@@ -0,0 +1,13 @@
+<!--- <div class="panel-heading">Channels you have access in</div> -->
+<div class="panel-body">
+	{IF EXISTS CHANNEL_NAMES}
+		<div>
+		<h3 style="margin: -12px 0 20px 0;"><small>Choose a channel to access it's Settings, Access or Akick pages.</small></h3>
+		{FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES}
+			<td><a href="{PAGE}?channel={ECH}" class="btn btn-sm btn-primary {IF EQ ECH ESCAPED_CHANNEL}disabled{END IF}">{CH}</a></td>
+		{END FOR}
+		</div>
+	{ELSE}
+		<em>You don't have access in any channel</em><br>
+	{END IF}
+</div><br>
diff --git a/modules/extra/webcpanel/templates/default/chanserv/drop.html b/modules/extra/webcpanel/templates/default/chanserv/drop.html
index 1b7e788d0..23cb42a1e 100644
--- a/modules/extra/webcpanel/templates/default/chanserv/drop.html
+++ b/modules/extra/webcpanel/templates/default/chanserv/drop.html
@@ -1,4 +1,5 @@
 {INCLUDE header.html}
+{INCLUDE chanserv/chanlist.html}
 		<div class="panel-heading">Channels you can drop</div>
 		<div class="panel-body">
 			{FOR M IN MESSAGES}
@@ -7,11 +8,6 @@
 			</div>
 			{END FOR}
 
-			<div class="scroll">
-			{FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES}
-				<a href="/chanserv/drop?channel={ECH}">{CH}</a></br>
-			{END FOR}
-			</div>
 			{IF EXISTS CHANNEL_DROP}
 				<div class="alert alert-danger" style="margin-top: 15px; margin-bottom: 0; padding-bottom: 0;">
 					<h4>Drop Channel <strong>{CHANNEL_DROP}</strong>?</h4>
diff --git a/modules/extra/webcpanel/templates/default/chanserv/main.html b/modules/extra/webcpanel/templates/default/chanserv/main.html
index 8b88970e8..e77626f31 100644
--- a/modules/extra/webcpanel/templates/default/chanserv/main.html
+++ b/modules/extra/webcpanel/templates/default/chanserv/main.html
@@ -1,17 +1,3 @@
 {INCLUDE header.html}
-		<div class="panel-heading">Channels you have access in</div>
-		<div class="panel-body">
-			{IF EXISTS CHANNEL_NAMES}
-			<div>
-				<h3 style="margin: -12px 0 20px 0;"><small>Choose a channel to access it's Settings, Access or Akick pages.</small></h3>
-				<ul id="channelList">
-				{FOR CH,ECH IN CHANNEL_NAMES,ESCAPED_CHANNEL_NAMES}
-					<li><a href="/chanserv/set?channel={ECH}">{CH}</a></li>
-				{END FOR}
-				</ul>
-			</div>
-			{ELSE}
-			<em>You don't have access in any channel</em><br>
-			{END IF}
-		</div>
+{INCLUDE chanserv/chanlist.html}
 {INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/chanserv/modes.html b/modules/extra/webcpanel/templates/default/chanserv/modes.html
new file mode 100644
index 000000000..e441797dc
--- /dev/null
+++ b/modules/extra/webcpanel/templates/default/chanserv/modes.html
@@ -0,0 +1,57 @@
+{INCLUDE header.html}
+{INCLUDE chanserv/chanlist.html}
+		<div class="panel-heading">Channel Mode List</div>
+		<div class="panel-body">
+			{FOR M IN MESSAGES}
+			<div class="alert alert-info">
+				{M}<br>
+			</div>
+			{END FOR}
+
+			{IF EXISTS STOP}
+			{ELSE}
+				{FOR LM IN LISTMODES}
+						<td><a href="/chanserv/modes?channel={ESCAPED_CHANNEL}&m={LM}" class="btn btn-sm btn-primary {IF EQ LM ESCAPED_MODE}disabled{END IF}">{LM}</a></td>
+				{END FOR}
+				<br>
+
+				{IF EXISTS MASKS}
+				<table id="tableNSAccess" class="table table-hover">
+					<thead>
+						<tr>
+							<th>Mask</th>
+							<th></th>
+						</tr>
+					</thead>
+					<tbody>
+					{FOR MASK IN MASKS}
+						<tr>
+							<td style="font-weight: bold;">{MASK}</td>
+							<td><a href="/chanserv/modes?channel={ESCAPED_CHANNEL}&m={ESCAPED_MODE}&mask={MASK}&del=1" class="btn btn-sm btn-danger">Delete</a></td>
+						</tr>
+					{END FOR}
+					</tbody>
+				</table>
+				{ELSE}
+				<em>Nothing to display.</em>
+				{END IF}
+
+				<hr>
+
+				<h4>Set a new mode</h4>
+				<form class="form-horizontal" method="post" action="/chanserv/modes?channel={ESCAPED_CHANNEL}&m={ESCAPED_MODE}">
+					<div class="form-group">
+						<label class="control-label col-lg-2" for="mask">Mask:</label>
+						<div class="col-lg-6">
+							<input class="form-control" type="text" name="mask" id="mask" placeholder="Valid HostMask">
+						</div>
+					</div>
+					<div class="form-group">
+						<div class="col-lg-offset-2 col-lg-6">
+							<button type="submit" class="btn btn-primary">Send</button>
+						</div>
+					</div>
+				</form>
+			{END IF}
+		</div>
+{INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/chanserv/set.html b/modules/extra/webcpanel/templates/default/chanserv/set.html
index 0c2596dc6..e8522cef9 100644
--- a/modules/extra/webcpanel/templates/default/chanserv/set.html
+++ b/modules/extra/webcpanel/templates/default/chanserv/set.html
@@ -1,4 +1,5 @@
 {INCLUDE header.html}
+{INCLUDE chanserv/chanlist.html}
 		<div class="panel-heading">Channel Information</div>
 		<div class="panel-body">
 			{FOR M IN MESSAGES}
@@ -7,7 +8,9 @@
 			</div>
 			{END FOR}
 
-			<form method="post" action="/chanserv/set?channel={CHANNEL_ESCAPED}">
+			{IF EXISTS STOP}
+			{ELSE}
+			{IF EXISTS CAN_SET}<form method="post" action="/chanserv/set?channel={CHANNEL_ESCAPED}">{END IF}
 				<table id="tableInfo" class="table table-hover">
 					<tr>
 						<td>Channel Name</td>
@@ -43,6 +46,7 @@
 						<td>{LAST_TOPIC_SETTER}</td>
 					</tr>
 					{END IF}
+					{IF EXISTS CAN_SET}
 					<tr>
 						<td>Keep topic</td>
 						<td><input type="checkbox" name="keeptopic" value="on" {IF EXISTS KEEPTOPIC}checked{END IF}></td>
@@ -75,7 +79,9 @@
 						<td></td>
 						<td><button type="submit" class="btn btn-primary">Save</button></td>
 					</tr>
+					{END IF}
 				</table>
-			</form>
+			{IF EXISTS CAN_SET}</form>{END IF}
+			{END IF}
 		</div>
 {INCLUDE footer.html}
diff --git a/modules/extra/webcpanel/templates/default/header.html b/modules/extra/webcpanel/templates/default/header.html
index 9d9710c30..93d2c31fb 100644
--- a/modules/extra/webcpanel/templates/default/header.html
+++ b/modules/extra/webcpanel/templates/default/header.html
@@ -17,6 +17,7 @@
 			<script src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.2.0/respond.js"></script>
 		<![endif]-->
 
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 		<title>{TITLE}</title>
 	</head>
 	<body>