From c85b6155eb004fe556de255482c04b87046c90b3 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 28 Jul 2009 17:14:11 +0000 Subject: [PATCH 1/4] Minor UI fix for IE6 notice-options --- theme/base/css/ie6.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css index eca240faae..edc49478f5 100644 --- a/theme/base/css/ie6.css +++ b/theme/base/css/ie6.css @@ -35,3 +35,6 @@ width:20%; width:50%; margin-left:30px; } +.notice-options a { +width:16px; +} \ No newline at end of file From 72117294d7675434fc14303ad84711d43be003b9 Mon Sep 17 00:00:00 2001 From: Eric Helgeson Date: Tue, 28 Jul 2009 20:17:20 -0500 Subject: [PATCH 2/4] Splitting br3nda's merge 97db6e17b3f76e9a6acf87ddbad47ba54e9b1a3b Add session table to pg.sql --- db/laconica_pg.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql index 24581bad0c..ad34720a23 100644 --- a/db/laconica_pg.sql +++ b/db/laconica_pg.sql @@ -519,6 +519,16 @@ create table group_alias ( ); create index group_alias_group_id_idx on group_alias (group_id); +create table session ( + + id varchar(32) primary key /* comment 'session ID'*/, + session_data text /* comment 'session data'*/, + created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/, + modified integer DEFAULT extract(epoch from CURRENT_TIMESTAMP) /* comment 'date this record was modified'*/ +); + +create index session_modified_idx on session (modified); + /* Textsearch stuff */ From 5aa303320b4e57f5296eccba5bba7134cc12503f Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 28 Jul 2009 22:22:07 -0400 Subject: [PATCH 3/4] Handle UTF-8 encoded text in emails. Thanks to jaakko for pointing this out! http://identi.ca/notice/7169471 --- scripts/maildaemon.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php index a4003b6b26..9b3628b863 100755 --- a/scripts/maildaemon.php +++ b/scripts/maildaemon.php @@ -301,7 +301,7 @@ class MailerDaemon $this->extract_part($parsed,$msg,$attachments); - return array($from, $to, $msg, $attachments); + return array($from, $to, utf8_encode($msg), $attachments); } function extract_part($parsed,&$msg,&$attachments){ From f3352254b792b201b1acaa93c9f58530c671ad11 Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Tue, 28 Jul 2009 22:47:32 -0400 Subject: [PATCH 4/4] Avoid potentially double encoding already utf-8 encoded messages --- scripts/maildaemon.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php index 9b3628b863..3ef4d06383 100755 --- a/scripts/maildaemon.php +++ b/scripts/maildaemon.php @@ -301,7 +301,7 @@ class MailerDaemon $this->extract_part($parsed,$msg,$attachments); - return array($from, $to, utf8_encode($msg), $attachments); + return array($from, $to, $msg, $attachments); } function extract_part($parsed,&$msg,&$attachments){ @@ -317,6 +317,9 @@ class MailerDaemon } else if ($parsed->ctype_primary == 'text' && $parsed->ctype_secondary=='plain') { $msg = $parsed->body; + if(strtolower($parsed->ctype_parameters['charset']) != "utf-8"){ + $msg = utf8_encode($msg); + } }else if(!empty($parsed->body)){ if(common_config('attachments', 'uploads')){ //only save attachments if uploads are enabled