Actualización inicial a Python 3

2 files changed, 22 insertions, 22 deletions

diff --git a/cgi/templates/manage/boardoptions.html b/cgi/templates/manage/boardoptions.html
index 436b036..fcd3bb8 100644
--- a/cgi/templates/manage/boardoptions.html
+++ b/cgi/templates/manage/boardoptions.html
@@ -38,7 +38,7 @@
 <td>
   <select style="width:100%;" name="type">
     <option value="0">Imageboard</option>
-    <option value="1"#{selected(boardopts['board_type'] == '1')}>Textboard</option>
+    <option value="1"#{selected(boardopts['board_type'] == 1)}>Textboard</option>
   </select>
 </td>
 </tr>
@@ -74,9 +74,9 @@
 <td>
   <select name="useid" style="width:100%;">
     <option value="0">Desactivado</option>
-    <option value="1"#{selected(boardopts['useid'] == '1')}>Activado</option>
-    <option value="2"#{selected(boardopts['useid'] == '2')}>Activado siempre</option>
-    <option value="3"#{selected(boardopts['useid'] == '3')}>Activado siempre, detallado</option>
+    <option value="1"#{selected(boardopts['useid'] == 1)}>Activado</option>
+    <option value="2"#{selected(boardopts['useid'] == 2)}>Activado siempre</option>
+    <option value="3"#{selected(boardopts['useid'] == 3)}>Activado siempre, detallado</option>
   </select>
 </td>
 </tr>
@@ -85,9 +85,9 @@
 <td>
   <select name="slip" style="width:100%;">
     <option value="0">Desactivado</option>
-    <option value="1"#{selected(boardopts['slip'] == '1')}>Activado</option>
-    <option value="2"#{selected(boardopts['slip'] == '2')}>Sólo dominio</option>
-    <option value="3"#{selected(boardopts['slip'] == '3')}>Todo</option>
+    <option value="1"#{selected(boardopts['slip'] == 1)}>Activado</option>
+    <option value="2"#{selected(boardopts['slip'] == 2)}>Sólo dominio</option>
+    <option value="3"#{selected(boardopts['slip'] == 3)}>Todo</option>
   </select>
 </td>
 </tr>
@@ -96,45 +96,45 @@
 <td>
   <select name="countrycode" style="width:100%;">
     <option value="0">Desactivado</option>
-    <option value="1"#{selected(boardopts['countrycode'] == '1')}>Activado</option>
+    <option value="1"#{selected(boardopts['countrycode'] == 1)}>Activado</option>
   </select>
 </td>
 </tr>
 <tr>
 <td class="postblock">Desactivar nombre</td>
-<td><input type="checkbox" name="disable_name" id="noname" value="1"#{checked(boardopts['disable_name'] == '1')} /><label for="noname"></label></td>
+<td><input type="checkbox" name="disable_name" id="noname" value="1"#{checked(boardopts['disable_name'])} /><label for="noname"></label></td>
 </tr>
 <tr>
 <td class="postblock">Desactivar asunto</td>
-<td><input type="checkbox" name="disable_subject" id="nosub" value="1"#{checked(boardopts['disable_subject'] == '1')} /><label for="nosub"></label></td>
+<td><input type="checkbox" name="disable_subject" id="nosub" value="1"#{checked(boardopts['disable_subject'])} /><label for="nosub"></label></td>
 </tr>
 <tr>
 <td class="postblock">Papelera de reciclaje</td>
-<td><input type="checkbox" name="recyclebin" id="bin" value="1"#{checked(boardopts['recyclebin'] == '1')} /><label for="bin"></label></td>
+<td><input type="checkbox" name="recyclebin" id="bin" value="1"#{checked(boardopts['recyclebin'])} /><label for="bin"></label></td>
 </tr>
 <tr>
 <td class="postblock">Cerrado</td>
-<td><input type="checkbox" name="locked" id="locked" value="1"#{checked(boardopts['locked'] == '1')} /><label for="locked"></label></td>
+<td><input type="checkbox" name="locked" id="locked" value="1"#{checked(boardopts['locked'])} /><label for="locked"></label></td>
 </tr>
 <tr>
 <td class="postblock">Secreto</td>
-<td><input type="checkbox" name="secret" id="secret" value="1"#{checked(boardopts['secret'] == '1')} /><label for="secret"></label></td>
+<td><input type="checkbox" name="secret" id="secret" value="1"#{checked(boardopts['secret'])} /><label for="secret"></label></td>
 </tr>
 <tr>
 <td class="postblock">Permitir spoilers</td>
-<td><input type="checkbox" name="allow_spoilers" id="spoil" value="1"#{checked(boardopts['allow_spoilers'] == '1')} /><label for="spoil"></label></td>
+<td><input type="checkbox" name="allow_spoilers" id="spoil" value="1"#{checked(boardopts['allow_spoilers'])} /><label for="spoil"></label></td>
 </tr>
 <tr>
 <td class="postblock">Permitir oekaki</td>
-<td><input type="checkbox" name="allow_oekaki" id="oek" value="1"#{checked(boardopts['allow_oekaki'] == '1')} /><label for="oek"></label></td>
+<td><input type="checkbox" name="allow_oekaki" id="oek" value="1"#{checked(boardopts['allow_oekaki'])} /><label for="oek"></label></td>
 </tr>
 <tr>
 <td class="postblock">Permitir crear hilos sin imagen</td>
-<td><input type="checkbox" name="allow_noimage" id="noimgallow" value="1"#{checked(boardopts['allow_noimage'] == '1')} /><label for="noimgallow"></label></td>
+<td><input type="checkbox" name="allow_noimage" id="noimgallow" value="1"#{checked(boardopts['allow_noimage'])} /><label for="noimgallow"></label></td>
 </tr>
 <tr>
 <td class="postblock">Permitir subida</td>
-<td><input type="checkbox" name="allow_images" id="img" value="1"#{checked(boardopts['allow_images'] == '1')} /><label for="img">Al crear un hilo</label><br /><input type="checkbox" name="allow_image_replies" id="imgres" value="1"#{checked(boardopts['allow_image_replies'] == '1')} /><label for="imgres">Al responder</label></td>
+<td><input type="checkbox" name="allow_images" id="img" value="1"#{checked(boardopts['allow_images'])} /><label for="img">Al crear un hilo</label><br /><input type="checkbox" name="allow_image_replies" id="imgres" value="1"#{checked(boardopts['allow_image_replies'])} /><label for="imgres">Al responder</label></td>
 </tr>
 <tr>
 <td class="postblock">Tipos de archivo</td>
diff --git a/cgi/templates/manage/ipshow.html b/cgi/templates/manage/ipshow.html
index 6937a0e..4e9de17 100644
--- a/cgi/templates/manage/ipshow.html
+++ b/cgi/templates/manage/ipshow.html
@@ -49,14 +49,14 @@
       <td></td>
     <?py #endif ?>
     <td>
-      <?py if post['IS_DELETED'] == '0': ?>
-      <a href="#{cgi_url}manage/delete/#{post['dir']}/#{post['id']}">Eliminar</a>
-      <?py elif post['IS_DELETED'] == '1': ?>
-      <a href="#{cgi_url}manage/recyclebin/0/restore/#{post['dir']}/#{post['id']}">Rec</a>
+      <?py if post['IS_DELETED'] == 1: ?>
+	  <a href="#{cgi_url}manage/recyclebin/0/restore/#{post['dir']}/#{post['id']}">Rec</a>
       <abbr title="Eliminado por usuario">[1]</abbr>
-      <?py else: ?>
+      <?py elif post['IS_DELETED'] == 2: ?>
       <a href="#{cgi_url}manage/recyclebin/0/restore/#{post['dir']}/#{post['id']}">Rec</a>
       <abbr title="Eliminado por staff">[2]</abbr>
+      <?py else: ?>
+	  <a href="#{cgi_url}manage/delete/#{post['dir']}/#{post['id']}">Eliminar</a>
       <?py #endif ?>
     </td>
   </tr>