From e316005a56a9dea6f51697a7f5f7a0a15eddcdc7 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 18 Dec 2014 12:45:17 +0100
Subject: [PATCH] Drh can see wiki see #7064

---
 main/wiki/index.php    |  8 ++++----
 main/wiki/wiki.inc.php | 24 +++++++++++++++---------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/main/wiki/index.php b/main/wiki/index.php
index 12459913ad..105cbe8b5f 100755
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -6,9 +6,7 @@
  *
  * 	@package chamilo.wiki
  */
-/**
- * Code
- */
+
 use \ChamiloSession as Session;
 
 // name of the language file that needs to be included
@@ -86,7 +84,9 @@ if ($groupId) {
     if ($group_properties['wiki_state'] == 0) {
         api_not_allowed();
     } elseif ($group_properties['wiki_state']==2) {
-        if (!api_is_allowed_to_edit(false,true) and !GroupManager :: is_user_in_group(api_get_user_id(), api_get_group_id())) {
+        if (!api_is_allowed_to_edit(false,true) and
+            !GroupManager :: is_user_in_group(api_get_user_id(), api_get_group_id())
+        ) {
             api_not_allowed();
         }
     }
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index 6cb2ae9d69..f4264cb955 100755
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -4314,14 +4314,15 @@ class Wiki
         // menu home
         echo '<ul class="dropdown-menu">';
         echo '<li><a href="index.php?action=showpage&title=index&cidReq='.$_course['id'].'&session_id='.$session_id.'&group_id='.$groupId.'">'.get_lang('Home').'</a></li>';
-        if (api_is_allowed_to_session_edit(false,true)) {
-            //menu add page
-            echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=addnew&session_id='.$session_id.'&group_id='.$groupId.'"'.self::is_active_navigation_tab('addnew').'>'.get_lang('AddNew').'</a>';
+        if (api_is_allowed_to_session_edit(false, true) && api_is_allowed_to_edit()) {
+            // menu add page
+            echo '<li><a href="index.php?cidReq=' . $_course['id'] . '&action=addnew&session_id=' . $session_id . '&group_id=' . $groupId . '"' . self::is_active_navigation_tab('addnew').'>' . get_lang('AddNew') . '</a>';
         }
+
         $lock_unlock_addnew = null;
         $protect_addnewpage = null;
 
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             // page action: enable or disable the adding of new pages
             if (self::check_addnewpagelock()==0) {
                 $protect_addnewpage = Display::return_icon('off.png', get_lang('AddOptionProtected'));
@@ -4340,7 +4341,7 @@ class Wiki
         // menu recent changes
         echo '<li><a href="index.php?cidReq='.$_course['id'].'&action=recentchanges&session_id='.$session_id.'&group_id='.$groupId.'"'.self::is_active_navigation_tab('recentchanges').'>'.get_lang('RecentChanges').'</a></li>';
         // menu delete all wiki
-        if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) {
+        if (api_is_allowed_to_edit(false, true) || api_is_platform_admin()) {
             echo '<li><a href="index.php?action=deletewiki&amp;title='.api_htmlentities(urlencode($page)).'"'.self::is_active_navigation_tab('deletewiki').'>'.get_lang('DeleteWiki').'</a></li>';
         }
         ///menu more
@@ -4352,11 +4353,16 @@ class Wiki
         echo '<a href="index.php?cidReq='.$_course['id'].'&action=showpage&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$groupId.'"'.self::is_active_navigation_tab('showpage').'>'.
             Display::return_icon('page.png',get_lang('ShowThisPage'),'',ICON_SIZE_MEDIUM).'</a>';
 
-        if (api_is_allowed_to_session_edit(false,true) ) {
-            //menu edit page
-            echo '<a href="index.php?cidReq='.$_course['id'].'&action=edit&amp;title='.api_htmlentities(urlencode($page)).'&session_id='.$session_id.'&group_id='.$groupId.'"'.self::is_active_navigation_tab('edit').'>'.
-                Display::return_icon('edit.png',get_lang('EditThisPage'),'',ICON_SIZE_MEDIUM).'</a>';
+        if (api_is_allowed_to_session_edit(false, true) && api_is_allowed_to_edit()) {
+            // menu edit page
 
+            echo '<a href="index.php?cidReq=' . $_course['id'] . '&action=edit&amp;title=' . api_htmlentities(urlencode($page)) . '&session_id=' . $session_id . '&group_id=' . $groupId . '"' . self::is_active_navigation_tab('edit') . '>' .
+                Display::return_icon(
+                    'edit.png',
+                    get_lang('EditThisPage'),
+                    '',
+                    ICON_SIZE_MEDIUM
+                ) . '</a>';
             //menu discuss page
             echo '<a href="index.php?action=discuss&amp;title='.api_htmlentities(urlencode($page)).'"'.self::is_active_navigation_tab('discuss').'>'.
                 Display::return_icon('discuss.png',get_lang('DiscussThisPage'),'',ICON_SIZE_MEDIUM).'</a>';