claroline1.9.7中文修正版diff文件

diff -r claroline197/claroline/admin/upgrade/upgrade_init_global.inc.php lcms/claroline/admin/upgrade/upgrade_init_global.inc.php
144a145
> mysql_query("SET NAMES UTF8");

diff -r claroline197/claroline/editor/tiny_mce/tiny_mce/themes/advanced/skins/default/content.css lcms/claroline/editor/tiny_mce/tiny_mce/themes/advanced/skins/default/content.css
1c1
< body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
---
> body, td, pre {color:#000; font-family: "Microsoft YaHei", "Hiragino Sans GB", STHeiti, Tahoma, SimHei, Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:8px;}

diff -r claroline197/claroline/editor/tiny_mce/tiny_mce/themes/advanced/skins/o2k7/content.css lcms/claroline/editor/tiny_mce/tiny_mce/themes/advanced/skins/o2k7/content.css
1c1
< body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
---
> body, td, pre {color:#000; font-family: "Microsoft YaHei", "Hiragino Sans GB", STHeiti, Tahoma, SimHei, Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:8px;}

diff -r claroline197/claroline/editor/tiny_mce/tiny_mce/themes/simple/skins/default/content.css lcms/claroline/editor/tiny_mce/tiny_mce/themes/simple/skins/default/content.css
2,3c2,3
<     font-family: Verdana, Arial, Helvetica, sans-serif;
<     font-size: 10px;
---
>     font-family: "Microsoft YaHei", "Hiragino Sans GB", STHeiti, Tahoma, SimHei, Verdana, Arial, Helvetica, sans-serif;
>     font-size: 12px;

diff -r claroline197/claroline/editor/tiny_mce/tiny_mce/themes/simple/skins/o2k7/content.css lcms/claroline/editor/tiny_mce/tiny_mce/themes/simple/skins/o2k7/content.css
1c1
< body, td, pre {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
---
> body, td, pre {font-family: "Microsoft YaHei", "Hiragino Sans GB", STHeiti, Tahoma, SimHei, Verdana, Arial, Helvetica, sans-serif; font-size:12px;}

diff -r claroline197/claroline/exercise/lib/answer_multiplechoice.class.php lcms/claroline/exercise/lib/answer_multiplechoice.class.php
75c75,77
<
---
>         $this->addAnswer();
>         $this->addAnswer();
>         
537c539
<             .      claro_html_textarea_editor('answer_'.$i,$answer['answer'],10,25,'','simple')
---
>             .      claro_html_textarea_editor('answer_'.$i,$answer['answer'],2,25,'','simple')
540c542
<             .      claro_html_textarea_editor('comment_'.$i,$answer['comment'],10,25,'','simple')
---
>             .      claro_html_textarea_editor('comment_'.$i,$answer['comment'],2,25,'','simple')

diff -r claroline197/claroline/inc/lib/core/claroline.lib.php lcms/claroline/inc/lib/core/claroline.lib.php
238c238
<         
---
>         mysql_query("SET NAMES UTF8");
272c272
<         
---
>     mysql_query("SET NAMES UTF8");         

diff -r claroline197/claroline/inc/lib/database/database.lib.php lcms/claroline/inc/lib/database/database.lib.php
164a165
>          mysql_query("SET NAMES UTF8");

diff -r claroline197/claroline/inc/lib/display/banner.lib.php lcms/claroline/inc/lib/display/banner.lib.php
251c251
<                 . 'messaging" target="_top">'
---
>                 . 'messaging/index.php" target="_top">'

diff -r claroline197/claroline/inc/lib/display/footer.lib.php lcms/claroline/inc/lib/display/footer.lib.php
116a117
>                 . '   Modified By lsstarboy '

diff -r claroline197/claroline/inc/lib/faculty.lib.inc.php lcms/claroline/inc/lib/faculty.lib.inc.php
65c65
<                     $out .= ' ?   ';
---
>                     $out .= ' |   ';

diff -r claroline197/claroline/inc/lib/file.lib.php lcms/claroline/inc/lib/file.lib.php
604c604
<     $search[] = '?;  $replace[] = 'o';
---
> //    $search[] = '?;  $replace[] = 'o';

diff -r claroline197/claroline/inc/lib/fileDisplay.lib.php lcms/claroline/inc/lib/fileDisplay.lib.php
378c378
<                 htmlspecialchars( Url::Contextualize( get_module_entry_url('CLDOC') . '?cmd=exChDir&file='.base64_encode($urlTrail) ) ) ));
---
>                 htmlspecialchars( Url::Contextualize( get_module_entry_url('CLDOC') . '?cmd=exChDir&file='.urlencode(base64_encode($urlTrail) ) ) ) ));

diff -r claroline197/claroline/inc/lib/fileUpload.lib.php lcms/claroline/inc/lib/fileUpload.lib.php
125c125
<         if ( $element == '.' || $element == '..')
---
>         if ( $element == '.' || $element == '..' || is_link($element) )

diff -r claroline197/claroline/inc/lib/forum.lib.php lcms/claroline/inc/lib/forum.lib.php
1121c1121
<         'Forum Index',
---
>         get_lang('Forum Index'),

diff -r claroline197/claroline/inc/lib/sql.lib.php lcms/claroline/inc/lib/sql.lib.php
505d504
<

diff -r claroline197/claroline/inc/templates/banner.tpl.php lcms/claroline/inc/templates/banner.tpl.php
45,46c45,46
<             , array(  '%firstName' => $this->user['firstName']
<                     , '%lastName' => $this->user['lastName'] ) ) ?> :
---
>             , array(  '%firstName' => $this->user['lastName']
>                     , '%lastName' => $this->user['firstName'] ) ) ?> :

diff -r claroline197/claroline/messaging/lib/notification/notifier/mail.notifier.lib.php lcms/claroline/messaging/lib/notification/notifier/mail.notifier.lib.php
138c138
<     
---
>         if ( get_conf('smtp_host') =='' ) return 0;

diff -r claroline197/claroline/wiki/lib/class.dbconnection.php lcms/claroline/wiki/lib/class.dbconnection.php
179c179
<
---
>             mysql_query("SET NAMES UTF8");

diff -r claroline197/claroline/wiki/lib/wiki2xhtml/class.wiki2xhtml.php lcms/claroline/wiki/lib/wiki2xhtml/class.wiki2xhtml.php
142c142
<         $this->setOpt('active_fix_word_entities',1); # Fixe les caract鑢es MS
---
>         $this->setOpt('active_fix_word_entities',0); # Fixe les caract鑢es MS