some more UI change

diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index 89b69df3d2f7f74aafe355bc961fc84f92dd5096..a648d455dfcc0d70881fbcf4acbdbff6b962eaa1 100755 (executable)
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -55,9 +55,25 @@
 
     $context = get_record('context', 'id', $contextid);
     
+    $participants = get_string("participants");
+    $user = get_record('user', 'id', $userid);
+    $fullname = fullname($user, isteacher($course->id));
+    
     // we got a few tabs there
     if ($context->level == CONTEXT_USERID) {
-        print_header();
+        /// course header
+        if ($courseid!= SITEID) {
+            print_header("$fullname", "$fullname",
+                     "<a href=\"../course/view.php?id=$course->id\">$course->shortname</a> ->
+                      <a href=\"".$CFG->wwwroot."/user/index.php?id=$course->id\">$participants</a> -> <a href=\"".$CFG->wwwroot."/user/view.php?id=".$userid."&course=".$courseid."\">$fullname</a> ->".get_string('assign', 'roles'),
+                      "", "", true, "&nbsp;", navmenu($course));      
+        
+        /// site header  
+        } else {
+            print_header("$course->fullname: $fullname", "$course->fullname",
+                        "<a href=\"".$CFG->wwwroot."/user/view.php?id=".$userid."&course=".$courseid."\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));     
+        }
+        
         $showroles = 1;
         $currenttab = 'assign';
         include_once($CFG->dirroot.'/user/tabs.php');

diff --git a/admin/roles/manage.html b/admin/roles/manage.html
index bf97a1467ee4d71cc4b7f6c0f1729f7854171292..cb6d3cc92bea11838d7f36e69f7ed6297a1b283a 100755 (executable)
--- a/admin/roles/manage.html
+++ b/admin/roles/manage.html
@@ -35,23 +35,10 @@ foreach ($capabilities as $capability) {
     $contextlevel = $capability->contextlevel;
     $component = $capability->component;
 
-    // check the capability override for this cap, this role in this context
+   // check the capability override for this cap, this role in this context
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID);
 
-    $SQL = "select * from {$CFG->prefix}role_capabilities where
-                     roleid = $roleid and capability = '$capability->name' and contextid = $contextid";
-    get_record_sql($SQL);
-
-    $localoverride = get_local_override($roleid, $contextid, $capability->name);
-
-    if (isset($r_caps[$capability->name])) {
-        $isallow = $r_caps[$capability->name] > 0;
-        $isprevent = $r_caps[$capability->name] < 0 && $r_caps[$capability->name] > -500;
-        $isprohibit = $r_caps[$capability->name] <= -500;
-    } else {
-        $isallow = 0;
-        $isprevent = 0;
-        $isprohibit = 0;  
-    }
+    $localoverride = get_local_override($roleid, $sitecontext->id, $capability->name);
 
     ?>
 

diff --git a/admin/roles/override.php b/admin/roles/override.php
index 54c816b8bbc1520676e02e14c57cf4cc607501a2..e7fd3829a0eaa39b7bd22b09a9203edfaf4c220a 100755 (executable)
--- a/admin/roles/override.php
+++ b/admin/roles/override.php
@@ -30,12 +30,27 @@
     $strshowall = get_string('showall');
 
     $context = get_record('context', 'id', $contextid);
-
-    $straction = get_string('overrideroles', 'role');
     
+    $participants = get_string("participants");
+    $user = get_record('user', 'id', $userid);
+    $fullname = fullname($user, isteacher($course->id));
+    $straction = get_string('overrideroles', 'role');
+
     // we got a few tabs there
     if ($context->level == CONTEXT_USERID) {
-        print_header();
+      
+        /// course header
+        if ($courseid!= SITEID) {
+            print_header("$fullname", "$fullname",
+                     "<a href=\"../course/view.php?id=$course->id\">$course->shortname</a> ->
+                      <a href=\"".$CFG->wwwroot."/user/index.php?id=$course->id\">$participants</a> -> <a href=\"".$CFG->wwwroot."/user/view.php?id=".$userid."&course=".$courseid."\">$fullname</a> -> $straction",
+                      "", "", true, "&nbsp;", navmenu($course));      
+        
+        /// site header  
+        } else {
+            print_header("$course->fullname: $fullname", "$course->fullname",
+                        "<a href=\"".$CFG->wwwroot."/user/view.php?id=".$userid."&course=".$courseid."\">$fullname</a> -> $straction", "", "", true, "&nbsp;", navmenu($course));     
+        }
         $showroles = 1;
         $currenttab = 'override';
         include_once($CFG->dirroot.'/user/tabs.php');
@@ -58,9 +73,9 @@
              }
          
              $SQL = "select * from {$CFG->prefix}role_capabilities where
-            roleid = $roleid and capability = '$capname' and contextid = $contextid";
+             roleid = $roleid and capability = '$capname' and contextid = $contextid";
                         
-            $localoverride = get_record_sql($SQL);
+             $localoverride = get_record_sql($SQL);
          
              if ($localoverride) { // update current overrides
              
@@ -73,6 +88,7 @@
                      $localoverride->permission = $value;
                      $localoverride->timemodified = time();
                      $localoverride->modifierid = $USER->id;
+                     
                      update_record('role_capabilities', $localoverride);    
                  
                  }

diff --git a/blog/header.php b/blog/header.php
index 5c37590504af3762b44a83046bc20d88dc9c22f2..e5ba7a2b7a9eff0536953230c9e816340de2d694 100755 (executable)
--- a/blog/header.php
+++ b/blog/header.php
@@ -184,7 +184,9 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') {  /// We are in edit mode, print the
 } /// close switch
 
 // prints the tabs
-$showroles = 1;
+if ($filtertype=='user') {
+    $showroles = 1;
+}
 $currenttab = 'blogs';
 $user = $USER;
 if (!$course) {

diff --git a/course/user.php b/course/user.php
index a9c4b5a6d28f675a79d8211d03b6d96693b169b4..4519103d00994a3b55f6e96f560528af9f247db7 100644 (file)
--- a/course/user.php
+++ b/course/user.php
@@ -57,6 +57,7 @@
 ///     /user/edit.php
 ///     /course/user.php
     $currenttab = $mode;
+    $showroles = 1;
     include($CFG->dirroot.'/user/tabs.php');
 
     get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused);

diff --git a/mod/forum/user.php b/mod/forum/user.php
index 7963775c59b8dc5d4734001a993b8c6ffcdcf53b..db762af8ed3b6bcc27b9ad9de0a69e634dec1099 100644 (file)
--- a/mod/forum/user.php
+++ b/mod/forum/user.php
@@ -49,6 +49,7 @@
     }
 
     $currenttab = $mode;
+    $showroles = 1;
     include($CFG->dirroot.'/user/tabs.php');   /// Prints out tabs as part of user page
 
     $isseparategroups = /*

diff --git a/user/edit.php b/user/edit.php
index 0b614639bf91f43b7bf91e4cb27774027fe490b4..cb92a27e616b4b60dac8d4f878e40b05f7073bf5 100644 (file)
--- a/user/edit.php
+++ b/user/edit.php
@@ -340,6 +340,7 @@
         ///     /user/view.php
         ///     /user/edit.php
         ///     /course/user.php
+        $showroles = 1;
         $currenttab = 'editprofile';
         include('tabs.php');
     }

diff --git a/user/tabs.php b/user/tabs.php
index bda6e745c157cc1214dc6102b9b7a487e034fab5..24a496bc0dfc6c81539b379f0d59f6dd1a69deee 100644 (file)
--- a/user/tabs.php
+++ b/user/tabs.php
@@ -89,7 +89,7 @@
 
         $toprow[] = new tabobject('profile', $CFG->wwwroot.'/user/view.php?id='.$user->id.'&course='.$course->id, get_string('profile'));
 
-
+        $personalcontext = get_context_instance(CONTEXT_USERID, $user->id);
     /// Can only edit profile if it belongs to user or current user is admin and not editing primary admin
 
         if (($mainadmin = get_admin()) === false) {
@@ -107,26 +107,27 @@
             $toprow[] = new tabobject('editprofile', $wwwroot.'/user/edit.php?id='.$user->id.'&course='.$course->id, get_string('editmyprofile'));
         }
 
-
     /// Everyone can see posts for this user
+    
+    /// add logic to see course read posts permission
+        if (has_capability('moodle/user:readuserposts', $personalcontext) || has_capability('mod/forum:viewdiscussion', get_context_instance(CONTEXT_COURSE, $courseid))) {
+            $toprow[] = new tabobject('forumposts', $CFG->wwwroot.'/mod/forum/user.php?id='.$user->id.'&course='.$course->id,
+                        get_string('forumposts', 'forum'));
 
-        $toprow[] = new tabobject('forumposts', $CFG->wwwroot.'/mod/forum/user.php?id='.$user->id.'&course='.$course->id,
-                    get_string('forumposts', 'forum'));
-
-        if (in_array($currenttab, array('posts', 'discussions'))) {
-            $inactive = array('forumposts');
-            $activetwo = array('forumposts');
+            if (in_array($currenttab, array('posts', 'discussions'))) {
+                $inactive = array('forumposts');
+                $activetwo = array('forumposts');
 
-            $secondrow = array();
-            $secondrow[] = new tabobject('posts', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id.
+                $secondrow = array();
+                $secondrow[] = new tabobject('posts', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id.
                                       '&id='.$user->id.'&mode=posts', get_string('posts', 'forum'));
-            $secondrow[] = new tabobject('discussions', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id.
+                $secondrow[] = new tabobject('discussions', $CFG->wwwroot.'/mod/forum/user.php?course='.$course->id.
                                       '&id='.$user->id.'&mode=discussions', get_string('discussions', 'forum'));
-        }
-
+            }
 
+        }
     /// Blog entry, everyone can view
-        if ($CFG->bloglevel > 0) { // only if blog is enabled. Permission check kicks in when display list
+        if ($CFG->bloglevel > 0 && has_capability('moodle/user:readuserblogs')) { // only if blog is enabled. Permission check kicks in when display list
             $toprow[] = new tabobject('blogs', $CFG->wwwroot.'/blog/index.php?userid='.$user->id.'&courseid='.$course->id, get_string('blogs', 'blog'));
         }
         
@@ -135,7 +136,9 @@
     
     //print_object($course);
     //print_object($user);
-        if (isteacher($course->id) or ($course->showreports and $USER->id == $user->id)) {
+    
+        // add in logic to check course read report
+        if (has_capability('moodle/user:viewactivitiesreport', $personalcontext) || ($course->showreports and $USER->id == $user->id)) {
 
             $toprow[] = new tabobject('reports', $CFG->wwwroot.'/course/user.php?id='.$course->id.
                                       '&user='.$user->id.'&mode=outline', get_string('activityreports'));
@@ -183,9 +186,9 @@
 
             $secondrow = array();
             $secondrow[] = new tabobject('assign', $CFG->wwwroot.'/admin/roles/assign.php?contextid='.$usercontext->id.'&userid='.$user->id.'&courseid='.$course->id
-                              ,get_string('assign'));
+                              ,get_string('assignroles', 'role'));
             $secondrow[] = new tabobject('override', $CFG->wwwroot.'/admin/roles/override.php?contextid='.$usercontext->id.'&userid='.$user->id.'&courseid='.$course->id
-                              ,get_string('override'));
+                              ,get_string('overrideroles', 'role'));
                                 
         }                                                                                                       
     }