steffen: server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView day.php, 1.3, 1.4 week.php, 1.3, 1.4 workweek.php, 1.3, 1.4

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView
In directory doto:/tmp/cvs-serv26989/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView

Modified Files:
	day.php week.php workweek.php 
Log Message:
fix for issue519 (wrong encoding of summary etc. in fbview)

Index: day.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/day.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- day.php	12 Oct 2004 10:34:47 -0000	1.3
+++ day.php	11 Nov 2004 15:08:48 -0000	1.4
@@ -35,11 +35,15 @@
                 $template->set('label', '');
                 if (isset($extra[$start])) {
                     if (!empty($extra[$start]['X-UID'])) {
-                        $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" . addslashes($member->getName() . "#" . base64_decode($extra[$start]['X-UID'])) . "')";
+                        $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" 
+			  . addslashes($member->getName() . "#" 
+				       . String::convertCharset(base64_decode($extra[$start]['X-UID']), 
+								'UTF-8',NLS::getCharset())) . "')";
                         $template->set('evclick', $link);
                     }
                     if (!empty($extra[$start]['X-SUMMARY'])) {
-                        $template->set('label', base64_decode($extra[$start]['X-SUMMARY']));
+                        $template->set('label', String::convertCharset(base64_decode($extra[$start]['X-SUMMARY']),'UTF-8',
+				       NLS::getCharset()));
                     }
                 }
                 $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);

Index: week.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/week.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- week.php	12 Oct 2004 10:34:47 -0000	1.3
+++ week.php	11 Nov 2004 15:08:48 -0000	1.4
@@ -222,11 +222,15 @@
                     $template->set('label', '');
                     if (isset($extra[$start])) {
                         if (!empty($extra[$start]['X-UID'])) {
-                            $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" . addslashes($member->getName() . "#" . base64_decode($extra[$start]['X-UID'])) . "')";
+                            $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" 
+			      . addslashes($member->getName() . "#" 
+					   . String::convertCharset(base64_decode($extra[$start]['X-UID']), 
+								    'UTF-8', NLS::getCharset())) . "')";
                             $template->set('evclick', $link);
                         }
                         if (!empty($extra[$start]['X-SUMMARY'])) {
-                            $template->set('label', base64_decode($extra[$start]['X-SUMMARY']));
+                            $template->set('label', String::convertCharset(base64_decode($extra[$start]['X-SUMMARY']),
+									   'UTF-8', NLS::getCharset()));
                         }
                     }
                     $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);

Index: workweek.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/fbview/fbview/kronolith/lib/FBView/workweek.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- workweek.php	12 Oct 2004 10:34:47 -0000	1.3
+++ workweek.php	11 Nov 2004 15:08:48 -0000	1.4
@@ -220,11 +220,15 @@
                 $template->set('label', '');
                 if (isset($extra[$start])) {
                     if (!empty($extra[$start]['X-UID'])) {
-                        $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" . addslashes($member->getName() . "#" . base64_decode($extra[$start]['X-UID'])) . "')";
+                        $link = "javascript:performAction(" . KRONOLITH_ACTIONID_VIEW . ", '" 
+			  . addslashes($member->getName() . "#" 
+				       . String::convertCharset(base64_decode($extra[$start]['X-UID']), 
+								'UTF-8', NLS::getCharset())) . "')";
                         $template->set('evclick', $link);
                     }
                     if (!empty($extra[$start]['X-SUMMARY'])) {
-                        $template->set('label', base64_decode($extra[$start]['X-SUMMARY']));
+                        $template->set('label', String::convertCharset(base64_decode($extra[$start]['X-SUMMARY']),
+								       'UTF-8', NLS::getCharset()));
                     }
                 }
                 $blocks .= $template->fetch(KRONOLITH_TEMPLATES . '/fbview/' . $blockfile);