|
@@ -814,7 +814,7 @@ class Blog
|
|
|
$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
|
|
|
$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
|
|
|
|
|
|
- global $dateFormatLong;
|
|
|
+ global $charset,$dateFormatLong;
|
|
|
|
|
|
// Get posts and author
|
|
|
$sql = "SELECT post.*, user.lastname, user.firstname FROM $tbl_blogs_posts post
|
|
@@ -842,7 +842,7 @@ class Blog
|
|
|
$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '"><img src="../img/edit.gif" /></a>';
|
|
|
|
|
|
if(api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id))
|
|
|
- $blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"))). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>';
|
|
|
+ $blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>';
|
|
|
|
|
|
if(api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
|
|
|
$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);
|
|
@@ -995,7 +995,7 @@ class Blog
|
|
|
$tbl_blogs_comments = Database::get_course_table(TABLE_BLOGS_COMMENTS);
|
|
|
$tbl_users = Database::get_main_table(TABLE_MAIN_USER);
|
|
|
$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
|
|
|
- global $dateFormatLong;
|
|
|
+ global $charset,$dateFormatLong;
|
|
|
|
|
|
// Select top level comments
|
|
|
$next_level = $current_level + 1;
|
|
@@ -1026,7 +1026,7 @@ class Blog
|
|
|
$blog_comment_date = ucfirst(format_locale_date($dateFormatLong,strtotime($comment['date_creation'])));
|
|
|
$blog_comment_time = date('H:i',strtotime($comment['date_creation']));
|
|
|
$blog_comment_actions = "";
|
|
|
- if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_comment&comment_id=' . $comment['comment_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisComment') . '" onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"))). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>'; }
|
|
|
+ if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_comment&comment_id=' . $comment['comment_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisComment') . '" onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>'; }
|
|
|
if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_rate')) { $rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']); }
|
|
|
|
|
|
if(!is_null($comment['task_id']))
|
|
@@ -1258,6 +1258,7 @@ class Blog
|
|
|
*/
|
|
|
function display_task_list($blog_id)
|
|
|
{
|
|
|
+ global $charset;
|
|
|
if(api_is_allowed('BLOG_' . $blog_id, 'article_add'))
|
|
|
{
|
|
|
// Init
|
|
@@ -1301,7 +1302,7 @@ class Blog
|
|
|
$delete_icon = ($task['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
|
|
|
$delete_title = ($task['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
|
|
|
$delete_link = ($task['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=delete&task_id=' . $task['task_id'];
|
|
|
- $delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"))). '\')) return false;"';
|
|
|
+ $delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
|
|
|
|
|
|
echo '<tr class="' . $css_class . '" valign="top">',
|
|
|
'<td width="240">' . stripslashes($task['title']) . '</td>',
|
|
@@ -1335,7 +1336,7 @@ class Blog
|
|
|
$tbl_blogs_tasks = Database::get_course_table(TABLE_BLOGS_TASKS);
|
|
|
$tbl_blogs_tasks_rel_user = Database::get_course_table(TABLE_BLOGS_TASKS_REL_USER);
|
|
|
$counter = 0;
|
|
|
- global $color2;
|
|
|
+ global $charset,$color2;
|
|
|
|
|
|
echo '<span class="blogpost_title">' . get_lang('AssignedTasks') . '</span><br />';
|
|
|
echo "<table class=\"data_table\">";
|
|
@@ -1362,7 +1363,7 @@ class Blog
|
|
|
$delete_icon = ($task['system_task'] == '1') ? "delete_na.gif" : "delete.gif";
|
|
|
$delete_title = ($task['system_task'] == '1') ? get_lang('DeleteSystemTask') : get_lang('DeleteTask');
|
|
|
$delete_link = ($task['system_task'] == '1') ? '#' : api_get_self() . '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=delete&task_id=' . $task['task_id'];
|
|
|
- $delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"))). '\')) return false;"';
|
|
|
+ $delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';
|
|
|
|
|
|
echo '<tr class="' . $css_class . '" valign="top">',
|
|
|
'<td width="240">' . $assignment['firstname'] . ' ' . $assignment['lastname'] . '</td>',
|
|
@@ -1374,7 +1375,7 @@ class Blog
|
|
|
'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
|
|
|
"</a>\n",
|
|
|
'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $assignment['blog_id'] . '&do=delete_assignment&assignment_id=' . $assignment['task_id'] . '|' . $assignment['user_id'] . '" ',
|
|
|
- 'onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"))). '\')) return false;"',
|
|
|
+ 'onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"',
|
|
|
'<img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
|
|
|
"</a>\n",
|
|
|
'</td>',
|
|
@@ -2532,6 +2533,7 @@ class Blog
|
|
|
*/
|
|
|
function display_blog_list()
|
|
|
{
|
|
|
+ global $charset;
|
|
|
// Init
|
|
|
$counter = 0;
|
|
|
$tbl_blogs = Database::get_course_table(TABLE_BLOGS);
|
|
@@ -2556,7 +2558,7 @@ class Blog
|
|
|
'<img src="../img/edit.gif" border="0" title="' . get_lang('EditBlog') . '" />',
|
|
|
"</a>\n",
|
|
|
'<a href="' .api_get_self(). '?action=delete&blog_id=' . $blog['blog_id'] . '" ',
|
|
|
- 'onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"))). '\')) return false;"',
|
|
|
+ 'onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"',
|
|
|
'<img src="../img/delete.gif" border="0" title="' . get_lang('DeleteBlog') . '" />',
|
|
|
"</a>\n",
|
|
|
'<a href="' .api_get_self(). '?action=visibility&blog_id=' . $blog['blog_id'] . '">',
|