diff --git a/main/blog/blog.php b/main/blog/blog.php index 7abe930086..be03252fc0 100644 --- a/main/blog/blog.php +++ b/main/blog/blog.php @@ -137,7 +137,7 @@ if ($_GET['action'] == 'view_post') if ($_GET['do'] == 'delete_comment') { - if (api_is_allowed_to_edit('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) + if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) { Blog :: delete_comment($blog_id, (int)$_GET['comment_id']); } @@ -150,7 +150,7 @@ if ($_GET['action'] == 'view_post') if ($_GET['do'] == 'delete_article') { - if (api_is_allowed_to_edit('BLOG_'.$blog_id, 'article_delete', $task_id)) + if (api_is_allowed('BLOG_'.$blog_id, 'article_delete', $task_id)) { Blog :: delete_post($blog_id, (int)$_GET['article_id']); $current_page = ''; // Article is gone, go to blog home @@ -165,14 +165,14 @@ if ($_GET['action'] == 'view_post') { if ($_GET['type'] == 'post') { - if (api_is_allowed_to_edit('BLOG_'.$blog_id, 'article_rate')) + if (api_is_allowed('BLOG_'.$blog_id, 'article_rate')) { Blog :: add_rating('post', $blog_id, (int)$_GET['post_id'], (int)$_GET['rating']); } } if ($_GET['type'] == 'comment') { - if (api_is_allowed_to_edit('BLOG_'.$blog_id, 'article_comments_add')) + if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_add')) { Blog :: add_rating('comment', $blog_id, (int)$_GET['comment_id'], (int)$_GET['rating']); } @@ -248,9 +248,9 @@ Blog :: display_minimonthcalendar($month, $year, $blog_id); @@ -355,7 +355,7 @@ else switch ($current_page) { case 'new_post' : - if (api_is_allowed_to_edit('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) + if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) { Blog :: display_form_new_post($blog_id); } @@ -370,14 +370,14 @@ switch ($current_page) case 'edit_post' : $task_id = (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0; - if (api_is_allowed_to_edit('BLOG_'.$blog_id, 'article_edit', $task_id)) + if (api_is_allowed('BLOG_'.$blog_id, 'article_edit', $task_id)) Blog :: display_form_edit_post($blog_id, mysql_real_escape_string((int)$_GET['post_id'])); else api_not_allowed(); break; case 'manage_members' : - if (api_is_allowed_to_edit('BLOG_'.$blog_id, 'member_management')) + if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) { Blog :: display_form_user_subscribe($blog_id); echo '

'; @@ -391,7 +391,7 @@ switch ($current_page) Blog :: display_form_user_rights($blog_id); break; case 'manage_tasks' : - if (api_is_allowed_to_edit('BLOG_'.$blog_id, 'task_management')) + if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) { if ($_GET['do'] == 'add') { @@ -413,7 +413,7 @@ switch ($current_page) echo '

'; Blog :: display_assigned_task_list($blog_id); echo '

'; - if (api_is_allowed_to_edit('BLOG_'.$blog_id, 'role_management')) + if (api_is_allowed('BLOG_'.$blog_id, 'role_management')) { ?> diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php index 167b171972..c4434895e4 100644 --- a/main/inc/lib/blog.lib.php +++ b/main/inc/lib/blog.lib.php @@ -838,13 +838,13 @@ class Blog $task_id = (isset($_GET['task_id']) && is_numeric($_GET['task_id'])) ? $_GET['task_id'] : 0; - if(api_is_allowed_to_edit('BLOG_' . $blog_id, 'article_edit', $task_id)) + if(api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id)) $blog_post_actions .= ''; - if(api_is_allowed_to_edit('BLOG_' . $blog_id, 'article_delete', $task_id)) + if(api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id)) $blog_post_actions .= ''; - if(api_is_allowed_to_edit('BLOG_' . $blog_id, 'article_rate')) + if(api_is_allowed('BLOG_' . $blog_id, 'article_rate')) $rating_select = Blog::display_rating_form('post',$blog_id,$post_id); $blog_post_text=stripslashes($blog_post_text); @@ -868,7 +868,7 @@ class Blog } // Display comment form - if(api_is_allowed_to_edit('BLOG_' . $blog_id, 'article_comments_add')) + if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_add')) { Blog::display_new_comment_form($blog_id, $post_id, $blog_post['title']); } @@ -1026,8 +1026,8 @@ class Blog $blog_comment_date = ucfirst(format_locale_date($dateFormatLong,strtotime($comment['date_creation']))); $blog_comment_time = date('H:m',strtotime($comment['date_creation'])); $blog_comment_actions = ""; - if(api_is_allowed_to_edit('BLOG_' . $blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= ''; } - if(api_is_allowed_to_edit('BLOG_' . $blog_id, 'article_comments_rate')) { $rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']); } + if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= ''; } + 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'])) { @@ -1059,7 +1059,7 @@ class Blog */ function display_form_new_post($blog_id) { - if(api_is_allowed_to_edit('BLOG_' . $blog_id, 'article_add')) + if(api_is_allowed('BLOG_' . $blog_id, 'article_add')) { echo '