Remove preprocessor tests for OpenSSL. It's a requirement.

[citadel.git] / webcit / static / t / room / edit / tab_config.html

diff --git a/webcit/static/t/room/edit/tab_config.html b/webcit/static/t/room/edit/tab_config.html
index 7baaf925c2842c0f9a4a9eee15bc0e8e6960e09c..b4b1055a263781ef9d95f13fa9fa873b2a659dd4 100644 (file)
--- a/webcit/static/t/room/edit/tab_config.html
+++ b/webcit/static/t/room/edit/tab_config.html
@@ -1,59 +1,53 @@
-<div class="tabcontent">
+<?!("COND:THISROOM:EDIT", 1)><div class="tabcontent">
        <form method="post" action="editroom">
                <input type="hidden" name="nonce" value="<?NONCE>" />
+               <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
                <ul>   
                        <li>
                                <?_("name of room: ")>
-                               <input type="text" name="er_name" value="<?ROOMNAME("U")>" maxlength="127" />
+                               <input type="text" name="er_name" value="<?THISROOM:NAME("X")>" maxlength="127" />
                        </li>
                        <li>
                                <?_("Resides on floor: ")>
                                <select name="er_floor" size="1" <?%("COND:THISROOM:FLAG:QR", 1, #"QR_MAILBOX", 1, 'disabled="disabled" >', ">")>
-<??("COND:THISROOM:FLAG:QR", 2, #"QR_MAILBOX")>        <?ITERATE("LFLR", ="room_edit_er_config_tab_room_option_list")><??("X", 2)>
+                                 <??("COND:THISROOM:FLAG:QR", 2, #"QR_MAILBOX")><?ITERATE("LFLR", ="room_edit_er_config_tab_room_option_list")><??("X", 2)>
                                </select>
                         </li>
                        <li>
                                <?_("Type of room:")>
                                <ul>
                                        <li>
-                                               <!-- this COND checks against the value of (QR_PRIVATE + QR_MAILBOX)) == 0 -->
                                                <input type="radio" name="type" value="public" 
-                                               <?%("COND:THISROOM:FLAG:QR", 3, "14688", 1, 'disabled="disabled" ', "")>
-                                               onChange="if (this.form.type[0].checked == true) { this.form.er_floor.disabled = false; }" />
+                                                      <?%("COND:THISROOM:FLAG:QR", 3, #"QR_PRIVATE | QR_MAILBOX", 1, "", 'checked="checked" ')>
+                                                      onChange="if (this.form.type[0].checked == true) { this.form.er_floor.disabled = false; }" />
                                                <?_("Public (automatically appears to everyone)")>
                                        </li>
                                        <li>
                                                <input type="radio" name="type" value="hidden" 
-                                                       <??("COND:THISROOM:FLAG:QR", 4, #"QR_PRIVATE")>
-                                                               <?%("COND:THISROOM:FLAG:QR", 5, #"QR_GUESSNAME", 1, 'checked="checked" ', "")> 
-                                                       <??("X", 4)>
-                                               onChange="if (this.form.type[1].checked == true) { this.form.er_floor.disabled = false; }" />
+                                                      <?%("COND:THISROOM:FLAG:QR", 5, #"QR_GUESSNAME & QR_PRIVATE", 1, 'checked="checked" ', "")> 
+                                                      onChange="if (this.form.type[1].checked == true) { this.form.er_floor.disabled = false; }" />
                                                <?_("Private - hidden (accessible to anyone who knows its name)")>
                                        </li>
                                        <li>
                                                <input type="radio" name="type" value="passworded" 
-                                                       <??("COND:THISROOM:FLAG:QR", 6, #"QR_PRIVATE")>
-                                                                       <?%("COND:THISROOM:FLAG:QR", 7, #"QR_PASSWORDED", 1, 'checked="checked" ', "")>
-                                                       <??("X", 6)>
-                                               onChange="this.form.er_floor.disabled = false; { (this.form.type[2].checked == true) }"
+                                                      <?%("COND:THISROOM:FLAG:QR", 7, #"QR_PASSWORDED & QR_PRIVATE", 1, 'checked="checked" ', "")>
+                                                      onChange="this.form.er_floor.disabled = false; { (this.form.type[2].checked == true) }"
                                                        />
                                                <?_("Private - require password: ")>
                                                <input type="text" name="er_password" value="<?THISROOM:PASS("U")>" maxlength="9" />
                                        </li>
                                        <li>
                                                <input type="radio" name="type" value="invonly" 
-                                                       <??("COND:THISROOM:FLAG:QR", 8, #"QR_PRIVATE")>
-                                                                <??("COND:THISROOM:FLAG:QR", 9, #"QR_GUESSNAME")>
-                                                                       <?%("COND:THISROOM:FLAG:QR", 10, #"QR_PASSWORDED", 1, 'checked="checked" ', "")>
-                                                               <??("X", 9)>
-                                                       <??("X", 8)>
-                                               onChange="if (this.form.type[3].checked == true) { this.form.er_floor.disabled = false; }" />
+                                                      <??("COND:THISROOM:FLAG:QR", 9, #"QR_PASSWORDED | QR_GUESSNAME")>
+                                                      <?%("COND:THISROOM:FLAG:QR", 10, #"QR_PRIVATE", 1, 'checked="checked" ', "")>
+                                                      <??("X", 9)>
+                                                      onChange="if (this.form.type[3].checked == true) { this.form.er_floor.disabled = false; }" />
                                                <?_("Private - invitation only")>            
                                        </li>
                                        <li>
                                                <input type="radio" name="type" value="personal" 
-                                                       <?%("COND:THISROOM:FLAG:QR", 11, #"QR_MAILBOX", 1, 'checked="checked" ', "")>
-                                                       onChange="if (this.form.type[4].checked == true) { this.form.er_floor.disabled = true; }"
+                                                      <?%("COND:THISROOM:FLAG:QR", 11, #"QR_MAILBOX", 1, 'checked="checked" ', "")>
+                                                      onChange="if (this.form.type[4].checked == true) { this.form.er_floor.disabled = true; }"
                                                        />
                                                <?_("Personal (mailbox for you only)")>
                                        </li>
@@ -85,7 +79,7 @@
                                <ul>
                                        <li>
                                                <?_("Directory name: ")>
-                                               <input type="text" name="er_dirname" value="<?THISROOM:DIRECTORY("U")>" maxlength="14" />
+                                               <input type="text" name="er_dirname" value="<?THISROOM:DIRECTORY("X")>" maxlength="14" />
                                        </li>
                                        <li>
                                                <input type="checkbox" name="ulallowed" value="yes" 
@@ -97,6 +91,11 @@
                                                <?%("COND:THISROOM:FLAG:QR", 17, #"QR_DOWNLOAD", 1, 'checked="checked" ', "")>  />
                                                <?_("Downloading allowed")>
                                        </li>
+                                       <li>
+                                               <input type="checkbox" name="ulmsg" value="yes" 
+                                               <?%("COND:THISROOM:FLAG:QR2", 17, #"QR2_NOUPLMSG", 1, 'checked="checked" ', "")>  />
+                                               <?_("Don't send message on upload")>
+                                       </li>
                                        <li>
                                                <input type="checkbox" name="visdir" value="yes" 
                                                <?%("COND:THISROOM:FLAG:QR", 18, #"QR_VISDIR", 1, 'checked="checked" ', "")>  />
@@ -124,9 +123,8 @@
                         <ul>
                                <li>
                                        <input type="radio" name="anon" value="no" 
-                                       <??("COND:THISROOM:FLAG:QR", 22, #"QR_ANONONLY")>
-                                               <?%("COND:THISROOM:FLAG:QR", 23, #"QR_ANONOPT", 1, 'checked="checked" ', "")>
-                                       <??("X", 22)> />
+                                              <?%("COND:THISROOM:FLAG:QR", 23, #"QR_ANONOPT & QR_ANONONLY", 1, "", 'checked="checked" ')>
+                                              >
                                        <?_("No anonymous messages")>
                                </li>
                                <li>
@@ -147,9 +145,11 @@
        </ul>
 
        <center>
-               <input type="hidden" name="tab" value="config" />
+               <input type="hidden" name="last_tabsel" value="<?TAB:N>" />
                <input type="submit" name="ok_button" value="<?_("Save changes")>" />
                &nbsp;
                <input type="submit" name="cancel_button" value="<?_("Cancel")>" />
        </center>
+       </form>
 </div>
+<?!("X", 1)><??("COND:THISROOM:EDIT", 20)><div class="tabcontent"><?_("Higher access is required to access this function.")></div><??("X", 20)>