X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fstatic%2Ft%2Froom%2Fedit%2Ftab_expire.html;h=a030d0b9fd1884a3848994a896dd9664ebf27230;hb=c06f9badb40bc9c4ed4547c567ae6d5b59301fc2;hp=cbee5877d6c10941c61ac62378123c80c9ea7de2;hpb=72badf831f461b696495264391c8a77fe34c5936;p=citadel.git

diff --git a/webcit/static/t/room/edit/tab_expire.html b/webcit/static/t/room/edit/tab_expire.html
index cbee5877d..a030d0b9f 100644
--- a/webcit/static/t/room/edit/tab_expire.html
+++ b/webcit/static/t/room/edit/tab_expire.html
@@ -1,7 +1,8 @@
-<div class="tabcontent">
+<?!("COND:THISROOM:EDIT", 1)><div class="tabcontent">
 	<br />
 	<form method="post" action="set_room_policy">
 		<input type="hidden" name="nonce" value="<?NONCE>" />
+		<input type="hidden" name="go" value="<?ROOM:INFO:PRINT_NAME("X")>">
 		<table border="0" cellspacing="5">
 			<tr>
 				<td>
@@ -10,55 +11,51 @@
 					<?ROOMNAME("X")>
 				</td>
 				<td>
-					<input type="radio" name="roompolicy" value="0" %s />&nbsp;
-						((roompolicy == 0) ? "CHECKED" : "") );
+					<input type="radio" name="roompolicy" value="0" <?%("COND:EXPIRE:MODE", 1, #"roompolicy", #"EXPIRE_NEXTLEVEL" , 'checked="checked"',"")>/>&nbsp;
 					<?_("Use the default policy for this floor")>&nbsp;
 					<br />
-					<input type="radio" name="roompolicy" value="1" <?%("COND:EXPIRE:MODE", 1, #"mailboxespolicy", #"EXPIRE_MANUAL", 'checked="checked"',"")> />&nbsp;
+					<input type="radio" name="roompolicy" value="1" <?%("COND:EXPIRE:MODE", 1, #"roompolicy", #"EXPIRE_MANUAL", 'checked="checked"',"")> />&nbsp;
 					<?_("Never automatically expire messages")>
 					<br />
-					<input type="radio" name="roompolicy" value="2" <?%("COND:EXPIRE:MODE", 2, #"mailboxespolicy", #"EXPIRE_NUMMSGS", 'checked="checked"', "")> />&nbsp;
+					<input type="radio" name="roompolicy" value="2" <?%("COND:EXPIRE:MODE", 2, #"roompolicy", #"EXPIRE_NUMMSGS", 'checked="checked"', "")> />&nbsp;
 					<?_("Expire by message count")>
 					<br />
-					<input type="radio" name="roompolicy" value="3" <?%("COND:EXPIRE:MODE", 1, #"mailboxespolicy", #"EXPIRE_AGE", 'checked="checked"', "")> />&nbsp;
+					<input type="radio" name="roompolicy" value="3" <?%("COND:EXPIRE:MODE", 1, #"roompolicy", #"EXPIRE_AGE", 'checked="checked"', "")> />&nbsp;
 					<?_("Expire by message age")>
 					<br />
 					<?_("Number of messages or days: ")>
-					<input type="text" name="roomvalue" maxlength="5" value="<?SERV:CFG("sitevalue")>" />
+					<input type="text" name="roomvalue" MAXLENGTH="5" value="<?EXPIRE:VALUE(#"roompolicy", #"EXPIRE_NUMMSGS")>">
 				</td>
 			</tr>
 	
-			<??("COND:AIDE", 2 ...)>	if (WC->axlevel >= 6) {
+			<??("COND:AIDE", 2)>
 			<tr>
 				<td colspan="2"><hr /></td>
 			</tr>
 			<tr>
 				<td>
 					<?_("Message expire policy for this floor")>
-					<br />(
-						escputs(floorlist[WC->CurRoom.floorid]);
+					<br />
+					<?THISROOM:FLOOR:NAME("X")>
 				</td>
 				<td>
-					<input type="radio" name="floorpolicy" value="0" %s>",
-						((floorpolicy == 0) ? "CHECKED" : "") );
+					<input type="radio" name="floorpolicy" value="0" <?%("COND:EXPIRE:MODE", 1, #"floorpolicy", #"EXPIRE_NEXTLEVEL" , 'checked="checked"',"")>>&nbsp;
 					<?_("Use the system default")>
 					<br />
-					<input type="radio" name="floorpolicy" value="1" %s>",
-						((floorpolicy == 1) ? "CHECKED" : "") );
+					<input type="radio" name="floorpolicy" value="1" <?%("COND:EXPIRE:MODE", 1, #"floorpolicy", #"EXPIRE_MANUAL", 'checked="checked"',"")> />&nbsp;
 					<?_("Never automatically expire messages")>
 					<br />
-					<input type="radio" name="floorpolicy" value="2" %s>",
-						((floorpolicy == 2) ? "CHECKED" : "") );
+					<input type="radio" name="floorpolicy" value="2" <?%("COND:EXPIRE:MODE", 2, #"floorpolicy", #"EXPIRE_NUMMSGS", 'checked="checked"', "")> />&nbsp;
 					<?_("Expire by message count")>
 					<br />
-					<input type="radio" name="floorpolicy" value="3" %s>",
-						((floorpolicy == 3) ? "CHECKED" : "") );
+					<input type="radio" name="floorpolicy" value="3" <?%("COND:EXPIRE:MODE", 1, #"floorpolicy", #"EXPIRE_AGE", 'checked="checked"', "")> />&nbsp;
 					<?_("Expire by message age")>
 					<br />
 					<?_("Number of messages or days: ")>
-					<input type="text" name="floorvalue" MAXLENGTH="5" value="%d">",
-						floorvalue);
-			<("X", 2)>	
+					<input type="text" name="floorvalue" MAXLENGTH="5" value="<?EXPIRE:VALUE(#"floorpolicy", #"EXPIRE_NUMMSGS")>">
+					</td>
+				</tr>
+			<??("X", 2)>	
 			<tr>
 				<td colspan="2">
 					<hr />
@@ -68,8 +65,9 @@
 						<input type="submit" name="cancel_button" value="<?_("Cancel")>" />
 					</center>
 				</td>
-			<tr>
+			</tr>
 		</table>
-		<input type="hidden" name="tab" value="expire" />
+		<input type="hidden" name="last_tabsel" value="<?TAB:N>" />
 	</form>
 </div>
+<?!("X", 1)><??("COND:THISROOM:EDIT", 20)><div class="tabcontent"><?_("Higher access is required to access this function.")></div><??("X", 20)>