Release 2.7.7-1

SVN revision: 2246
2009-07-31 11:00:49 +00:00
parent 8e03f09fa8
commit 97b4959f64
21 changed files with 145 additions and 109 deletions
@@ -1,3 +1,37 @@
+Version 2.7.7, released July 31st 2009
+======================================
+
+- Upgraded FCKEdit to 2.6.4.1
+- Changed ELCode select box names not to collide with "size" attribute
+- Better check for inline images
+- Fixed crash with two logbooks using same subdir
+- Completed list of forbidden attributes
+- Fixed broken inline images in email notification
+- Fixed problem with invalid encoding
+- Fixed JavaScript check for required date_time attributes
+- Implemented "Thumbnail size = 0"
+- Reworked memory allocation in copy_to
+- Implemented "Collapse to last"
+- After a "Move to" the next thread head is displayed
+- Use dedicated class for text and attachment titles in list display
+- Allow "Submit" if "Edit" is in menu list
+- Removed CR/LF from redirection to avoid XSS
+- Fixed bug with RSS feed if logbook is empty
+- Fixed problem with auto indices
+- Fixed required attributes under a condition
+- Fixed wrong file names on copy/move of old entries
+- Replaced signal() calls by sigaction() calls to avoid Solaris problems, thanks to Paul T. Keener
+- Include thumbnails in "move to" and "copy to" commands
+- Implemented "Preserve IDs"
+- Fixed inline image references when moving entries between logbooks
+- Fixed NULL pointer at end of scipt_tags[] array
+- Fixed crash with password recovery and bottom text
+- Make password recovery working with protected selection pages
+- Added Open XML MIME types
+- Hide attachment column in lis display if "enable attachments = 0"
+- Fixed bug with ROptions when one option is a substring of another
+- Fixed cookie handling, thanks to Simon Patton
+
 Version 2.7.6, released April 14th 2009
 =======================================

@@ -28,7 +28,7 @@
            &nbsp;[<a class="nav" href="#links">Links</a>]&nbsp; *&nbsp;</div>
      <P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt&#64;psi.ch">
            Stefan Ritt</a></P>
-      <div class="version">Current version is : 2.7.6</div>
+      <div class="version">Current version is : 2.7.7</div>
      <center>
      <a href="http://www.softpedia.com/progClean/ELOG-Clean-30897.html"><img border="0" src="http://www.softpedia.com/images/spyward/softpedia_free_award_f.gif" alt="certificate" title="certificate" /></a>
      </center>
@@ -28,7 +28,7 @@
            &nbsp;[<a class="nav" href="#links">Links</a>]&nbsp; *&nbsp;</div>
      <P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt&#64;psi.ch">
            Stefan Ritt</a></P>
-      <div class="version">Current version is : 2.7.6</div>
+      <div class="version">Current version is : 2.7.7</div>
      <center>
      <a href="http://www.softpedia.com/progClean/ELOG-Clean-30897.html"><img border="0" src="http://www.softpedia.com/images/spyward/softpedia_free_award_f.gif" alt="certificate" title="certificate" /></a>
      
@@ -139,7 +139,6 @@ Enter your user name or email address = Entre com o nome do usu
 Forgot = Esquecido
 ELOG new user = Novo usuário do ELOG
 Retype password = Digite novamente a senha
-Only user <i>%s</i> can delete this entry = Apenas o usuário <i>%s</i> pode remover essa entrada 
 Are you sure to delete these messages? = Voce tem certeza de que deseja apagar essa mensagem ?
 and all their replies = e todas suas repostas
 Synchronization = Sincronização
@@ -464,10 +463,11 @@ Cannot create thumbnail, please check ImageMagick installation =
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -183,7 +183,6 @@ No =
 Yes = Äà
 Error deleting message: status = Ãðåøêà ïðè èçòðèâàíå íà ñúîáùåíèå: ñòàòóñ
 No entry selected for deletion = Íå å èçáðàí çàïèñ çà èçòðèâàíå
-Only user <i>%s</i> can delete this entry = Ñàìî ïîòðåáèòåëÿò <i>%s</i> ìîæå äà èçòðèå òîçè çàïèñ
 Are you sure to delete these messages? = Ñèãóðåí ëè ñòå, ÷å èñêàòå äà èçòðèåòå òåçè ñúîáùåíèÿ?
 and all their replies = è âñè÷êè òåõíè îòãîâîðè
 Are you sure to delete this entry? = Ñèãóðåí ëè ñòå, ÷å èñêàòå äà èçòðèåòå òîçè çàïèñ?
@@ -464,10 +463,11 @@ Cannot create thumbnail, please check ImageMagick installation =
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -139,7 +139,6 @@ Upload = Odeslat
 Requested = Požadovaný
 Registration request on logbook "%s" = Požadavek registrace na logbook "%s"
 A new ELOG user wants to register on "%s" = Nový uživatel se chce registrovat na "%s"
-Only user <i>%s</i> can delete this entry = Pouze uživatel <i>%s</i> může mazat tuto položku
 Search text also in attributes = Hledej text také v atributech
 Date = Date
 ID = ID
@@ -461,10 +460,11 @@ Cannot create thumbnail, please check ImageMagick installation =
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -139,7 +139,6 @@ Upload = L
 Requested = Rekvirer
 Registration request on logbook "%s" = Anmodning om registrering på logbog "%s"
 A new ELOG user wants to register on "%s" = Ny Bruger Ønsker At Registrere på "%s" logbogen
-Only user <i>%s</i> can delete this entry = Kun Bruger <i>%s</i> kan slette dette indlæg
 Search text also in attributes = Søg også text i attributerne
 Date = Dato
 ID = ID
@@ -461,10 +460,11 @@ Cannot create thumbnail, please check ImageMagick installation =
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -140,7 +140,6 @@ Upload = Upload
 Requested = Verzocht
 Registration request on logbook "%s" = Registratie verzoek voor Logboek "%s"
 A new ELOG user wants to register on "%s" = Een nieuwe Elog gebruiker wil zich registreren voor "%s"
-Only user <i>%s</i> can delete this entry = Alleen gebruiker <i>%s</i> kan dit bericht wissen
 Search text also in attributes = Zoek ook in attributen
 Date = Datum
 ID = ID
@@ -464,10 +463,11 @@ Cannot create thumbnail, please check ImageMagick installation = Kan geen voorbe
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -138,7 +138,6 @@ Upload = Envoyer
 Requested = Demandé
 Registration request on logbook "%s" = Demande d'inscription pour le registre "%s"
 A new ELOG user wants to register on "%s" = Un nouvel utilisateur ELOG souhaite s'inscrire à "%s"
-Only user <i>%s</i> can delete this entry = Seul l'utilisateur <i>%s</i> peut supprimer cette entrée
 Search text also in attributes = Rechercher également le texte dans les attributs
 Date = Date
 ID = ID
@@ -461,10 +460,11 @@ Error: Content length (%d) larger than maximum content length (%d) = Erreur : la
 #
 #---- please translate following items and then remove this comment ----#
 #
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -139,7 +139,6 @@ Upload = Hochladen
 Requested = Erfordert
 Registration request on logbook "%s" = Registrierungsanforderung für Logbuch "%s"
 A new ELOG user wants to register on "%s" = Ein neuer Benutzer möchte sich auf "%s" registrieren
-Only user <i>%s</i> can delete this entry = Dieser Eintrag kann nur von <i>%s</i> gelöscht werden
 Search text also in attributes = Text auch in Attributen suchen
 Date = Datum
 ID = ID
@@ -456,10 +455,11 @@ Cannot create thumbnail, please check ImageMagick installation = Kann Vorschau n
 Please log on by clicking on following link and change your password = Bitte durck klicken auf den folgenden link anmelden und Kennwort ändern
 Attachments = Anhänge
 Error: Content length (%d) larger than maximum content length (%d) = Fehler: Datengröße (%d) ist größer als maximal erlaubte Datengröße (%d)
-Forbidden attribute: %s = Verbotenes Attribut: %s
 ELOG error = ELOG Fehler
 Only user <b>%s</b> can edit this entry = Nur Benutzer <b>%s</b> kann diesen Eintrag ändern
 Export to = Exportieren nach
 Do not ignore first line = Erste Zeile nicht ignorieren
 Last %d hours = Letzte %d Stunden
 Invalid URL = Ungültige URL
+Attribute "%s" is not allowed in config file = Das Attribut "%s" ist in der Konfigurationsdatei nicht erlaubt 
+Only user <b>%s</b> can delete this entry = Nur der Benutzer <b>%s</b> kann diesen Entrag löschen
@@ -139,7 +139,6 @@ Upload = Carica
 Requested = Richiesto
 Registration request on logbook "%s" = Richiesta di registrazione nel registro "%s"
 A new ELOG user wants to register on "%s" = Un nuovo utente ELOG vuole registrarsi su "%s"
-Only user <i>%s</i> can delete this entry = Solo l'utente <i>%s</i> può cancellare questo elemento
 Search text also in attributes = Ricerca il testo anche negli attributi
 Date = Data
 ID = ID
@@ -459,10 +458,11 @@ Cannot create thumbnail, please check ImageMagick installation =
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -111,7 +111,6 @@ No =
 Yes = はい
 Error deleting message: status = 記事を削除中にエラーが発生しました
 No entry selected for deletion = 削除する記事が選択されていません
-Only user <i>%s</i> can delete this entry = ユーザー <i>%s</i>だけがこの記事を削除できます
 Are you sure to delete these messages? = これらの記事を削除してもよろしいですか？
 and all their replies = 返信記事も削除されます。よろしいですか？
 and all its replies = 返信記事も削除されます。よろしいですか？
@@ -460,10 +459,11 @@ Cannot create thumbnail, please check ImageMagick installation =
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -182,7 +182,6 @@ No =
 Yes = Да
 Error deleting message: status = Ошибка удаления сообщения: статус
 No entry selected for deletion = Не выбрана запись для удаления
-Only user <i>%s</i> can delete this entry = Только пользователь <i>%s</i> может удалить эту запись
 Are you sure to delete these messages? = Вы уверены, что хотите удалить эти сообщения?
 and all their replies = и все комментарии
 Are you sure to delete this entry? = Вы уверены, что хотите удалить эту запись?
@@ -465,10 +464,11 @@ Cannot create thumbnail, please check ImageMagick installation =
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -139,7 +139,6 @@ Enter your user name or email address = Ingrese su nombre de usuario o direccion
 Forgot = Olvidar
 ELOG new user = Nuevo usuario de ELOG
 Retype password = Reescriba la clave
-Only user <i>%s</i> can delete this entry = Solamente el usuario <i>%s</i> puede borrar esta entrada
 Are you sure to delete these messages? = Esta seguro de borrar estos mensajes?
 and all their replies = y todas sus respuestas
 Synchronization = Sincronizacion
@@ -462,10 +461,11 @@ Error: Content length (%d) larger than maximum content length (%d) = Error: La l
 #
 #---- please translate following items and then remove this comment ----#
 #
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -370,7 +370,6 @@ Activation notice has been sent to %s = Aktiveringsmeddelande har skickats till
 User [%s] has been deleted = Användare [%s] har tagits bort
 Password recovery for ELOG %s = Återskapande av lösenord för ELOG %s
 A new password has been created for you on host %s = Ett nytt lösenord har skapats till dig på server %s
-Only user <i>%s</i> can delete this entry = Endast användare <i>%s</i> kan ta bort denna post
 Column header '%s' must be present in CSV file = Kolumnhuvud '%s' måste finnas i CSV filen
 CSV import preview of %s = Förhandsgranskning av CSV import gällande %s
 Incorrect remote ELOG server version %s =  Fel fjärransluten ELOG server version %s
@@ -468,10 +467,11 @@ Cannot create thumbnail, please check ImageMagick installation =
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -142,7 +142,6 @@ Upload = Y
 Requested = Ýstenmiþ
 Registration request on logbook "%s" = "%s" kayýt defterinde kayýt isteði
 A new ELOG user wants to register on "%s" = Yeni ELOG kullanýcýsý "%s"'na kayýt olmak istiyor 
-Only user <i>%s</i> can delete this entry = Yalnýzca <i>%s</i> kullanýcýsý bu girdiyi silebilir
 Search text also in attributes = Metni özellikler içinde de ara
 Date = Tarih
 ID = ID
@@ -463,10 +462,11 @@ Cannot create thumbnail, please check ImageMagick installation =
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -140,7 +140,6 @@ Upload =
 Requested = 请求的
 Registration request on logbook "%s" = 记录本 "%s" 里的注册请求
 A new ELOG user wants to register on "%s" = 新的 ELOG 用户希望注册到 "%s" 
-Only user <i>%s</i> can delete this entry = 只有用户 <i>%s</i> 可以删除此记录
 Search text also in attributes = 同时搜索属性中的文本
 Date = 日期
 ID = ID
@@ -462,10 +461,11 @@ Cannot create thumbnail, please check ImageMagick installation =
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -140,7 +140,6 @@ Upload = 上载
 Requested = 请求的
 Registration request on logbook "%s" = 记录本 "%s" 里的注册请求
 A new ELOG user wants to register on "%s" = 新的 ELOG 用户希望注册到 "%s" 
-Only user <i>%s</i> can delete this entry = 只有用户 <i>%s</i> 可以删除此记录
 Search text also in attributes = 同时搜索属性中的文本
 Date = 日期
 ID = ID
@@ -462,10 +461,11 @@ Cannot create thumbnail, please check ImageMagick installation =
 Please log on by clicking on following link and change your password = 
 Attachments = 
 Error: Content length (%d) larger than maximum content length (%d) = 
-Forbidden attribute: %s = 
 ELOG error = 
 Only user <b>%s</b> can edit this entry = 
 Export to = 
 Do not ignore first line = 
 Last %d hours = 
 Invalid URL = 
+Attribute "%s" is not allowed in config file = 
+Only user <b>%s</b> can delete this entry = 
@@ -9,7 +9,7 @@

 \********************************************************************/

-#define VERSION "2.7.6"
+#define VERSION "2.7.7"
 char svn_revision[] = "$Id$";

 /* ELOG identification */
@@ -9,7 +9,7 @@
 \********************************************************************/

 /* Version of ELOG */
-#define VERSION "2.7.6"
+#define VERSION "2.7.7"
 char svn_revision[] = "$Id$";

 /* ELOG identification */
@@ -3462,10 +3462,10 @@ void retrieve_domain(char *ret, int size)
   strlcpy(ret, "tmp.org", size);
   if (getcfg("global", "SMTP host", smtp_host, sizeof(smtp_host))) {
      if (strchr(smtp_host, '.'))
-         strlcpy(ret, strchr(smtp_host, '.')+1, size);
+         strlcpy(ret, strchr(smtp_host, '.') + 1, size);
   }
 }
- 
+
 /*-------------------------------------------------------------------*/

 void retrieve_email_from(LOGBOOK * lbs, char *ret, char *ret_name, char attrib[MAX_N_ATTR][NAME_LENGTH])
@@ -3563,7 +3563,7 @@ void el_decode(char *message, char *key, char *result, int size)

      if (strncmp(pc, key, strlen(key)) == 0) {
         pc += strlen(key);
-         for(i=0 ; *pc != '\n' && *pc != '\r' && i<size-1 ; i++)
+         for (i = 0; *pc != '\n' && *pc != '\r' && i < size - 1; i++)
            result[i] = *pc++;
         result[i] = 0;
         return;
@@ -3597,7 +3597,7 @@ void el_decode_int(char *message, char *key, char *result, int size)

 void el_decode_intlist(char *message, char *key, char *result, int size)
 {
-   int  i;
+   int i;

   if (result == NULL)
      return;
@@ -3606,7 +3606,7 @@ void el_decode_intlist(char *message, char *key, char *result, int size)
   el_decode(message, key, result, size);

   /* remove any non allowed characters */
-   for (i=0 ; i<size && i<(int)strlen(result); i++)
+   for (i = 0; i < size && i < (int) strlen(result); i++)
      if (!isdigit(result[i]) && result[i] != ' ' && result[i] != ',')
         result[i] = ' ';
 }
@@ -5933,96 +5933,98 @@ typedef struct {
 PATTERN_LIST pattern_list[] = {

   /* smileys */
-   {":))",  "<img alt=\"Happy\" title=\"Happy\" src=\"%sicons/happy.png\">"}, 
+   {":))", "<img alt=\"Happy\" title=\"Happy\" src=\"%sicons/happy.png\">"},
   {":-))", "<img alt=\"Happy\" title=\"Happy\" src=\"%sicons/happy.png\">"},
-   {":)",   "<img alt=\"Smile\" title=\"Smile\" src=\"%sicons/smile.png\">"}, 
-   {":-)",  "<img alt=\"Smile\" title=\"Smile\" src=\"%sicons/smile.png\">"},
-   {":(",   "<img alt=\"Frown\" title=\"Frown\" src=\"%sicons/frown.png\">"}, 
-   {":-(",  "<img alt=\"Frown\" title=\"Frown\" src=\"%sicons/frown.png\">"},
-   {";)",   "<img alt=\"Wink\" title=\"Wink\" src=\"%sicons/wink.png\">"}, 
-   {";-)",  "<img alt=\"Wink\" title=\"Wink\" src=\"%sicons/wink.png\">"},
-   {":d",   "<img alt=\"Big grin\" title=\"Big grin\" src=\"%sicons/biggrin.png\">"}, 
-   {"?-)",  "<img alt=\"Confused\" title=\"Confused\" src=\"%sicons/confused.png\">"},
-   {";(",   "<img alt=\"Crying\" title=\"Crying\" src=\"%sicons/crying.png\">"}, 
-   {";-(",  "<img alt=\"Crying\" title=\"Crying\" src=\"%sicons/crying.png\">"},
-   {":]",   "<img alt=\"Pleased\" title=\"Pleased\" src=\"%sicons/pleased.png\">"}, 
-   {":-]",  "<img alt=\"Pleased\" title=\"Pleased\" src=\"%sicons/pleased.png\">"},
-   {":o",   "<img alt=\"Yawn\" title=\"Yawn\" src=\"%sicons/yawn.png\">"}, 
-   {":-o",  "<img alt=\"Yawn\" title=\"Yawn\" src=\"%sicons/yawn.png\">"},
-   {"8-)",  "<img alt=\"Cool\" title=\"Cool\" src=\"%sicons/cool.png\">"}, 
-   {"8o",   "<img alt=\"Astonished\" title=\"Astonished\" src=\"%sicons/astonished.png\">"},
-   {"x-(",  "<img alt=\"Mad\" title=\"Mad\" src=\"%sicons/mad.png\">"}, 
-   {":p",   "<img alt=\"Tongue\" title=\"Tongue\" src=\"%sicons/tongue.png\">"},
-   {":-p",  "<img alt=\"Tongue\" title=\"Tongue\" src=\"%sicons/tongue.png\">"},
-   
+   {":)", "<img alt=\"Smile\" title=\"Smile\" src=\"%sicons/smile.png\">"},
+   {":-)", "<img alt=\"Smile\" title=\"Smile\" src=\"%sicons/smile.png\">"},
+   {":(", "<img alt=\"Frown\" title=\"Frown\" src=\"%sicons/frown.png\">"},
+   {":-(", "<img alt=\"Frown\" title=\"Frown\" src=\"%sicons/frown.png\">"},
+   {";)", "<img alt=\"Wink\" title=\"Wink\" src=\"%sicons/wink.png\">"},
+   {";-)", "<img alt=\"Wink\" title=\"Wink\" src=\"%sicons/wink.png\">"},
+   {":d", "<img alt=\"Big grin\" title=\"Big grin\" src=\"%sicons/biggrin.png\">"},
+   {"?-)", "<img alt=\"Confused\" title=\"Confused\" src=\"%sicons/confused.png\">"},
+   {";(", "<img alt=\"Crying\" title=\"Crying\" src=\"%sicons/crying.png\">"},
+   {";-(", "<img alt=\"Crying\" title=\"Crying\" src=\"%sicons/crying.png\">"},
+   {":]", "<img alt=\"Pleased\" title=\"Pleased\" src=\"%sicons/pleased.png\">"},
+   {":-]", "<img alt=\"Pleased\" title=\"Pleased\" src=\"%sicons/pleased.png\">"},
+   {":o", "<img alt=\"Yawn\" title=\"Yawn\" src=\"%sicons/yawn.png\">"},
+   {":-o", "<img alt=\"Yawn\" title=\"Yawn\" src=\"%sicons/yawn.png\">"},
+   {"8-)", "<img alt=\"Cool\" title=\"Cool\" src=\"%sicons/cool.png\">"},
+   {"8o", "<img alt=\"Astonished\" title=\"Astonished\" src=\"%sicons/astonished.png\">"},
+   {"x-(", "<img alt=\"Mad\" title=\"Mad\" src=\"%sicons/mad.png\">"},
+   {":p", "<img alt=\"Tongue\" title=\"Tongue\" src=\"%sicons/tongue.png\">"},
+   {":-p", "<img alt=\"Tongue\" title=\"Tongue\" src=\"%sicons/tongue.png\">"},
+
   /* formatting */
-   {"[b]", "<b>"}, 
-   {"[/b]", "</b>"}, 
-   {"[u]", "<u>"}, 
-   {"[/u]", "</u>"}, 
-   {"[i]", "<i>"}, 
-   {"[/i]", "</i>"}, 
+   {"[b]", "<b>"},
+   {"[/b]", "</b>"},
+   {"[u]", "<u>"},
+   {"[/u]", "</u>"},
+   {"[i]", "<i>"},
+   {"[/i]", "</i>"},
   {"[center]", "<center>"},
-   {"[/center]", "</center>"}, 
-   {"[color=", "<font color=\"%s\">"}, 
-   {"[/color]", "</font>"}, 
+   {"[/center]", "</center>"},
+   {"[color=", "<font color=\"%s\">"},
+   {"[/color]", "</font>"},
   {"[size=", "<font size=\"%s\">"},
-   {"[/size]", "</font>"}, 
-   {"[font=", "<font face=\"%s\">"}, 
-   {"[/font]", "</font>"}, 
-   {"\r\n[code]", "<pre>"}, 
+   {"[/size]", "</font>"},
+   {"[font=", "<font face=\"%s\">"},
+   {"[/font]", "</font>"},
+   {"\r\n[code]", "<pre>"},
   {"[code]", "<pre>"},
-   {"[/code]\r\n", "</pre>"}, 
-   {"[/code]", "</pre>"}, 
-   {"\r\n[code1]", "<pre>"}, 
-   {"[code1]", "<pre>"}, 
-   {"[/code1]\r\n","</pre>"},
+   {"[/code]\r\n", "</pre>"},
+   {"[/code]", "</pre>"},
+   {"\r\n[code1]", "<pre>"},
+   {"[code1]", "<pre>"},
+   {"[/code1]\r\n", "</pre>"},
   {"[/code1]", "</pre>"},
-   
+
   /* lists */
-   {"[list]\r", "<ul>"}, 
-   {"[list]", "<ul>"}, 
-   {"[*]", "<li>"}, 
-   {"[/list]\r", "</#>"},    // either </ul> or </ol>
-   {"[/list]", "</#>"}, 
+   {"[list]\r", "<ul>"},
+   {"[list]", "<ul>"},
+   {"[*]", "<li>"},
+   {"[/list]\r", "</#>"},       // either </ul> or </ol>
+   {"[/list]", "</#>"},
   {"[list=", "<ol type=\"%s\">"},
-   
+
   /* headings */
-   {"[h1]", "<h1>"}, 
-   {"[/h1]", "</h1>"}, 
-   {"[h2]", "<h2>"}, 
-   {"[/h2]", "</h2>"}, 
-   {"[h3]", "<h3>"}, 
+   {"[h1]", "<h1>"},
+   {"[/h1]", "</h1>"},
+   {"[h2]", "<h2>"},
+   {"[/h2]", "</h2>"},
+   {"[h3]", "<h3>"},
   {"[/h3]", "</h3>"},

   /* URLs */
-   {"[url=", "<a href=\"%#\">%s</a>"}, 
-   {"[url]", "<a href=\"%#\">%s</a>"}, 
-   {"[/url]", ""}, 
+   {"[url=", "<a href=\"%#\">%s</a>"},
+   {"[url]", "<a href=\"%#\">%s</a>"},
+   {"[/url]", ""},
   {"[email]", "<a href=\"mailto:%#\">%s</a>"},
-   {"[/email]", ""}, 
-   {"[img]", "<a href=\"%#\"><img border=0 src=\"%#?thumb=1\"></a>"}, 
+   {"[/email]", ""},
+   {"[img]", "<a href=\"%#\"><img border=0 src=\"%#?thumb=1\"></a>"},
   {"[/img]", ""},

   /* quote */
-   {"[quote=", "<br /><table class=\"quotetable\" align=\"center\" cellspacing=\"1\"><tr><td class=\"quotetitle\">%s:</td></tr><tr><td class=\"quote\">"},
-   {"[quote]", "<br /><table class=\"quotetable\" align=\"center\" cellspacing=\"1\"><tr><td class=\"quotetitle\">%s:</td></tr><tr><td class=\"quote\">"},
-   {"[/quote]\r", "</td></tr></table><br />\r\n"}, 
+   {"[quote=",
+    "<br /><table class=\"quotetable\" align=\"center\" cellspacing=\"1\"><tr><td class=\"quotetitle\">%s:</td></tr><tr><td class=\"quote\">"},
+   {"[quote]",
+    "<br /><table class=\"quotetable\" align=\"center\" cellspacing=\"1\"><tr><td class=\"quotetitle\">%s:</td></tr><tr><td class=\"quote\">"},
+   {"[/quote]\r", "</td></tr></table><br />\r\n"},
   {"[/quote]", "</td></tr></table>\r\n"},

   /* table */
-   {"[table]", "<table><tr><td>"}, 
-   {"[table ", "<table %s><tr><td>"}, 
-   {"|-", "</td></tr><tr><td>"}, 
+   {"[table]", "<table><tr><td>"},
+   {"[table ", "<table %s><tr><td>"},
+   {"|-", "</td></tr><tr><td>"},
   {"|", "</td><td>"},
   {"[/table]", "</td></tr></table>"},

   /* horizontal line */
   {"[line]", "<hr />"},
-   
+
   /* anchor */
-   {"[anchor]", "<a name=\"%#\">"}, 
-   {"[/anchor]", "</a>"}, 
+   {"[anchor]", "<a name=\"%#\">"},
+   {"[/anchor]", "</a>"},
   {"", ""}
 };

@@ -20836,7 +20838,7 @@ void format_email_attachments(LOGBOOK * lbs, int message_id, int attachment_type
      if (att_file[index][0] == 0)
         continue;

-      is_inline = is_inline_attachment(getparam("encoding"), message_id, 
+      is_inline = is_inline_attachment(getparam("encoding"), message_id,
                                       getparam("text"), index, att_file[index]);
      if (attachment_type == 1 && is_inline)
         continue;
@@ -21363,7 +21365,7 @@ int compose_email(LOGBOOK * lbs, char *rcpt_to, char *mail_to, int message_id,
   n_attachments = 0;
   if (att_file)
      for (i = 0; att_file[i][0] && i < MAX_ATTACHMENTS; i++) {
-         if ((mail_encoding & 6) == 0 || !is_inline_attachment(encoding, message_id, 
+         if ((mail_encoding & 6) == 0 || !is_inline_attachment(encoding, message_id,
                                                               getparam("text"), i, att_file[i]))
            n_attachments++;
      }
@@ -22832,7 +22834,7 @@ int is_inline_attachment(char *encoding, int message_id, char *text, int i, char
      pt = text;
      while (stristr(pt, att_enc)) {
         /* make sure that it's really an inline image */
-         for (p = stristr(pt, att_enc) ; p > pt ; p--)
+         for (p = stristr(pt, att_enc); p > pt; p--)
            if (*p == '<')
               break;
         if (p > pt) {
@@ -22840,7 +22842,7 @@ int is_inline_attachment(char *encoding, int message_id, char *text, int i, char
            if (stristr(str, "<img "))
               return 1;
         }
-         pt = stristr(pt, att_enc)+1;
+         pt = stristr(pt, att_enc) + 1;
      }
      retrieve_domain(domain, sizeof(domain));
      sprintf(str, "cid:att%d@%s", i, domain);
@@ -25468,7 +25470,7 @@ void show_uploader_finished(LOGBOOK * lbs)
      strlcpy(str, att, sizeof(str));
      str[13] = 0;
      strcpy(file_enc, att + 14);
-      url_encode(file_enc, sizeof(file_enc));      /* for file names with special characters like "+" */
+      url_encode(file_enc, sizeof(file_enc));   /* for file names with special characters like "+" */
      sprintf(ref, "%s/%s?lb=%s", str, file_enc, lbs->name_enc);
      sprintf(ref_thumb, "%s/%s?lb=%s&thumb=1", str, file_enc, lbs->name_enc);