[frik85] 31358: RosCMS update: * fix bug related to non UTF-8 chars (especially in title/description)

Author: frik85
Date: Thu Dec 20 20:21:34 2007
New Revision: 31358

URL: http://svn.reactos.org/svn/reactos?rev=31358&view=rev
Log:
RosCMS update:

* fix bug related to non UTF-8 chars (especially in title/description)

Modified:
    trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php
    trunk/web/reactos.org/htdocs/roscms/inc/data_list.php

Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/d...
==============================================================================
--- trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php (original)
+++ trunk/web/reactos.org/htdocs/roscms/inc/data_export_xml.php Thu Dec 20 20:21:34 2007
@@ -840,7 +840,7 @@
    			$tdata .= " status="". $temp_status ."""; /* status (odd/even (=stable), new, draft, etc.) */
    			$tdata .= " security="". $temp_security ."""; /* security (read, write, add, pub, trans) */
    			$tdata .= " xtrcol="".$roscms_mtbl_cols2.""";
-				$tdata .= "><![CDATA[".substr($result_xml_ptm_stext['content'], 0, 30)."]]></row>";	
+				$tdata .= "><![CDATA[".urlencode(substr($result_xml_ptm_stext['content'], 0, 30))."]]></row>";	
    			
    			$temp_counter++;		
    		}

Modified: trunk/web/reactos.org/htdocs/roscms/inc/data_list.php
URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/d...
==============================================================================
--- trunk/web/reactos.org/htdocs/roscms/inc/data_list.php (original)
+++ trunk/web/reactos.org/htdocs/roscms/inc/data_list.php Thu Dec 20 20:21:34 2007
@@ -3247,6 +3247,7 @@
    function page_table_body( bnr, bclass, bid, bdname, btype, brid, brver, brlang, brdate, bstar, bstarid, brusrid, security, xtrtblcol, bdesc) {
    	var xtrtblcols2 = '';
    	var lstBody = '';
+		var tmpdesc = '';
    	
    	if (bstar == 1) {
    		bstar = 'cStarOn';
@@ -3269,7 +3270,15 @@
    	if (security.indexOf("write") < 0 ) { // not found -> readonly
    		lstBody += '<img src="images/locked.gif" alt="read-only" style="width:11px; height:12px; border:0px;" /> ';
    	}
-		lstBody += '<span class="tcp">'+bdesc+'</span></div></td>';
+		try {
+			tmpdesc = unescape(decodeURI(bdesc));
+			tmpdesc = tmpdesc.replace(/+/g, ' ');
+		} catch (e) {
+			tmpdesc = '<i>check the title or description field, it contains non UTF-8 chars</i>';
+		}
+
+		lstBody += '<span class="tcp">'+tmpdesc+'</span></div></td>';
+		/*lstBody += '<span class="tcp">!!</span></div></td>';*/

/*
    	if (xtrtblcol != '') {