Changeset 3
- Timestamp:
- 02/10/08 15:31:24 (1 year ago)
- Files:
-
- ajax.php (modified) (6 diffs)
- doc/changelog.txt (modified) (1 diff)
- main/class/class_moderation.php (modified) (2 diffs)
- main/class/parser/parser.php (modified) (6 diffs)
- main/class/parser/parser_fsbcode.php (modified) (6 diffs)
- main/forum/forum_calendar.php (modified) (2 diffs)
- main/forum/forum_low.php (modified) (3 diffs)
- main/forum/forum_mp.php (modified) (2 diffs)
- main/forum/forum_post.php (modified) (6 diffs)
- main/forum/forum_rss.php (modified) (7 diffs)
- main/forum/forum_search.php (modified) (2 diffs)
- main/forum/forum_topic.php (modified) (3 diffs)
- main/forum/forum_userprofile.php (modified) (3 diffs)
- main/modo/modo_abuse.php (modified) (3 diffs)
- main/modo/modo_approve.php (modified) (3 diffs)
- main/modo/modo_calendar.php (modified) (3 diffs)
- main/modo/modo_split.php (modified) (3 diffs)
- main/portail/portail_news.php (modified) (2 diffs)
- main/user/user_sig.php (modified) (2 diffs)
- sdk.php (modified) (5 diffs)
- tpl/WhiteSummer/files/handler_fsbcode.html (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
ajax.php
r2 r3 4 4 ** | Name : ~/ajax.php 5 5 ** | Begin : 26/09/2006 6 ** | Last : 21/01/20086 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 234 234 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $data['u_auth'] >= MODOSUP) ? TRUE : FALSE; 235 235 236 // Informations passées au parseur de message 237 $parser_info = array( 238 'u_id' => $data['u_id'], 239 'p_nickname' => $data['p_nickname'], 240 'u_auth' => $data['u_auth'], 241 'f_id' => $data['f_id'], 242 't_id' => $data['t_id'], 243 ); 244 236 245 // Parse et affichage du message 237 246 $xml = new Xml(); … … 239 248 240 249 $item = $xml->document->createElement('content'); 241 $item->setData($parser->mapped_message($content, 'classic' ));250 $item->setData($parser->mapped_message($content, 'classic', $parser_info)); 242 251 $xml->document->appendChild($item); 243 252 … … 254 263 function ajax_show_post($id) 255 264 { 256 $sql = 'SELECT p.p_text, p.u_id, t.f_id, t.t_first_p_id, u.u_auth265 $sql = 'SELECT p.p_text, p.u_id, p.p_nickname, t.t_id, t.f_id, t.t_first_p_id, u.u_auth 257 266 FROM ' . SQL_PREFIX . 'posts p 258 267 LEFT JOIN ' . SQL_PREFIX . 'topics t … … 275 284 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $data['u_auth'] >= MODOSUP) ? TRUE : FALSE; 276 285 286 // Informations passées au parseur de message 287 $parser_info = array( 288 'u_id' => $data['u_id'], 289 'p_nickname' => $data['p_nickname'], 290 'u_auth' => $data['u_auth'], 291 'f_id' => $data['f_id'], 292 't_id' => $data['t_id'], 293 ); 294 277 295 // Parse et affichage du message 278 296 $xml = new Xml(); … … 280 298 281 299 $item = $xml->document->createElement('content'); 282 $item->setData($parser->mapped_message($data['p_text'], 'classic' ));300 $item->setData($parser->mapped_message($data['p_text'], 'classic', $parser_info)); 283 301 $xml->document->appendChild($item); 284 302 doc/changelog.txt
r2 r3 34 34 - Fix de l'upload des MODS 35 35 - Fix d'un bug sur les critères dans le délestage des membres 36 - Fix d'un bug au niveau de la récupération des FSBcodes autorisés dans la signature 37 - Fix de la date du dernier message sur les sujets divisés 36 38 37 39 main/class/class_moderation.php
r2 r3 4 4 ** | Name : ~/main/class/class_moderation.php 5 5 ** | Begin : 04/10/2006 6 ** | Last : 10/ 12/20076 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 374 374 FROM ' . SQL_PREFIX . 'posts 375 375 WHERE t_id = ' . $topic_id . ' 376 ORDER BY p_time 376 ORDER BY p_time DESC 377 377 LIMIT 1'; 378 378 $result = Fsb::$db->query($sql); main/class/parser/parser.php
r2 r3 4 4 ** | Name : ~/main/class/parser/parser.php 5 5 ** | Begin : 13/03/2005 6 ** | Last : 20/12/20076 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 38 38 ** ----- 39 39 ** $str :: Chaîne de caractère à parser. 40 */ 41 public function message($str) 40 ** $info :: Tableau d'informations (variables prédéfinies) 41 */ 42 public function message($str, $info = array()) 42 43 { 43 44 // Prise en compte du HTML ? … … 65 66 $fsbcode->is_signature = $this->is_signature; 66 67 $fsbcode->parse_eof = FALSE; 67 $str = $fsbcode->parse($str );68 $str = $fsbcode->parse($str, $info); 68 69 } 69 70 else … … 97 98 ** $str :: Chaîne du message 98 99 ** $map_name :: Nom de la MAP 99 */ 100 public function mapped_message($str, $map_name) 100 ** $info :: Tableau d'informations (variables prédéfinies) 101 */ 102 public function mapped_message($str, $map_name, $info = array()) 101 103 { 102 104 $str = Map::parse_message($str, $map_name); 103 105 104 return ($this->message($str ));106 return ($this->message($str, $info)); 105 107 } 106 108 … … 122 124 ** $str :: Texte de la signature 123 125 */ 124 public function sig($str )126 public function sig($str, $info = array()) 125 127 { 126 128 $old_parse_fsbcode = $this->parse_fsbcode; … … 131 133 132 134 $str = htmlspecialchars($str); 133 $str = $this->message($str );135 $str = $this->message($str, $info); 134 136 135 137 $this->is_signature = FALSE; main/class/parser/parser_fsbcode.php
r2 r3 4 4 ** | Name : ~/main/class/parser/parser_fsbcode.php 5 5 ** | Begin : 16/07/2007 6 ** | Last : 1 6/01/20086 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 17 17 { 18 18 // Mise en cache des FSBcode 19 private static $cache_fsbcode = NULL;19 private static $cache_fsbcode = array(); 20 20 21 21 // Si TRUE, on n'affiche que les FSBcode visibles par le WYSIWYG … … 31 31 public $is_signature = FALSE; 32 32 33 // Variables prédéfinies qu'on peut potentiellement parser 34 private $static_vars = array( 35 '{USER_NICKNAME}' => 'p_nickname', 36 '{USER_ID}' => 'u_id', 37 '{TOPIC_ID}' => 't_id', 38 '{FORUM_ID}' => 'f_id', 39 ); 40 33 41 /* 34 42 ** Lance le parsing des FSBcode à partir des informations contenues dans la table fsb2_fsbcode 35 */ 36 public function parse($str) 43 ** ----- 44 ** $str :: Chaîne de caractères à parser 45 ** $info :: Tableau d'informations (variables prédéfinies) 46 */ 47 public function parse($str, $info = array()) 37 48 { 38 49 // On récupère les informations sur les FSBcode 39 if ( self::$cache_fsbcode === NULL)50 if (!isset(self::$cache_fsbcode[$this->is_signature])) 40 51 { 41 52 $sql = 'SELECT * 42 53 FROM ' . SQL_PREFIX . 'fsbcode 43 WHERE fsbcode_activated = 154 WHERE fsbcode_activated' . (($this->is_signature) ? '_sig' : '') . ' = 1 44 55 ORDER BY fsbcode_priority DESC'; 45 56 $result = Fsb::$db->query($sql, 'fsbcode_'); 46 57 $list = Fsb::$db->rows($result); 47 self::$cache_fsbcode = $list;48 } 49 else 50 { 51 $list = self::$cache_fsbcode ;58 self::$cache_fsbcode[$this->is_signature] = $list; 59 } 60 else 61 { 62 $list = self::$cache_fsbcode[$this->is_signature]; 52 63 } 53 64 … … 92 103 else 93 104 { 94 $str = $this->parse_fsbcode_patterns($str, $data['fsbcode_search'], $data['fsbcode_replace'] );105 $str = $this->parse_fsbcode_patterns($str, $data['fsbcode_search'], $data['fsbcode_replace'], $info); 95 106 } 96 107 } … … 113 124 ** $search :: Recherche de FSBcode 114 125 ** $replace :: Remplacement du FSBcode 115 */ 116 private function parse_fsbcode_patterns($str, $search, $replace) 126 ** $info :: Tableau d'informations (variables prédéfinies) 127 */ 128 private function parse_fsbcode_patterns($str, $search, $replace, $info = array()) 117 129 { 118 130 // Création d'un pattern à partir de la chaîne de recherche … … 140 152 { 141 153 $str = preg_replace('#' . $search . '#si', str_replace(array("\r\n", "\n"), array(" ", " "), $replace), $str); 154 } 155 156 // Parse des variables prédéfinies 157 foreach ($this->static_vars AS $varname => $key) 158 { 159 $str = str_replace($varname, (isset($info[$key])) ? $info[$key] : '', $str); 142 160 } 143 161 return ($str); main/forum/forum_calendar.php
r1 r3 4 4 ** | Name : ~/forum/forum_calendar.php 5 5 ** | Begin : 17/06/2006 6 ** | Last : 1 3/12/20076 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 362 362 $end = ($min == '00' && $hour == '00') ? sprintf(Fsb::$session->lang('calendar_event_date'), sprintf(Fsb::$session->lang('format_date'), $day, Fsb::$session->lang('month_' . $month), $year)) : sprintf(Fsb::$session->lang('calendar_event_date2'), sprintf(Fsb::$session->lang('format_date'), $day, Fsb::$session->lang('month_' . $month), $year), $hour, $min); 363 363 364 // Informations passées au parseur de message 365 $parser_info = array( 366 'u_id' => $row['u_id'], 367 'p_nickname' => $row['u_nickname'], 368 'u_auth' => $row['u_auth'], 369 'c_id' => $row['c_id'], 370 ); 371 364 372 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $row['u_auth'] >= MODOSUP) ? TRUE : FALSE; 365 373 Fsb::$tpl->set_blocks('event', array( 366 374 'TITLE' => htmlspecialchars($row['c_title']), 367 'CONTENT' => $parser->mapped_message($row['c_content'], 'classic' ),375 'CONTENT' => $parser->mapped_message($row['c_content'], 'classic', $parser_info), 368 376 'BEGIN' => $begin, 369 377 'END' => $end, main/forum/forum_low.php
r2 r3 4 4 ** | Name : ~/main/forum/forum_low.php 5 5 ** | Begin : 23/09/2007 6 ** | Last : 20/01/20086 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 302 302 $parser = new Parser(); 303 303 304 $sql = 'SELECT p. *, u.u_auth304 $sql = 'SELECT p.u_id, p.f_id, p.t_id, p.p_nickname, p.p_time, p.p_text, p.p_map, u.u_auth 305 305 FROM ' . SQL_PREFIX . 'posts p 306 306 LEFT JOIN ' . SQL_PREFIX . 'users u … … 311 311 while ($row = Fsb::$db->row($result)) 312 312 { 313 // Informations passées au parseur de message 314 $parser_info = array( 315 'u_id' => $row['u_id'], 316 'p_nickname' => $row['p_nickname'], 317 'u_auth' => $row['u_auth'], 318 'f_id' => $row['f_id'], 319 't_id' => $row['t_id'], 320 ); 321 313 322 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $row['u_auth'] >= MODOSUP) ? TRUE : FALSE; 314 323 Fsb::$tpl->set_blocks('post', array( 315 'CONTENT' => $parser->mapped_message($row['p_text'], $row['p_map'] ),324 'CONTENT' => $parser->mapped_message($row['p_text'], $row['p_map'], $parser_info), 316 325 'NICKNAME' => htmlspecialchars($row['p_nickname']), 317 326 'DATE' => Fsb::$session->print_date($row['p_time']), main/forum/forum_mp.php
r2 r3 4 4 ** | Name : ~/main/forum/forum_mp.php 5 5 ** | Begin : 06/10/2005 6 ** | Last : 1 1/01/20086 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 625 625 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $row['u_auth'] >= MODOSUP) ? TRUE : FALSE; 626 626 627 // Informations passées au parseur de message 628 $parser_info = array( 629 'u_id' => $row['u_id'], 630 'p_nickname' => $row['u_nickname'], 631 'u_auth' => $row['u_auth'], 632 'mp_id' => $row['mp_id'], 633 ); 634 627 635 Fsb::$tpl->set_blocks('mp', array( 628 'CONTENT' => $parser->mapped_message($row['mp_content'], 'classic' ),636 'CONTENT' => $parser->mapped_message($row['mp_content'], 'classic', $parser_info), 629 637 'NICKNAME' => Html::nickname($row['u_nickname'], $row['u_id'], $row['u_color']), 630 638 'DATE' => Fsb::$session->print_date($row['mp_time']), main/forum/forum_post.php
r2 r3 4 4 ** | Name : ~/main/forum/forum_post.php 5 5 ** | Begin : 03/10/2005 6 ** | Last : 21/01/20086 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 648 648 $parser->parse_html = (Fsb::$cfg->get('activate_html') && Fsb::$session->auth() >= MODOSUP) ? TRUE : FALSE; 649 649 650 // Informations passées au parseur de message 651 $parser_info = array( 652 'u_id' => Fsb::$session->id(), 653 'p_nickname' => Fsb::$session->data['u_nickname'], 654 'u_auth' => Fsb::$session->auth(), 655 ); 656 657 if (isset($this->data['f_id'])) 658 { 659 $parser_info['f_id'] = $this->data['f_id']; 660 } 661 662 if (isset($this->data['t_id'])) 663 { 664 $parser_info['t_id'] = $this->data['t_id']; 665 } 666 650 667 Fsb::$tpl->set_switch('preview'); 651 668 Fsb::$tpl->set_vars(array( 652 'PREVIEW' => $parser->mapped_message($this->content, $this->post_map ),669 'PREVIEW' => $parser->mapped_message($this->content, $this->post_map, $parser_info), 653 670 )); 654 671 } … … 755 772 756 773 // On selectionne les anciens messages 757 $sql = 'SELECT p.p_id, p. p_text, p.p_time, p.u_id, p.p_nickname, p.p_map, u.u_color, u.u_auth, u.u_avatar, u.u_avatar_method, u.u_activate_avatar774 $sql = 'SELECT p.p_id, p.f_id, p.t_id, p.p_text, p.p_time, p.u_id, p.p_nickname, p.p_map, u.u_color, u.u_auth, u.u_avatar, u.u_avatar_method, u.u_activate_avatar 758 775 FROM ' . SQL_PREFIX . 'posts p 759 776 LEFT JOIN ' . SQL_PREFIX . 'users u … … 768 785 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $row['u_auth'] >= MODOSUP) ? TRUE : FALSE; 769 786 787 // Informations passées au parseur de message 788 $parser_info = array( 789 'u_id' => $row['u_id'], 790 'p_nickname' => $row['p_nickname'], 791 'u_auth' => $row['u_auth'], 792 'f_id' => $row['f_id'], 793 't_id' => $row['t_id'], 794 ); 795 770 796 Fsb::$tpl->set_blocks('post', array( 771 797 'ID' => $row['p_id'], 772 798 'NICKNAME' => Html::nickname($row['p_nickname'], $row['u_id'], $row['u_color']), 773 799 'DATE' => Fsb::$session->print_date($row['p_time']), 774 'CONTENT' => $parser->mapped_message($row['p_text'], $row['p_map'] ),800 'CONTENT' => $parser->mapped_message($row['p_text'], $row['p_map'], $parser_info), 775 801 'USER_AVATAR' => sprintf(Fsb::$session->lang('user_avatar'), htmlspecialchars($row['p_nickname'])), 776 802 … … 817 843 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $row['u_auth'] >= MODOSUP) ? TRUE : FALSE; 818 844 845 // Informations passées au parseur de message 846 $parser_info = array( 847 'u_id' => $row['u_id'], 848 'p_nickname' => $row['u_nickname'], 849 'u_auth' => $row['u_auth'], 850 'mp_id' => $row['mp_id'], 851 ); 852 819 853 Fsb::$tpl->set_switch('topic_review'); 820 854 Fsb::$tpl->set_blocks('post', array( … … 822 856 'NICKNAME' => Html::nickname($row['u_nickname'], $row['u_id'], $row['u_color']), 823 857 'DATE' => Fsb::$session->print_date($row['mp_time']), 824 'CONTENT' => $parser->mapped_message($row['mp_content'], 'classic' ),858 'CONTENT' => $parser->mapped_message($row['mp_content'], 'classic', $parser_info), 825 859 )); 826 860 } main/forum/forum_rss.php
r2 r3 4 4 ** | Name : ~/main/forum/forum_rss.php 5 5 ** | Begin : 02/06/2006 6 ** | Last : 22/01/20086 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 87 87 88 88 // Liste des messages 89 $sql = 'SELECT p.p_id, p.p_text, p.p_time, p.u_id, p.p_nickname, p.p_map, t.t_title, t.t_description, t.f_id, u.u_activate_email, u.u_email, u.u_auth89 $sql = 'SELECT p.p_id, p.p_text, p.p_time, p.u_id, p.p_nickname, p.p_map, t.t_title, t.t_description, t.f_id, t.t_id, u.u_activate_email, u.u_email, u.u_auth 90 90 FROM ' . SQL_PREFIX . 'posts p 91 91 INNER JOIN ' . SQL_PREFIX . 'topics t … … 116 116 do 117 117 { 118 // Informations passées au parseur de message 119 $parser_info = array( 120 'u_id' => $row['u_id'], 121 'p_nickname' => $row['p_nickname'], 122 'u_auth' => $row['u_auth'], 123 'f_id' => $row['f_id'], 124 't_id' => $row['t_id'], 125 ); 118 126 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $row['u_auth'] >= MODOSUP) ? TRUE : FALSE; 127 119 128 $this->rss->add_entry( 120 129 Parser::title($row['t_title']), 121 htmlspecialchars($parser->mapped_message($row['p_text'], $row['p_map'] )),130 htmlspecialchars($parser->mapped_message($row['p_text'], $row['p_map'], $parser_info)), 122 131 (($row['u_activate_email'] & 2) ? 'mailto:' . $row['u_email'] : Fsb::$cfg->get('forum_mail')) . ' ' . htmlspecialchars($row['p_nickname']), 123 132 sid(Fsb::$cfg->get('fsb_path') . '/index.' . PHPEXT . '?p=topic&p_id=' . $row['p_id'] . '#p' . $row['p_id']), … … 140 149 141 150 // Liste des messages 142 $sql = 'SELECT f.f_name, p.p_id, p. p_text, p.p_time, p.p_nickname, p.p_map, t.t_id, t.t_title, t.t_description, u.u_activate_email, u.u_email, u.u_auth151 $sql = 'SELECT f.f_name, p.p_id, p.u_id, p.f_id, p.p_text, p.p_time, p.p_nickname, p.p_map, t.t_id, t.t_title, t.t_description, u.u_activate_email, u.u_email, u.u_auth 143 152 FROM ' . SQL_PREFIX . 'forums f 144 153 LEFT JOIN ' . SQL_PREFIX . 'topics t … … 166 175 do 167 176 { 177 // Informations passées au parseur de message 178 $parser_info = array( 179 'u_id' => $row['u_id'], 180 'p_nickname' => $row['p_nickname'], 181 'u_auth' => $row['u_auth'], 182 'f_id' => $row['f_id'], 183 't_id' => $row['t_id'], 184 ); 168 185 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $row['u_auth'] >= MODOSUP) ? TRUE : FALSE; 169 186 170 187 $this->rss->add_entry( 171 188 Parser::title($row['t_title']), 172 htmlspecialchars(($row['t_description']) ? $row['t_description'] : $parser->mapped_message($row['p_text'], $row['p_map'] )),189 htmlspecialchars(($row['t_description']) ? $row['t_description'] : $parser->mapped_message($row['p_text'], $row['p_map'], $parser_info)), 173 190 (($row['u_activate_email'] & 2) ? 'mailto:' . $row['u_email'] : Fsb::$cfg->get('forum_mail')) . ' ' . htmlspecialchars($row['p_nickname']), 174 191 sid(Fsb::$cfg->get('fsb_path') . '/index.' . PHPEXT . '?p=topic&t_id=' . $row['t_id']), … … 186 203 { 187 204 // Liste des messages 188 $sql = 'SELECT f.f_name, p.p_id, p. p_text, p.p_time, p.p_nickname, p.p_map, t.t_id, t.t_title, t.t_description, u.u_activate_email, u.u_email205 $sql = 'SELECT f.f_name, p.p_id, p.f_id, p.u_id, p.p_text, p.p_time, p.p_nickname, p.p_map, t.t_id, t.t_title, t.t_description, u.u_activate_email, u.u_email, u.u_auth 189 206 FROM ' . SQL_PREFIX . 'forums f 190 207 LEFT JOIN ' . SQL_PREFIX . 'topics t … … 213 230 do 214 231 { 232 // Informations passées au parseur de message 233 $parser_info = array( 234 'u_id' => $row['u_id'], 235 'p_nickname' => $row['p_nickname'], 236 'u_auth' => $row['u_auth'], 237 'f_id' => $row['f_id'], 238 't_id' => $row['t_id'], 239 ); 240 215 241 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $row['u_auth'] >= MODOSUP) ? TRUE : FALSE; 216 242 $this->rss->add_entry( 217 243 Parser::title($row['t_title']), 218 htmlspecialchars(($row['t_description']) ? $row['t_description'] : $parser->mapped_message($row['p_text'], $row['p_map'] )),244 htmlspecialchars(($row['t_description']) ? $row['t_description'] : $parser->mapped_message($row['p_text'], $row['p_map'], $parser_info)), 219 245 (($row['u_activate_email'] & 2) ? 'mailto:' . $row['u_email'] : Fsb::$cfg->get('forum_mail')) . ' ' . htmlspecialchars($row['p_nickname']), 220 246 sid(Fsb::$cfg->get('fsb_path') . '/index.' . PHPEXT . '?p=topic&t_id=' . $row['t_id']), main/forum/forum_search.php
r2 r3 4 4 ** | Name : ~/main/forum/forum_search.php 5 5 ** | Begin : 21/11/2005 6 ** | Last : 21/01/20086 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 598 598 while ($row = Fsb::$db->row($result)) 599 599 { 600 // Informations passées au parseur de message 601 $parser_info = array( 602 'u_id' => $row['u_id'], 603 'p_nickname' => $row['p_nickname'], 604 'u_auth' => $row['u_auth'], 605 'f_id' => $row['f_id'], 606 't_id' => $row['t_id'], 607 ); 608 600 609 // parse du message 601 610 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $row['u_auth'] >= MODOSUP) ? TRUE : FALSE; 602 $text = $parser->mapped_message($row['p_text'], $row['p_map'] );611 $text = $parser->mapped_message($row['p_text'], $row['p_map'], $parser_info); 603 612 $post_title = Parser::title($row['t_title']); 604 613 main/forum/forum_topic.php
r2 r3 322 322 } 323 323 324 // Informations passées au parseur de message 325 $parser_info = array( 326 'u_id' => $row['u_id'], 327 'p_nickname' => $row['p_nickname'], 328 'u_auth' => $row['u_auth'], 329 'f_id' => $row['f_id'], 330 't_id' => $row['t_id'], 331 ); 332 324 333 // On peut parser le HTML ? 325 334 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $row['u_auth'] >= MODOSUP) ? TRUE : FALSE; 326 $content = $parser->mapped_message($row['p_text'], $row['p_map'] );335 $content = $parser->mapped_message($row['p_text'], $row['p_map'], $parser_info); 327 336 328 337 Fsb::$tpl->set_blocks('post', $post_array['data'] += array( … … 517 526 $sexe = User::get_sexe($row['u_sexe']); 518 527 528 // Informations passées au parseur de message 529 $parser_info = array( 530 'u_id' => $row['u_id'], 531 'p_nickname' => $row['p_nickname'], 532 'u_auth' => $row['u_auth'], 533 'is_sig' => TRUE, 534 ); 535 519 536 $parser = new Parser(); 520 537 $ary = array(); … … 523 540 'IS_ONLINE' => ($row['u_last_visit'] > (CURRENT_TIME - ONLINE_LENGTH) && !$row['u_activate_hidden']) ? TRUE : FALSE, 524 541 'NICKNAME' => Html::nickname($row['p_nickname'], $row['u_id'], $row['u_color']), 525 'SIG' => $parser->sig($row['u_signature'] ),542 'SIG' => $parser->sig($row['u_signature'], $parser_info), 526 543 'RANK_NAME' => $rank['name'], 527 544 'RANK_IMG' => $rank['img'], main/forum/forum_userprofile.php
r2 r3 4 4 ** | Name : ~/main/forum/forum_userprofile.php 5 5 ** | Begin : 28/09/2005 6 ** | Last : 1 7/01/20086 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 161 161 'href' => sid(ROOT . 'index.' . PHPEXT . '?p=rss&mode=user&id=' . $this->id), 162 162 )); 163 164 // Informations passées au parseur de message 165 $parser_info = array( 166 'u_id' => $this->data['u_id'], 167 'p_nickname' => $this->data['u_nickname'], 168 'u_auth' => $this->data['u_auth'], 169 'is_sig' => TRUE, 170 ); 163 171 164 172 Fsb::$tpl->set_file('forum/forum_userprofile.html'); … … 174 182 'USER_TOPIC_RATE' => $this->data['topic_rate'], 175 183 'USER_TOPIC_TOTAL_RATE' => $this->data['topic_total_rate'], 176 'USER_SIG' => (Fsb::$cfg->get('activate_sig') && $this->data['u_can_use_sig']) ? $parser->sig($this->data['u_signature'] ) : '',184 'USER_SIG' => (Fsb::$cfg->get('activate_sig') && $this->data['u_can_use_sig']) ? $parser->sig($this->data['u_signature'], $parser_info) : '', 177 185 'USER_AGE' => ($this->data['u_age']) ? sprintf(Fsb::$session->lang('age_format'), $this->data['u_age']) : Fsb::$session->lang('userprofile_age_none'), 178 186 'USER_SEXE' => ($this->data['sexe'] != '') ? $this->data['sexe'] : Fsb::$session->lang('userprofile_sexe_none'), main/modo/modo_abuse.php
r2 r3 4 4 ** | Name : ~/main/modo/modo_abuse.php 5 5 ** | Begin : 20/10/2005 6 ** | Last : 25/12/20076 ** | Last : 10/02/2008 7 7 ** | User : Genova 8 8 ** | Project : Fire-Soft-Board 2 - Copyright FSB group … … 192 192 $parser->parse_html = (Fsb::$cfg->get('activate_html') && $row['u_auth'] >= MODOSUP) ? TRUE : FALSE; 193 193 194 // Informations passées au parseur de message 195 $parser_info = array( 196