flatnuke/flatnews/include news_functions.php,1.67,1.68 news_view.php,1.63,1.64

[bebabi34]

Update of /cvsroot/flatnuke/flatnuke/flatnews/include
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5625/flatnews/include

Modified Files:
news_functions.php news_view.php
Log Message:
removed obsolete $where parameter from tag2html function

Index: news_view.php
===================================================================
RCS file: /cvsroot/flatnuke/flatnuke/flatnews/include/news_view.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** news_view.php 22 Aug 2013 16:27:00 -0000 1.63
--- news_view.php 22 Aug 2013 22:40:29 -0000 1.64
***************
*** 89,93 ****
// echo "<div style=\" height: auto !important;height: 30px; min-height: 30px;\">";
// else echo "<div style=\" height: auto !important;height: 60px; min-height: 60px;\">";
! echo stripslashes(tag2html($data['header'],"home"));
// echo "</div>";
create_footer_news($section,$news,$data);
--- 89,93 ----
// echo "<div style=\" height: auto !important;height: 30px; min-height: 30px;\">";
// else echo "<div style=\" height: auto !important;height: 60px; min-height: 60px;\">";
! echo stripslashes(tag2html($data['header']));
// echo "</div>";
create_footer_news($section,$news,$data);
***************
*** 285,289 ****


! print stripslashes(tag2html($header,"home"))."<br /><br />".stripslashes(tag2html($body,"home"));
echo "<div class='social-links' style='text-align:right;margin-left:10px;margin-bottom:10px;/*border:1px;
border-left-style: solid; border-bottom-style: solid;border-color: #d5d6d7;*/'>";
--- 285,289 ----


! print stripslashes(tag2html($header))."<br /><br />".stripslashes(tag2html($body));
echo "<div class='social-links' style='text-align:right;margin-left:10px;margin-bottom:10px;/*border:1px;
border-left-style: solid; border-bottom-style: solid;border-color: #d5d6d7;*/'>";
***************
*** 385,389 ****
}
// comment
! print stripslashes(tag2html($comments[$count_comment]['cmpost'],"home"));
// link to manage the current comment
if(_FN_IS_ADMIN or _FN_IS_NEWS_MODERATOR) {
--- 385,389 ----
}
// comment
! print stripslashes(tag2html($comments[$count_comment]['cmpost']));
// link to manage the current comment
if(_FN_IS_ADMIN or _FN_IS_NEWS_MODERATOR) {
***************
*** 903,910 ****
echo "<b>"._INTMESSAGGIO."</b><br />";
// fckeditor panel news HEADER
! fn_textarea("fckeditor",tag2html($text,"home"),array("allow_php"=>TRUE,"BasePath"=>"include/plugins/editors/FCKeditor/", "Width"=>"100%","Height"=>"400","name"=>"news_header","id"=>"news_header","rows"=>"20","style"=>"width: 100%"));
// fckeditor panel news BODY
echo "<b>"._CORPOMESSAGGIO."</b><br />";
! fn_textarea("fckeditor",tag2html($edit_body,"home"),array("allow_php"=>TRUE,"BasePath"=>"include/plugins/editors/FCKeditor/", "Width"=>"100%","Height"=>"400","name"=>"news_body","id"=>"news_body","rows"=>"20","style"=>"width: 100%"));
}
else if ($news_editor=="ckeditor" AND file_exists("include/plugins/editors/ckeditor/ckeditor.php") AND $mode!="propose" AND (_FN_IS_ADMIN or _FN_IS_NEWS_MODERATOR)) {
--- 903,910 ----
echo "<b>"._INTMESSAGGIO."</b><br />";
// fckeditor panel news HEADER
! fn_textarea("fckeditor",tag2html($text),array("allow_php"=>TRUE,"BasePath"=>"include/plugins/editors/FCKeditor/", "Width"=>"100%","Height"=>"400","name"=>"news_header","id"=>"news_header","rows"=>"20","style"=>"width: 100%"));
// fckeditor panel news BODY
echo "<b>"._CORPOMESSAGGIO."</b><br />";
! fn_textarea("fckeditor",tag2html($edit_body),array("allow_php"=>TRUE,"BasePath"=>"include/plugins/editors/FCKeditor/", "Width"=>"100%","Height"=>"400","name"=>"news_body","id"=>"news_body","rows"=>"20","style"=>"width: 100%"));
}
else if ($news_editor=="ckeditor" AND file_exists("include/plugins/editors/ckeditor/ckeditor.php") AND $mode!="propose" AND (_FN_IS_ADMIN or _FN_IS_NEWS_MODERATOR)) {
***************
*** 915,922 ****
echo "<b>"._INTMESSAGGIO."</b><br />";
// fckeditor panel news HEADER
! fn_textarea("ckeditor",tag2html($text,"home"),array("allow_php"=>TRUE,"BasePath"=>"include/plugins/editors/ckeditor/", "Width"=>"100%","Height"=>"400","name"=>"news_header","id"=>"news_header","rows"=>"20","style"=>"width: 100%"));
// fckeditor panel news BODY
echo "<b>"._CORPOMESSAGGIO."</b><br />";
! fn_textarea("ckeditor",tag2html($edit_body,"home"),array("allow_php"=>TRUE,"BasePath"=>"include/plugins/editors/ckeditor/", "Width"=>"100%","Height"=>"400","name"=>"news_body","id"=>"news_body","rows"=>"20","style"=>"width: 100%"));

}
--- 915,922 ----
echo "<b>"._INTMESSAGGIO."</b><br />";
// fckeditor panel news HEADER
! fn_textarea("ckeditor",tag2html($text),array("allow_php"=>TRUE,"BasePath"=>"include/plugins/editors/ckeditor/", "Width"=>"100%","Height"=>"400","name"=>"news_header","id"=>"news_header","rows"=>"20","style"=>"width: 100%"));
// fckeditor panel news BODY
echo "<b>"._CORPOMESSAGGIO."</b><br />";
! fn_textarea("ckeditor",tag2html($edit_body),array("allow_php"=>TRUE,"BasePath"=>"include/plugins/editors/ckeditor/", "Width"=>"100%","Height"=>"400","name"=>"news_body","id"=>"news_body","rows"=>"20","style"=>"width: 100%"));

}

Index: news_functions.php
===================================================================
RCS file: /cvsroot/flatnuke/flatnuke/flatnews/include/news_functions.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** news_functions.php 19 Aug 2013 13:24:04 -0000 1.67
--- news_functions.php 22 Aug 2013 22:40:29 -0000 1.68
***************
*** 2154,2159 ****
// print_r($news);
$item = new rssGenerator_item();
! $item->title = tag2html($news['title'],"home");
! $item->description = $rss_feed->cdata(tag2html($news['header'],"home"));
$item->link = "$url?mod=$section&amp;action=viewnews&amp;news=".$news_list[$i];
$item->guid = "$url?mod=$section&amp;action=viewnews&amp;news=".$news_list[$i];
--- 2154,2159 ----
// print_r($news);
$item = new rssGenerator_item();
! $item->title = tag2html($news['title']);
! $item->description = $rss_feed->cdata(tag2html($news['header']));
$item->link = "$url?mod=$section&amp;action=viewnews&amp;news=".$news_list[$i];
$item->guid = "$url?mod=$section&amp;action=viewnews&amp;news=".$news_list[$i];
***************
*** 2229,2234 ****
// print_r($news);
$item = new rssGenerator_item();
! $item->title = tag2html($news['title'],"home");
! $item->description = $rss_feed->cdata(tag2html($news['header'],"home"));
$item->link = "$url?mod=$section&amp;action=viewnews&amp;news=".$news_name;
$item->guid = "$url?mod=$section&amp;action=viewnews&amp;news=".$news_name;
--- 2229,2234 ----
// print_r($news);
$item = new rssGenerator_item();
! $item->title = tag2html($news['title']);
! $item->description = $rss_feed->cdata(tag2html($news['header']));
$item->link = "$url?mod=$section&amp;action=viewnews&amp;news=".$news_name;
$item->guid = "$url?mod=$section&amp;action=viewnews&amp;news=".$news_name;