- Upgrade to OpenACS 5.9.1

d3712562 · Frank Bergmann · 73209e68 · d3712562 · d3712562 · d3712562
Commit d3712562 authored Nov 04, 2020 by Frank Bergmann
32 changed files
--- a/attachments.info
+++ b/attachments.info
@@ -8,17 +8,18 @@
    <singleton-p>t</singleton-p>
    <auto-mount>attachments</auto-mount>

-    <version name="0.11d2" url="http://openacs.org/repository/download/apm/attachments-0.11d2.apm">
+    <version name="0.11" url="http://openacs.org/repository/download/apm/attachments-0.11.apm">
        <owner url="http://openacs.org">OpenACS</owner>
        <summary>Attachment support</summary>
        <maturity>2</maturity>
-        <release-date>2015-10-04</release-date>
+        <release-date>2017-08-06</release-date>
        <vendor url="http://openacs.org">OpenACS</vendor>
        <description format="text/plain">Provide widgets and datamodel to support attachments on arbitrary objects.  Used by forums.</description>

-        <provides url="attachments" version="0.11d2"/>
-	<requires url="acs-kernel" version="5.9.0"/>
-        <requires url="file-storage" version="5.9.0"/>
+        <provides url="attachments" version="0.11"/>
+	<requires url="acs-tcl" version="5.9.1"/>
+	<requires url="acs-kernel" version="5.9.1"/>
+        <requires url="file-storage" version="5.9.1"/>

        <parameters>
            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RelativeUrl"  default="attach" description="The relative url of this package when mounted under a client."/>

--- a/catalog/attachments.de_DE.ISO-8859-1.xml
+++ b/catalog/attachments.de_DE.ISO-8859-1.xml
@@ -5,17 +5,17 @@
  <msg key="Add_File">Datei hinzufügen</msg>
  <msg key="Add_folder_Link">Ordnerlink hinzufügen</msg>
  <msg key="Add_pretty_name">%pretty_name% hinzufügen</msg>
-  <msg key="Are_you_sure_detach">Sind Sie sicher, dass Sie diesen Anhang enfernen wollen?</msg>
+  <msg key="Are_you_sure_detach">Sind Sie sicher, dass Sie den Anhang löschen möchten?</msg>
  <msg key="Attach">Anhängen</msg>
  <msg key="attach_new">Anfügen: &lt;b&gt;Neue&lt;/b&gt; </msg>
  <msg key="Attach_URL">URL anhängen</msg>
  <msg key="Attachment">Anhang</msg>
-  <msg key="Can_delete">Dies ist das einzige Objekt mit dem der Punkt verknüpft ist. Sie können es auch aus dem Filestorage löschen.</msg>
+  <msg key="Can_delete">Dies ist das einzige Objekt, zu dem dieses Element angefügt ist. Sie können es aus der Dateiablage löschen.</msg>
  <msg key="Choose">Auswählen</msg>
-  <msg key="delete_from_fs">Diesen Anhang aus dem Filestorage löschen?</msg>
+  <msg key="delete_from_fs">Diesen Anhang aus der Dateiablage löschen</msg>
  <msg key="Description">Beschreibung:</msg>
-  <msg key="Detach">Trennen</msg>
-  <msg key="Detach_file_from">Datei von Objekt %object_name% trennen</msg>
+  <msg key="Detach">Abtrennen</msg>
+  <msg key="Detach_file_from">Datei abtrennen von %object_name%</msg>
  <msg key="File">Datei</msg>
  <msg key="Last_Modified">Zuletzt geändert</msg>
  <msg key="lt_Add_Attachment_Folder">Link zu einem angehängten Ordner hinzufügen</msg>
@@ -42,8 +42,8 @@
  <msg key="Name">Name</msg>
  <msg key="No_such_type">Typ nicht vorhanden</msg>
  <msg key="Object">Objekt</msg>
-  <msg key="on_Object">an Objekt</msg>
-  <msg key="Only_detach">Dieses Element ist ein Anhang für ein anderes Objekt. Sie können es vom Objekt trennen, aber nicht komplett aus dem Filestorage löschen.</msg>
+  <msg key="on_Object">zu Objekt</msg>
+  <msg key="Only_detach">Dieses Element ist an andere Objekte angehängt. Sie können es nur entfernen, aber nicht aus der Dateiablage löschen.</msg>
  <msg key="remove">entfernen</msg>
  <msg key="Size">Größe</msg>
  <msg key="Title">Name das Dokuments:</msg>

--- a/catalog/attachments.en_US.ISO-8859-1.xml
+++ b/catalog/attachments.en_US.ISO-8859-1.xml
@@ -11,7 +11,7 @@
  <msg key="Are_you_sure_detach">Are you sure you want to remove this attachment?</msg>
  <msg key="Attach">Attach</msg>
  <msg key="attach_new">Attach a &lt;b&gt;new&lt;/b&gt;:</msg>
-  <description key="attach_new">This key is going to give problems with word-order for several languages, because the &#34;attach new&#34; grammar is quite specific to English. For example the best translation in Dutch would be &#34;Nieuwe xxxx toevoegen&#34;, but we do not know xxxx yet. A work around is to write &#34;Voeg toe nieuw&#34;, but depending on what is behind it, grammar requires &#34;Voeg toe nieuwe&#34;. So, we get a very forced translation: &#34;Voeg toe nieuw(e)&#34;.
+  <description key="attach_new">This key is going to give problems with word-order for several languages, because the &quot;attach new&quot; grammar is quite specific to English. For example the best translation in Dutch would be &quot;Nieuwe xxxx toevoegen&quot;, but we do not know xxxx yet. A work around is to write &quot;Voeg toe nieuw&quot;, but depending on what is behind it, grammar requires &quot;Voeg toe nieuwe&quot;. So, we get a very forced translation: &quot;Voeg toe nieuw(e)&quot;.

 Please fix.</description>

@@ -34,7 +34,7 @@ Please fix.</description>
  <msg key="lt_contentscontent_size_">%contents.content_size% item</msg>
  <msg key="lt_contentscontent_size__1">%contents.content_size% byte</msg>
  <msg key="lt_Created_by_the_attach">Created by the attachments packge</msg>
-  <msg key="lt_dont_know_how_to_deal">Don&#39;t know how to deal with attachment type %content_type%</msg>
+  <msg key="lt_dont_know_how_to_deal">Don't know how to deal with attachment type %content_type%</msg>
  <msg key="lt_Error_Attachment_root">Error: Attachment root folder and file storage root folder are different!</msg>
  <msg key="lt_Error_empty_folder_id">Error: empty folder_id!</msg>
  <msg key="lt_Folder_folder_name_is">Folder %folder_name% is empty</msg>
@@ -42,12 +42,12 @@ Please fix.</description>
  <msg key="lt_No_file-storage_folde">No file-storage folders found to link to. Would you like to create one?</msg>
  <msg key="lt_No_such_attachment_fo">No such attachment for this object</msg>
  <msg key="lt_The_specified_parent_">The specified parent folder is not valid.</msg>
-  <msg key="lt_To_attach_a_file_alre">To attach a file already in a folder, open the folder by clicking the folder&#39;s name, then click the &amp;quot;[ Choose ]&amp;quot; link next to the file. If you have appropriate system permissions, you will also be able to upload a new file into a folder. To do so, open the folder by clicking the link.  The &#34;Attach a new: File | URL&#34; link will only appear if you have permission to use it.</msg>
+  <msg key="lt_To_attach_a_file_alre">To attach a file already in a folder, open the folder by clicking the folder's name, then click the &amp;quot;[ Choose ]&amp;quot; link next to the file. If you have appropriate system permissions, you will also be able to upload a new file into a folder. To do so, open the folder by clicking the link.  The &quot;Attach a new: File | URL&quot; link will only appear if you have permission to use it.</msg>
  <msg key="lt_Upload_New_Attachment">Upload New Attachment</msg>
-  <msg key="lt_Use_the_Browse_button">Use the &#34;Browse...&#34; button to locate your file, 
-    then click &#34;Open&#34;.</msg>
+  <msg key="lt_Use_the_Browse_button">Use the &quot;Browse...&quot; button to locate your file, 
+    then click &quot;Open&quot;.</msg>
  <msg key="lt_You_are_attaching_a_d">You are attaching a document to %pretty_object_name%.</msg>
-  <msg key="lt_You_probably_clicked_">You probably clicked on the Add button more than once. Check if the file is properly loaded on the &lt;a href=&#34;%folder_url%&#34;&gt;folder&lt;/a&gt; you want, or you can use the Back button to return and re-enter the version file.</msg>
+  <msg key="lt_You_probably_clicked_">You probably clicked on the Add button more than once. Check if the file is properly loaded on the &lt;a href=&quot;%folder_url%&quot;&gt;folder&lt;/a&gt; you want, or you can use the Back button to return and re-enter the version file.</msg>
  <msg key="lt_Your_file_is_larger_t">Your file is larger than the maximum file size allowed on this system (%max_number_of_bytes% bytes)</msg>
  <msg key="Name">Name</msg>
  <msg key="No_such_type">No such type</msg>

--- a/catalog/attachments.fi_FI.utf-8.xml
+++ b/catalog/attachments.fi_FI.utf-8.xml
@@ -27,9 +27,9 @@
  <msg key="lt_The_specified_parent_">Määritelty isähakemisto ei kelpaa.</msg>
  <msg key="lt_To_attach_a_file_alre">Liittääksesi tiedoston joka löytyy jo kansiosta avaa kansio näpäyttämällä sen nimeä. Klikkaa sitten &amp;quot;[ Choose ]&amp;quot; -linkkiä tiedoston vieressä. Tallentaaksesi uuden tiedoston kansioon avaa kansio ja klikkaa sitten asianmukaista &amp;quot;Attach a new: File | URL&amp;quot; -linkkiä.</msg>
  <msg key="lt_Upload_New_Attachment">Lisää uusi liitetiedosto</msg>
-  <msg key="lt_Use_the_Browse_button">Käytä &#34;Browse...&#34; -näppäintä etsiäksesi haluamasi tiedosto, ja valitse sen jälkeen &#34;Open&#34;.</msg>
+  <msg key="lt_Use_the_Browse_button">Käytä &quot;Browse...&quot; -näppäintä etsiäksesi haluamasi tiedosto, ja valitse sen jälkeen &quot;Open&quot;.</msg>
  <msg key="lt_You_are_attaching_a_d">Olet liittämässä dokumenttia kohteeseen %pretty_object_name%.</msg>
-  <msg key="lt_You_probably_clicked_">Painoit Lisää-painiketta luultavasti useammin kuin kerran. Tarkista, onko tiedosto haluamassasi &lt;a href=&#34;%folder_url%&#34;&gt;kansiossa&lt;/a&gt;, tai käytä Back-näppäintä ja anna tiedosto uudelleen.</msg>
+  <msg key="lt_You_probably_clicked_">Painoit Lisää-painiketta luultavasti useammin kuin kerran. Tarkista, onko tiedosto haluamassasi &lt;a href=&quot;%folder_url%&quot;&gt;kansiossa&lt;/a&gt;, tai käytä Back-näppäintä ja anna tiedosto uudelleen.</msg>
  <msg key="lt_Your_file_is_larger_t">Tiedostosi on suurempi kuin järjestelmän suurin sallittu tiedostokoko (%max_number_of_bytes% bytes).</msg>
  <msg key="Name">Nimi</msg>
  <msg key="No_such_type">Kyseistä tyyppiä ei ole olemassa</msg>

--- a/catalog/attachments.fr_FR.ISO-8859-1.xml
+++ b/catalog/attachments.fr_FR.ISO-8859-1.xml
@@ -23,13 +23,13 @@
  <msg key="lt_Folder_folder_name_is">Le dossier %folder_name% est vide</msg>
  <msg key="lt_Found_file-storage_fo">Dossier XXX folder_name XXX... Voulez-vous les lier?</msg>
  <msg key="lt_No_file-storage_folde">Aucun dossier trouv. Voulez-vous en crer un?</msg>
-  <msg key="lt_No_such_attachment_fo">Pas d&#39;attache pour cet objet</msg>
-  <msg key="lt_The_specified_parent_">Le dossier pre n&#39;est pas valide.</msg>
+  <msg key="lt_No_such_attachment_fo">Pas d'attache pour cet objet</msg>
+  <msg key="lt_The_specified_parent_">Le dossier pre n'est pas valide.</msg>
  <msg key="lt_To_attach_a_file_alre">Pour attacher un document existant dans un dossier, ouvrez le dossier en cliquant sur le nom du dossier, puis cliquez le lien &amp;quot;[ Choisir ]&amp;quot;. Pour envoyer un nouveau document dans un dossier, ouvrez le dossier en cliquant sur son nom, puis cliquez le lien &amp;quot;Attacher un nouveau: Document | Lien&amp;quot;</msg>
  <msg key="lt_Upload_New_Attachment">Envoyer une nouvelle attache</msg>
-  <msg key="lt_Use_the_Browse_button">Utilisez le bouton &#34;Browse...&#34; pour localiser votre document, puis cliquez sur &#34;Ouvrir&#34;.</msg>
+  <msg key="lt_Use_the_Browse_button">Utilisez le bouton &quot;Browse...&quot; pour localiser votre document, puis cliquez sur &quot;Ouvrir&quot;.</msg>
  <msg key="lt_You_are_attaching_a_d">Document attach  %pretty_object_name%.</msg>
-  <msg key="lt_You_probably_clicked_">Il est probable que vous ayez cliqu plusieurs fois sur &#34;Ajouter&#34;. Vrifiez que le document ait bien t ajout au &lt;a href=&#34;%folder_url%&#34;&gt;dossier&lt;/a&gt; que vous avez choisi, ou bien revenez en arrire pour recommencer l&#39;opration.</msg>
+  <msg key="lt_You_probably_clicked_">Il est probable que vous ayez cliqu plusieurs fois sur &quot;Ajouter&quot;. Vrifiez que le document ait bien t ajout au &lt;a href=&quot;%folder_url%&quot;&gt;dossier&lt;/a&gt; que vous avez choisi, ou bien revenez en arrire pour recommencer l'opration.</msg>
  <msg key="lt_Your_file_is_larger_t">La taille de votre document dpasse la valeur autorise (%max_number_of_bytes% octets)</msg>
  <msg key="Name">Nom</msg>
  <msg key="No_such_type">Type non existant</msg>

--- a/catalog/attachments.it_IT.ISO-8859-1.xml
+++ b/catalog/attachments.it_IT.ISO-8859-1.xml
@@ -5,11 +5,17 @@
  <msg key="Add_File">Aggiungi un File</msg>
  <msg key="Add_folder_Link">Aggiungi un collegamento a una cartella</msg>
  <msg key="Add_pretty_name">Aggiungi un %pretty_name%</msg>
+  <msg key="Are_you_sure_detach">Sei sicuro di voler eliminare questo allegato?</msg>
  <msg key="Attach">Allega</msg>
  <msg key="attach_new">Allega un &lt;b&gt;nuovo&lt;/b&gt;:</msg>
  <msg key="Attach_URL">Allega una URL</msg>
+  <msg key="Attachment">Allegato</msg>
+  <msg key="Can_delete">Questo  l&#39;unico oggetto al quale questo elemento  stato allegato. Puoi anche scegliere di eliminarlo dal file storage.</msg>
  <msg key="Choose">Scegli</msg>
+  <msg key="delete_from_fs">Eliminare questo allegato dal file storage?</msg>
  <msg key="Description">Descrizione:</msg>
+  <msg key="Detach">Scollega</msg>
+  <msg key="Detach_file_from">Scollega file da %object_name%</msg>
  <msg key="File">File</msg>
  <msg key="Last_Modified">Ultima Modifica</msg>
  <msg key="lt_Add_Attachment_Folder">Aggiungi un allegato alla cartella</msg>
@@ -35,6 +41,9 @@ Per caricare il file in una cartella, apri la cartella cliccando sul suo nome, p
  <msg key="Name">Nome</msg>
  <msg key="No_such_type">Nessun tipo</msg>
  <msg key="Object">Oggetto</msg>
+  <msg key="on_Object">sull&#39;Oggetto</msg>
+  <msg key="Only_detach">Questo elemento  allegato ad altri oggetti. Puoi solo rimuoverlo da questo oggetto, ma non cancellarlo dal file storage.</msg>
+  <msg key="remove">rimuovi</msg>
  <msg key="Size">Dimensione</msg>
  <msg key="Title">Titolo:</msg>
  <msg key="Top">In alto</msg>

--- a/catalog/attachments.nl_NL.ISO-8859-1.xml
+++ b/catalog/attachments.nl_NL.ISO-8859-1.xml
@@ -5,17 +5,11 @@
  <msg key="Add_File">Bestand toevoegen</msg>
  <msg key="Add_folder_Link">Koppeling naar map toevoegen</msg>
  <msg key="Add_pretty_name">%pretty_name% toevoegen</msg>
-  <msg key="Are_you_sure_detach">Weet u zeker dat u deze bijlage wilt verwijderen?</msg>
-  <msg key="Attach">Toevoegen</msg>
+  <msg key="Attach">Bijvoegen</msg>
  <msg key="attach_new">&lt;b&gt;Nieuwe&lt;/b&gt; bijlage:</msg>
  <msg key="Attach_URL">URL bijvoegen</msg>
-  <msg key="Attachment">Bijlage</msg>
-  <msg key="Can_delete">Kan verwijderd worden</msg>
  <msg key="Choose">Kiezen</msg>
-  <msg key="delete_from_fs">Deze bijlagen van de opslag verwijderen?</msg>
  <msg key="Description">Beschrijving:</msg>
-  <msg key="Detach">Bijvoegen</msg>
-  <msg key="Detach_file_from">Los koppelen van %object_name%</msg>
  <msg key="File">Bestand</msg>
  <msg key="Last_Modified">Laatste wijziging</msg>
  <msg key="lt_Add_Attachment_Folder">Nieuwe hoofdmap aanmaken</msg>
@@ -34,16 +28,13 @@ map_naam XXX... Een koppeling hiernaar maken?</msg>
  <msg key="lt_The_specified_parent_">De gekozen bovenliggende map is niet geldig</msg>
  <msg key="lt_To_attach_a_file_alre">Om een bestand uit een map bij te voegen, dient op de mapnaam te worden geklikt en vervolgens op de koppeling &amp;quot;[ Kiezen ]&amp;quot; naast het bestand. Om een nieuw bestand in een map te plaatsen, dient op de mapnaam te worden geklikt en vervolgens op de koppeling &amp;quot;Invoeren nieuw bestand | URL&amp;quot;</msg>
  <msg key="lt_Upload_New_Attachment">Nieuwe bijlage aanbieden</msg>
-  <msg key="lt_Use_the_Browse_button">De knop \&#34;Bladeren\&#34; gebruiken om een bestand te vinden en dan op \&#34;Openen\&#34; klikken</msg>
+  <msg key="lt_Use_the_Browse_button">De knop \&quot;Bladeren\&quot; gebruiken om een bestand te vinden en dan op \&quot;Openen\&quot; klikken</msg>
  <msg key="lt_You_are_attaching_a_d">Er wordt een document bij %pretty_object_name% bijgevoegd.</msg>
-  <msg key="lt_You_probably_clicked_">Je hebt waarschijnlijk meer dan eens op de knop &#34;Toevoegen&#34; geklikt. Controleer of het bestand correct in de &lt;a href=&#34;%folder_url%&#34;&gt;gewenste map&lt;/a&gt; is opgeslagen. De knop &#34;Terug&#34; van de browser kan gebruikt worden om de handeling te herhalen.</msg>
+  <msg key="lt_You_probably_clicked_">Je hebt waarschijnlijk meer dan eens op de knop &quot;Toevoegen&quot; geklikt. Controleer of het bestand correct in de &lt;a href=&quot;%folder_url%&quot;&gt;gewenste map&lt;/a&gt; is opgeslagen. De knop &quot;Terug&quot; van de browser kan gebruikt worden om de handeling te herhalen.</msg>
  <msg key="lt_Your_file_is_larger_t">Het bestand is groter dan de maximaal toegestane omvang (%max_number_of_bytes% bytes)</msg>
  <msg key="Name">Naam</msg>
  <msg key="No_such_type">Dit type bestaat niet</msg>
  <msg key="Object">Object</msg>
-  <msg key="on_Object">op object</msg>
-  <msg key="Only_detach">Dit item is toegevoegd aan andere objecten. U kunt dit item alleen verwijderen van dit object, maar niet verwijderen van de bestandopslag.</msg>
-  <msg key="remove">verwijderen</msg>
  <msg key="Size">Grootte</msg>
  <msg key="Title">Titel</msg>
  <msg key="Top">Top</msg>

--- a/catalog/attachments.no_NO.ISO-8859-1.xml
+++ b/catalog/attachments.no_NO.ISO-8859-1.xml
@@ -27,9 +27,9 @@
  <msg key="lt_The_specified_parent_">Spesifisert foreldre-folder ikke gyldig.</msg>
  <msg key="lt_To_attach_a_file_alre">For  legge til en fil som allerede er i en mappe, pne mappen ved frst  klikke p navnet til meppen, s klikk &amp;quot;[ Velg ]&amp;quot;-lenken ved siden av filen. For  laste opp en ny fil til en mappe, pne mappen ved  klikke p mappens navnm s klikker du p den korrekte &amp;quot;Legg til en ny: Fil | URL&amp;quot;-lenken</msg>
  <msg key="lt_Upload_New_Attachment">Last opp nytt vedlegg</msg>
-  <msg key="lt_Use_the_Browse_button">Bruk &#34;Sk...&#34;-knappen for  finne filen din, s klikker du &#34;pne&#34;.</msg>
+  <msg key="lt_Use_the_Browse_button">Bruk &quot;Sk...&quot;-knappen for  finne filen din, s klikker du &quot;pne&quot;.</msg>
  <msg key="lt_You_are_attaching_a_d">Du legger ved et dokument til %pretty_object_name%. </msg>
-  <msg key="lt_You_probably_clicked_">Du har sannsynligvis klikket p Legg til-knappen mer enn en gang. Sjekk om filen er skikkelig innlagt i &lt;a href=&#34;%folder_url%&#34;&gt;mappen&lt;/a&gt; du nsker, eller bruk Tilbake-knappen for  gjenta operasjonen.</msg>
+  <msg key="lt_You_probably_clicked_">Du har sannsynligvis klikket p Legg til-knappen mer enn en gang. Sjekk om filen er skikkelig innlagt i &lt;a href=&quot;%folder_url%&quot;&gt;mappen&lt;/a&gt; du nsker, eller bruk Tilbake-knappen for  gjenta operasjonen.</msg>
  <msg key="lt_Your_file_is_larger_t">Filen din er strre enn maksimum filstrrelse tillatt p dette systemet (%max_number_of_bytes% bytes)</msg>
  <msg key="Name">Navn</msg>
  <msg key="No_such_type">Ingen slik type</msg>

--- a/catalog/attachments.pl_PL.utf-8.xml
+++ b/catalog/attachments.pl_PL.utf-8.xml
@@ -2,28 +2,22 @@
 <message_catalog package_key="attachments" locale="pl_PL" charset="utf-8">

  <msg key="Action">Czynność</msg>
-  <msg key="Add_File">Dodaj plik</msg>
+  <msg key="Add_File">Dodaj Plik</msg>
  <msg key="Add_folder_Link">Dodaj Folder z Linkami</msg>
  <msg key="Add_pretty_name">Dodaj %pretty_name%</msg>
-  <msg key="Are_you_sure_detach">Czy jesteś pewien, że chcesz usunąć ten załącznik?</msg>
  <msg key="Attach">Załącz</msg>
-  <msg key="attach_new">Załącz &lt;b&gt;nowy&lt;/b&gt;: </msg>
+  <msg key="attach_new">Dołącz &lt;b&gt;nowy&lt;/b&gt;: </msg>
  <msg key="Attach_URL">Załącz URL</msg>
-  <msg key="Attachment">Załącznik</msg>
-  <msg key="Can_delete">To jest jedyny obiekt, do którego ten element jest załączony. Możesz również usunąć ten element z magazynu plików.</msg>
  <msg key="Choose">Wybierz</msg>
-  <msg key="delete_from_fs">Usunąć ten załącznik z magazynu plików?</msg>
  <msg key="Description">Opis:</msg>
-  <msg key="Detach">Odłącz</msg>
-  <msg key="Detach_file_from">Odłącz plik od %object_name%</msg>
  <msg key="File">Plik</msg>
-  <msg key="Last_Modified">Ostatnio zmieniane</msg>
-  <msg key="lt_Add_Attachment_Folder">Dodaj załącznik folder link</msg>
-  <msg key="lt_Attach_a_File_to_pret">Załącz plik do %pretty_object_name%</msg>
-  <msg key="lt_contentscontent_size_">element %contents.content_size% </msg>
-  <msg key="lt_contentscontent_size__1">%contents.content_size% bajtów</msg>
+  <msg key="Last_Modified">Ostatnio Zmieniane</msg>
+  <msg key="lt_Add_Attachment_Folder">Dodaj Załącznik Folder Link</msg>
+  <msg key="lt_Attach_a_File_to_pret">Załącz Plik do %pretty_object_name%</msg>
+  <msg key="lt_contentscontent_size_">%contents.content_size% obiekt /?/</msg>
+  <msg key="lt_contentscontent_size__1">%contents.content_size% bajt</msg>
  <msg key="lt_Created_by_the_attach">Utworzony przez pakiet Załączniki</msg>
-  <msg key="lt_dont_know_how_to_deal">Nie wiem co zrobić z tym typem załącznika</msg>
+  <msg key="lt_dont_know_how_to_deal">nie wiem co zrobić z tym typem załącznika</msg>
  <msg key="lt_Error_Attachment_root">Błąd: Różne katalogi główne dla Załączników i Systemu Plików!</msg>
  <msg key="lt_Error_empty_folder_id">Błąd: pusty folder_id!</msg>
  <msg key="lt_Folder_folder_name_is">Folder %folder_name% jest pusty</msg>
@@ -32,23 +26,21 @@
  <msg key="lt_No_such_attachment_fo">Brak załącznika dla tego obiektu</msg>
  <msg key="lt_The_specified_parent_">Ten folder nadrzędny jest błędny. </msg>
  <msg key="lt_To_attach_a_file_alre">By załączyć plik, który jest już w folderze, otwórz folder klikając jego nazwę, potem kliknij link &amp;quot;[ Wybierz ]&amp;quot; obok pliku. By wgrać nowy plik do foldera, otwórz folder klikając jego nazwę, potem kliknij odpowiedni link: &amp;quot;Załącz nowy: Plik | URL&amp;quot;</msg>
-  <msg key="lt_Upload_New_Attachment">Wgraj nowy załącznik</msg>
-  <msg key="lt_Use_the_Browse_button">Wybierz plik używając przycisku &#34;Przeglądaj...&#34; lub &#34;Browse...&#34;, następnie kliknij &#34;Otwórz&#34; lub &#34;Open&#34;.</msg>
+  <msg key="lt_Upload_New_Attachment">Wgraj Nowy Załącznik</msg>
+  <msg key="lt_Use_the_Browse_button">Wybierz plik używając przycisku &quot;Przeglądaj...&quot; lub &quot;Browse...&quot;, następnie kliknij &quot;Otwórz&quot; lub &quot;Open&quot;.</msg>
  <msg key="lt_You_are_attaching_a_d">Załączasz dokument do %pretty_object_name%.</msg>
-  <msg key="lt_You_probably_clicked_">Prawdopodobnie dwukrotnie kliknięto przycisk Dodaj. Sprawdź czy plik został prawidłowo wgrany do &lt;a href=&#34;%folder_url%&#34;&gt;żądanego foldera&lt;/a&gt; albo cofnij przeglądarkę i wprowadź nową wersję pliku. </msg>
+  <msg key="lt_You_probably_clicked_">Prawdopodobnie dwukrotnie kliknięto przycisk Dodaj. Sprawdź czy plik został prawidłowo wgrany do &lt;a href=&quot;%folder_url%&quot;&gt;żądanego foldera&lt;/a&gt; albo cofnij przeglądarkę i wprowadź nową wersję pliku. </msg>
  <msg key="lt_Your_file_is_larger_t">Twój plik jest zbyt duży. Maksymalna wielkość to %max_number_of_bytes% bajtów.</msg>
  <msg key="Name">Nazwa</msg>
  <msg key="No_such_type">Brak takiego typu</msg>
  <msg key="Object">Obiekt</msg>
-  <msg key="on_Object">dla obiektu</msg>
-  <msg key="remove">usuń</msg>
  <msg key="Size">Rozmiar</msg>
-  <msg key="Title">Tytuł</msg>
-  <msg key="Top">Początkowy</msg>
+  <msg key="Title">Tytuł:</msg>
+  <msg key="Top">Najwyższy</msg>
  <msg key="Type">Typ</msg>
  <msg key="URL">URL</msg>
-  <msg key="URL_1">URL</msg>
-  <msg key="Version_filename_">Wersja pliku</msg>
+  <msg key="URL_1">URL:</msg>
+  <msg key="Version_filename_">Nazwa Pliku Wersji:</msg>
  <msg key="you_are_attaching_document_to_object">Dołączasz nowy dokument do %pretty_object_name%.</msg>
  <msg key="you_are_attaching_url_to_object">Dołączasz nowy url do %pretty_object_name%.</msg>
 </message_catalog>
--- a/catalog/attachments.pt_BR.ISO-8859-1.xml
+++ b/catalog/attachments.pt_BR.ISO-8859-1.xml
@@ -27,9 +27,9 @@
  <msg key="lt_The_specified_parent_">A pasta pai especificada  invlida.</msg>
  <msg key="lt_To_attach_a_file_alre">Para anexar um arquivo j presente numa pasta, abra a pasta clicando no nome dela, e depois clique em &amp;quot;[ Escolher ]&amp;quot; perto do arquivo. Para carregar um novo arquivo numa pasta, abra a pasta clicando no nome dela, e depois clique em &amp;quot;Anexar um novo: Arquivo | URL&amp;quot;</msg>
  <msg key="lt_Upload_New_Attachment">Carregar Novo Anexo</msg>
-  <msg key="lt_Use_the_Browse_button">Use o boto &#34;Procurar...&#34; para localizar seu arquivo, ento clique em &#34;Abrir&#34;.</msg>
+  <msg key="lt_Use_the_Browse_button">Use o boto &quot;Procurar...&quot; para localizar seu arquivo, ento clique em &quot;Abrir&quot;.</msg>
  <msg key="lt_You_are_attaching_a_d">Voc est a anexar um documento a %pretty_object_name%.</msg>
-  <msg key="lt_You_probably_clicked_">Voc provavelmente clicou no boto de Adicionar mais de uma vez. Comprove se o ficheiro est corretamente carregado na &lt;a href=&#34;%folder_url%&#34;&gt;pasta&lt;/a&gt; que voc quer, ou pode usar o boto Voltar para voltar e fornecer novamente a verso do arquivo.</msg>
+  <msg key="lt_You_probably_clicked_">Voc provavelmente clicou no boto de Adicionar mais de uma vez. Comprove se o ficheiro est corretamente carregado na &lt;a href=&quot;%folder_url%&quot;&gt;pasta&lt;/a&gt; que voc quer, ou pode usar o boto Voltar para voltar e fornecer novamente a verso do arquivo.</msg>
  <msg key="lt_Your_file_is_larger_t">Seu ficheiro  mais grande do que o mximo tamanho de ficheiro permitido neste sistema (%max_number_of_bytes% bytes)</msg>
  <msg key="Name">Nome</msg>
  <msg key="No_such_type">No existe esse tipo</msg>

--- a/catalog/attachments.ru_RU.utf-8.xml
+++ b/catalog/attachments.ru_RU.utf-8.xml
@@ -31,11 +31,11 @@
  <msg key="lt_No_file-storage_folde">Не найдены связанные папки файлового хранилища. Не хотели бы создать?</msg>
  <msg key="lt_No_such_attachment_fo">Похожие вложения для этого объекта отсутствует</msg>
  <msg key="lt_The_specified_parent_">Указаная родительская папка отсутствует.</msg>
-  <msg key="lt_To_attach_a_file_alre">Для того, чтобы приложить файл, находящийся в папке, откройте папку, нажав на её название, затем нажмите на &amp;quot;[ Choose ]&amp;quot; для связи с файлом. Если у вас есть соответствующие системные права, вы также сможете загрузить новый файл в папку. Для этого, откройте папку, нажав на ссылку. Ссылка &#34;Attach a new: File | URL&#34; будет доступна только если вы имеете соответствующие права.</msg>
+  <msg key="lt_To_attach_a_file_alre">Для того, чтобы приложить файл, находящийся в папке, откройте папку, нажав на её название, затем нажмите на &amp;quot;[ Choose ]&amp;quot; для связи с файлом. Если у вас есть соответствующие системные права, вы также сможете загрузить новый файл в папку. Для этого, откройте папку, нажав на ссылку. Ссылка &quot;Attach a new: File | URL&quot; будет доступна только если вы имеете соответствующие права.</msg>
  <msg key="lt_Upload_New_Attachment">Загрузить новое вложение</msg>
-  <msg key="lt_Use_the_Browse_button">Используйте кнопку &#34;Browse...&#34; для выбора файла, затем нажмите &#34;Open&#34; (&#34;Открыть&#34;).</msg>
+  <msg key="lt_Use_the_Browse_button">Используйте кнопку &quot;Browse...&quot; для выбора файла, затем нажмите &quot;Open&quot; (&quot;Открыть&quot;).</msg>
  <msg key="lt_You_are_attaching_a_d">Вы присоединяете документ к %pretty_object_name%.</msg>
-  <msg key="lt_You_probably_clicked_">Вероятно, вы нажали на кнопку Добавить более одного раза. Проверьте, правильно ли загрузился файл в выбранную папку &lt;a href=&#34;%folder_url%&#34;&gt;папку&lt;/a&gt;, или воспользуйтесь кнопкой Назад для возврата и обновления версии файла.</msg>
+  <msg key="lt_You_probably_clicked_">Вероятно, вы нажали на кнопку Добавить более одного раза. Проверьте, правильно ли загрузился файл в выбранную папку &lt;a href=&quot;%folder_url%&quot;&gt;папку&lt;/a&gt;, или воспользуйтесь кнопкой Назад для возврата и обновления версии файла.</msg>
  <msg key="lt_Your_file_is_larger_t">Размер вашего файла больше разрешённого в этой системе (%max_number_of_bytes% байт)</msg>
  <msg key="Name">Имя</msg>
  <msg key="No_such_type">Такой тип отсутствует</msg>

--- a/catalog/attachments.tr_TR.utf-8.xml
+++ b/catalog/attachments.tr_TR.utf-8.xml
@@ -13,7 +13,7 @@
  <msg key="File">Dosya</msg>
  <msg key="Last_Modified">Son Duzenlenme</msg>
  <msg key="lt_Add_Attachment_Folder">Baglanacak Klasorun Yolunu Ekleyin</msg>
-  <msg key="lt_Attach_a_File_to_pret">Dosyayi %pretty_object_name% &#39;e bagla</msg>
+  <msg key="lt_Attach_a_File_to_pret">Dosyayi %pretty_object_name% 'e bagla</msg>
  <msg key="lt_contentscontent_size_">%contents.content_size% maddesi</msg>
  <msg key="lt_contentscontent_size__1">%contents.content_size% byte</msg>
  <msg key="lt_Created_by_the_attach">Baglanan paket tarafindan yaratildi</msg>
@@ -26,11 +26,11 @@
  <msg key="lt_No_file-storage_folde">Linkteki dosya depolama klasoru bulunamadi. Bir tane yaratmak ister misiniz?</msg>
  <msg key="lt_No_such_attachment_fo">Bu nesne icin boyle bir bagli dosya yok.</msg>
  <msg key="lt_The_specified_parent_">Belirlenen ana klasor gecerli degil.</msg>
-  <msg key="lt_To_attach_a_file_alre">Varolan bir klasore dosya eklerken, klasorun adina tiklayarak klasoru acin ve &amp;quot;[ Choose ]&amp;quot; &#39;e tiklayin, sonrakini de baglayin. Eger uygun sistem izinlerine sahipseniz klasore yeni bir dosya da yukleyebilirsiniz. Bunu yapmak icin, baglantiya tiklayarak klasoru acin. Sadece izni olanlara &#34;Attach a new: File | URL&#34; baglantisi gozukecektir.</msg>
+  <msg key="lt_To_attach_a_file_alre">Varolan bir klasore dosya eklerken, klasorun adina tiklayarak klasoru acin ve &amp;quot;[ Choose ]&amp;quot; 'e tiklayin, sonrakini de baglayin. Eger uygun sistem izinlerine sahipseniz klasore yeni bir dosya da yukleyebilirsiniz. Bunu yapmak icin, baglantiya tiklayarak klasoru acin. Sadece izni olanlara &quot;Attach a new: File | URL&quot; baglantisi gozukecektir.</msg>
  <msg key="lt_Upload_New_Attachment">Yeni dosya yukle</msg>
-  <msg key="lt_Use_the_Browse_button">Dosyanizin yerini gostermek icin &#34;Browse...&#34; dugmesine basin sonra da &#34;Open&#34; dugmesine tiklayin.</msg>
+  <msg key="lt_Use_the_Browse_button">Dosyanizin yerini gostermek icin &quot;Browse...&quot; dugmesine basin sonra da &quot;Open&quot; dugmesine tiklayin.</msg>
  <msg key="lt_You_are_attaching_a_d">Bir dokumani suraya bagladiniz: %pretty_object_name%</msg>
-  <msg key="lt_You_probably_clicked_">Birden fazla kez Ekle dugmesine basmis olmalisiniz. Isterseniz dosyanizin &lt;a href=&#34;%folder_url%&#34;&gt;folder&lt;/a&gt; kaynagindan dogru olarak yuklendigini kontrol edin veya Geri dugmesini kullanarak dosyanizin surumunu tekrar girin.</msg>
+  <msg key="lt_You_probably_clicked_">Birden fazla kez Ekle dugmesine basmis olmalisiniz. Isterseniz dosyanizin &lt;a href=&quot;%folder_url%&quot;&gt;folder&lt;/a&gt; kaynagindan dogru olarak yuklendigini kontrol edin veya Geri dugmesini kullanarak dosyanizin surumunu tekrar girin.</msg>
  <msg key="lt_Your_file_is_larger_t">Dosyaniz sistem tarafindan izin verilen en buyuk boyutu asti (%max_number_of_bytes% bytes)</msg>
  <msg key="Name">Isim</msg>
  <msg key="No_such_type">Boyle bir tur yok</msg>
@@ -43,5 +43,5 @@
  <msg key="URL_1">URL:</msg>
  <msg key="Version_filename_">Surum dosya adi:</msg>
  <msg key="you_are_attaching_document_to_object">Yeni bir dosyayi suraya ekliyorsunuz: %pretty_object_name%</msg>
-  <msg key="you_are_attaching_url_to_object">Yeni bir URL &#39;yi suraya ekliyorsunuz: %pretty_object_name%</msg>
+  <msg key="you_are_attaching_url_to_object">Yeni bir URL 'yi suraya ekliyorsunuz: %pretty_object_name%</msg>
 </message_catalog>
--- a/catalog/attachments.zh_CN.utf-8.xml
+++ b/catalog/attachments.zh_CN.utf-8.xml
@@ -29,7 +29,7 @@
  <msg key="lt_Upload_New_Attachment">上传新附件</msg>
  <msg key="lt_Use_the_Browse_button">用“浏览……”按钮查找文件，然后单击“打开”。</msg>
  <msg key="lt_You_are_attaching_a_d">正在将文档附加到%pretty_object_name%。</msg>
-  <msg key="lt_You_probably_clicked_">可能已多次点击“增加”钮，检查文件是否已经装入&lt;a href=&#34;%folder_url%&#34;&gt;文件夹&lt;/a&gt;，或者用“后退”钮返回，重新进入此版本文件。 </msg>
+  <msg key="lt_You_probably_clicked_">可能已多次点击“增加”钮，检查文件是否已经装入&lt;a href=&quot;%folder_url%&quot;&gt;文件夹&lt;/a&gt;，或者用“后退”钮返回，重新进入此版本文件。 </msg>
  <msg key="lt_Your_file_is_larger_t">文件大于系统规定的最大文件大小（%max_number_of_bytes%字节）</msg>
  <msg key="Name">名称</msg>
  <msg key="No_such_type">无此类型</msg>

--- a/sql/postgresql/attachments-create.sql
+++ b/sql/postgresql/attachments-create.sql
@@ -44,10 +44,8 @@ create table attachments (
 				constraint attachments_item_id_fk
                                references acs_objects(object_id)
                                on delete cascade,
-    approved_p                  char(1)
-                                default 't'
-                                constraint attachments_approved_p_ck
-                                check (approved_p in ('t', 'f'))
+    approved_p                  boolean
+                                default true
                                constraint attachments_approved_p_nn
                                not null,
    constraint                  attachments_pk

--- a/sql/postgresql/upgrade/upgrade-0.11d2-0.11d3.sql
+++ b/sql/postgresql/upgrade/upgrade-0.11d2-0.11d3.sql
+--
+-- Alter caveman style booleans (type character(1)) to real SQL boolean types.
+--
+
+ALTER TABLE attachments
+      DROP constraint IF EXISTS attachments_approved_p_ck,
+      ALTER COLUMN approved_p DROP DEFAULT,
+      ALTER COLUMN approved_p TYPE boolean
+      USING approved_p::boolean,
+      ALTER COLUMN approved_p SET DEFAULT true;
+
--- a/www/admin/new-root-folder-map-2.tcl
+++ b/www/admin/new-root-folder-map-2.tcl
@@ -20,7 +20,7 @@ ad_page_contract {
    @cvs-id $Id$

 } -query {
-    {package_id:notnull}
+    {package_id:naturalnum,notnull,notnull}
    {referer:notnull}
 }


--- a/www/admin/new-root-folder-map.adp
+++ b/www/admin/new-root-folder-map.adp
@@ -6,14 +6,14 @@
 <if @root_folder_id@ eq 0>
  #attachments.lt_No_file-storage_folde#
  <form method=get action=new-root-folder-map-2>
-    <input type=hidden name=package_id value=@package_id@>
-    <input type=hidden name=referer value=@referer@>
-    <input type=submit value="Yes">
+    <input type="hidden" name="package_id" value="@package_id@">
+    <input type="hidden" name="referer" value="@referer@">
+    <input type="submit" value="Yes">
  </form>

  <form method=get action=redirect>
-    <input type=hidden name=referer value=@referer@>
-    <input type=submit value="No">
+    <input type="hidden" name="referer" value="@referer@">
+    <input type="submit" value="No">
  </form>

 </if>

--- a/www/admin/new-root-folder-map.tcl
+++ b/www/admin/new-root-folder-map.tcl
@@ -20,7 +20,7 @@ ad_page_contract {
    @cvs-id $Id$

 } -query {
-    {package_id:notnull}
+    {package_id:naturalnum,notnull,notnull}
    {referer:notnull}
 }


--- a/www/attach-2.tcl
+++ b/www/attach-2.tcl
@@ -7,9 +7,9 @@ ad_page_contract {
    @cvs-id $Id$

 } -query {
-    {object_id:notnull}
-    {item_id:notnull}
-    {return_url:notnull}
+    {object_id:naturalnum,notnull,notnull}
+    {item_id:naturalnum,notnull,notnull}
+    {return_url:localurl,notnull}
 }

 # Perms

--- a/www/attach.adp
+++ b/www/attach.adp
@@ -6,7 +6,7 @@

 <p>#attachments.lt_To_attach_a_file_alre#</p>

-<if @write_permission_p@ eq 1>
+<if @write_permission_p;literal@ true>
 #attachments.attach_new#
      &nbsp;
      <a href="@file_add_url@">#attachments.File#</a>

--- a/www/attach.tcl
+++ b/www/attach.tcl
@@ -7,10 +7,10 @@ ad_page_contract {
    @cvs-id $Id$

 } -query {
-    {object_id:notnull}
-    {folder_id ""}
+    {object_id:naturalnum,notnull,notnull}
+    {folder_id:integer ""}
    {pretty_object_name ""}
-    {return_url:notnull}
+    {return_url:localurl,notnull}
 }

 set user_id [ad_conn user_id]

--- a/www/detach.tcl
+++ b/www/detach.tcl
@@ -10,7 +10,7 @@ ad_page_contract {
 } {
    object_id:naturalnum,notnull
    attachment_id:naturalnum,notnull
-    {return_url ""}
+    {return_url:localurl ""}
 } -properties {
 } -validate {
 } -errors {

--- a/www/doc/index.adp
+++ b/www/doc/index.adp
@@ -35,7 +35,7 @@ attachments do?</h3>
 <tt>attachments</tt> is a service package that allows you to
 attach one or more file-storage files to any <tt>acs_object</tt>.
 <tt>attachments</tt> is mounted below a package that uses it, and
-the application provides links into the attachments package's
+the application provides links into the attachments package&#39;s
 UI.</p>
 <h3>
 <a id="id.s1.1.2" name="id.s1.1.2">1.1.2</a> At a high level,
@@ -43,9 +43,9 @@ how does attachments work?</h3>
 <p>Before you can use the attachments package, each instance of
 your package must be mapped to a <tt>file-storage root
 folder</tt>.</p>
-<p>The root folder is a "super folder" for all the files in that
-specific instance of file-storage, and it is created automatically
-when the file-storage package is instanciated.</p>
+<p>The root folder is a "super folder" for all the files
+in that specific instance of file-storage, and it is created
+automatically when the file-storage package is instanciated.</p>
 <p>When a user wants to make an attachment to an object in your
 package, she is shown the contents of the file-storage root folder
 mapped to your package instance. The user is also given the option
@@ -55,14 +55,16 @@ to upload a new file into file-storage to attach.</p>
 <h3>
 <a id="id.s1.2.1" name="id.s1.2.1">1.2.1</a> Mount attachments
 under your package</h3>
-<p>The first step is to mount the attachments package <b>under</b>
-your package. In the <tt>site-map</tt>, you should create a new
-site-node (sub-folder) under your package called "attach".</p>
-<p>"attach" is the standard URL, however URL this can be changed on
-a site-wide basis by changing the "RelativeUrl" parameter of
-<b>any</b> of the attachments packages (this works since there's
-only one instance of attachments in the entire system. The same
-instance is just re-mounted)</p>
+<p>The first step is to mount the attachments package
+<strong>under</strong> your package. In the <tt>site-map</tt>, you
+should create a new site-node (sub-folder) under your package
+called "attach".</p>
+<p>"attach" is the standard URL, however URL this can be
+changed on a site-wide basis by changing the
+"RelativeUrl" parameter of <strong>any</strong> of the
+attachments packages (this works since there&#39;s only one
+instance of attachments in the entire system. The same instance is
+just re-mounted)</p>
 <h3>
 <a id="id.s1.2.2" name="id.s1.2.2">1.2.2</a> Map an
 file-storage root folder to your package instance</h3>
@@ -87,8 +89,8 @@ package check if attachments is mounted properly</h4>
 <p>Most likely, you want your package to work even if the
 attachments package is not installed on the system or if
 attachments is not properly mounted. To do this, add the following
-proc to your package's API and wrap all calls to the attachments
-package with it:</p>
+proc to your package&#39;s API and wrap all calls to the
+attachments package with it:</p>
 <div class="box" style="border: 2px solid; width: 100%"><pre>
    ad_proc -private attachments_enabled_p {} {
        set package_id [site_node_apm_integration::child_package_exists_p \
@@ -118,7 +120,7 @@ to add an attachment to their posting.</p>
 <h3>
 <a id="id.s1.2.4" name="id.s1.2.4">1.2.4</a> Viewing attached
 files</h3>
-<p>You can use the "attachments::get_attachments" proc to see the
-list of attachments to a given object.</p>
+<p>You can use the "attachments::get_attachments" proc to
+see the list of attachments to a given object.</p>
 <h2>Release Notes</h2>
 <p>Please file bugs in the <a href="http://openacs.org/bugtracker/openacs/">Bug Tracker</a>.</p>
--- a/www/download/index.vuh
+++ b/www/download/index.vuh
@@ -26,3 +26,9 @@ if {$version_id eq ""} {
 }

 cr_write_content -revision_id $version_id
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End:
--- a/www/file-add-2.tcl
+++ b/www/file-add-2.tcl
@@ -9,7 +9,7 @@ ad_page_contract {
    upload_file:notnull,trim
    upload_file.tmpfile:tmpfile
    object_id:naturalnum,notnull
-    return_url:notnull
+    return_url:localurl,notnull
    title:notnull,trim
    description
 } -validate {

--- a/www/file-add.adp
+++ b/www/file-add.adp
@@ -6,9 +6,9 @@

 <form enctype="multipart/form-data" method="POST" action="file-add-2">
 <div>
-<input type=hidden name="folder_id" value="@folder_id@">
-<input type=hidden name="object_id" value="@object_id@">
-<input type=hidden name="return_url" value="@return_url@">
+<input type="hidden" name="folder_id" value="@folder_id@">
+<input type="hidden" name="object_id" value="@object_id@">
+<input type="hidden" name="return_url" value="@return_url@">
 </div>

 <table border="0">
@@ -16,7 +16,7 @@
 <tr>
 <td align="right">
 <label for="upload_file">#attachments.Version_filename_#</label></td>
-<td><input type="file" name="upload_file" id="upload_file" size=20></td>
+<td><input type="file" name="upload_file" id="upload_file" size="20"></td>
 </tr>

 <tr>
@@ -30,13 +30,13 @@
 </tr>

 <tr>
-  <if @lock_title_p@ eq 0>
+  <if @lock_title_p;literal@ false>
    <td align="right"><label for="title">#attachments.Title#</label></td>
-    <td><input size=30 name="title" id="title" value="@title@"></td>
+    <td><input size="30" name="title" id="title" value="@title@"></td>
  </if>
  <else>
      <td align="right"> #attachments.Title#
-        <input type=hidden name=title value=@title@>
+        <input type="hidden" name="title" value="@title@">
      </td>
      <td>@title@</td>
  </else>
@@ -52,7 +52,7 @@

 <tr>
 <td></td>
-<td><input type=submit value="Upload">
+<td><input type="submit" value="Upload">
 </td>
 </tr>


--- a/www/file-add.tcl
+++ b/www/file-add.tcl
@@ -7,7 +7,7 @@ ad_page_contract {
 } {
    folder_id:naturalnum,notnull
    object_id:naturalnum,notnull
-    return_url:notnull
+    return_url:localurl,notnull
    pretty_object_name:notnull
    {title ""}
    {lock_title_p:boolean 0}

--- a/www/index.adp
+++ b/www/index.adp
+<master>
+<property name="doc(title)">Attachments</property>
+
+<h1>Attachments</h1>
+
+<p>This page should not be in the normal link paths of users, but one can get here via <a href="/acs-admin/">/acs-admin/</a>.
+<p>Here is some <a href="doc">documentation</a> of the Attachments package.
+
--- a/www/simple-add-2.tcl
+++ b/www/simple-add-2.tcl
@@ -7,7 +7,7 @@ ad_page_contract {
 } {
    folder_id:naturalnum,notnull
    object_id:naturalnum,notnull
-    return_url:notnull
+    return_url:localurl,notnull
    title:notnull,trim
    description
    url:notnull,trim

--- a/www/simple-add.adp
+++ b/www/simple-add.adp
@@ -8,31 +8,31 @@

 <form method=POST action="simple-add-2">
 <div>
-<input type=hidden name="folder_id" value="@folder_id@">
-<input type=hidden name="type" value="@type@">
-<input type=hidden name="object_id" value="@object_id@">
-<input type=hidden name="return_url" value="@return_url@">
+<input type="hidden" name="folder_id" value="@folder_id@">
+<input type="hidden" name="type" value="@type@">
+<input type="hidden" name="object_id" value="@object_id@">
+<input type="hidden" name="return_url" value="@return_url@">
 </div>

 <table border="0">

 <tr>
-  <if @lock_title_p@ eq 0>
+  <if @lock_title_p;literal@ false>
    <td align="right"><label for="title">#attachments.Title#</label></td>
-    <td><input size=30 name="title" value="@title@" id="title"></td>
+    <td><input size="30" name="title" value="@title@" id="title"></td>
  </if>
  <else>
     <td align="right">#attachments.Title#</td>
     <td>
       @title@
-       <input type=hidden name="title" value="@title@">
+       <input type="hidden" name="title" value="@title@">
     </td>
  </else>
 </tr>

 <tr>
 <td align="right"><label for="url">#attachments.URL_1#</label></td>
-<td><input size=50 name="url" value="http://" id="url"></td>
+<td><input size="50" name="url" value="http://" id="url"></td>
 </tr>

 <tr>
@@ -42,7 +42,7 @@

 <tr>
 <td></td>
-<td><input type=submit value="Create">
+<td><input type="submit" value="Create">
 </td>
 </tr>


--- a/www/simple-add.tcl
+++ b/www/simple-add.tcl
@@ -8,7 +8,7 @@ ad_page_contract {
 } {
    folder_id:naturalnum,notnull
    object_id:naturalnum,notnull
-    return_url:notnull
+    return_url:localurl,notnull
    pretty_object_name:notnull
    {type "fs_url"}
    {title ""}

--- a/www/toggle-approved.tcl
+++ b/www/toggle-approved.tcl
@@ -7,8 +7,8 @@ ad_page_contract {
 } -query {
    {object_id:naturalnum,notnull}
    {item_id:naturalnum,notnull}
-    {approved_p ""}
-    {return_url:notnull}
+    {approved_p:boolean ""}
+    {return_url:localurl,notnull}
 }

 attachments::toggle_approved -object_id $object_id -item_id $item_id -approved_p $approved_p