MDL-17465 - separate live log capability adn admin tree link

diff --git a/admin/report/log/settings.php b/admin/report/log/settings.php
index 4bccaf7e7bafcff60cf3a9f6f3120e8beac502ad..be15280d865fb8c8f3d6b793f74e7f36059d078f 100644 (file)
--- a/admin/report/log/settings.php
+++ b/admin/report/log/settings.php
@@ -1,4 +1,5 @@
 <?php  // $Id$
 // just a link to course report
 $ADMIN->add('reports', new admin_externalpage('reportlog', get_string('log', 'admin'), "$CFG->wwwroot/course/report/log/index.php?id=".SITEID, 'coursereport/log:view'));
+$ADMIN->add('reports', new admin_externalpage('reportloglive', get_string('loglive', 'coursereport_log'), "$CFG->wwwroot/course/report/log/indexlive.php?id=".SITEID, 'coursereport/log:viewlive'));
 ?>
\ No newline at end of file

diff --git a/course/report/log/db/access.php b/course/report/log/db/access.php
index b8873df06fc6519e7de6bf9cf96be475420e8667..85377d377429a3b0dd7e22500aafefdfd328fd7a 100644 (file)
--- a/course/report/log/db/access.php
+++ b/course/report/log/db/access.php
@@ -35,8 +35,22 @@ $coursereport_log_capabilities = array(
             'admin' => CAP_ALLOW
         ),
 
+        'clonepermissionsfrom' => 'moodle/site:viewreports',
+    ),
+
+    'coursereport/log:viewlive' => array(
+        'riskbitmask' => RISK_PERSONAL,
+        'captype' => 'read',
+        'contextlevel' => CONTEXT_COURSE,
+        'legacy' => array(
+            'teacher' => CAP_ALLOW,
+            'editingteacher' => CAP_ALLOW,
+            'admin' => CAP_ALLOW
+        ),
+
         'clonepermissionsfrom' => 'moodle/site:viewreports',
     )
+
 );
 
 ?>

diff --git a/course/report/log/index.php b/course/report/log/index.php
index b23670bf7ed79424b84fb4c4c40046581a9557cd..76186f1d8f1155b86d0d3962df1393a6849ff0e6 100644 (file)
--- a/course/report/log/index.php
+++ b/course/report/log/index.php
@@ -137,14 +137,6 @@
         print_heading(get_string('chooselogs') .':');
 
         print_log_selector_form($course, $user, $date, $modname, $modid, $modaction, $group, $showcourses, $showusers, $logformat);
-
-        echo '<br />';
-        print_heading(get_string('chooselivelogs') .':');
-
-        echo '<center><h3>';
-        link_to_popup_window('/course/report/log/live.php?id='. $course->id,'livelog', get_string('livelogs'), 500, 800);
-        echo '</h3></center>';
-
     }
 
     print_footer($course);

diff --git a/course/report/log/indexlive.php b/course/report/log/indexlive.php
new file mode 100644 (file)
index 0000000..8c59224
--- /dev/null
+++ b/course/report/log/indexlive.php
@@ -0,0 +1,43 @@
+<?php // $Id$
+      // Display link to live logs in separate window
+
+    require_once('../../../config.php');
+    require_once('../../lib.php');
+    require_once('lib.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $id = optional_param('id', 0, PARAM_INT);// Course ID
+
+    if (!$course = $DB->get_record('course', array('id'=>$id)) ) {
+        error('That\'s an invalid course id'.$id);
+    }
+
+    require_login($course);
+    $context = get_context_instance(CONTEXT_COURSE, $course->id);
+
+    require_capability('coursereport/log:viewlive', $context);
+
+    $strlogs = get_string('logs');
+    $strreports = get_string('reports');
+
+    if ($course->id == SITEID) {
+        admin_externalpage_setup('reportloglive');
+        admin_externalpage_print_header();
+
+    } else {
+        $navlinks = array();
+        $navlinks[] = array('name' => $strreports, 'link' => "$CFG->wwwroot/course/report.php?id=$course->id", 'type' => 'misc');
+        $navlinks[] = array('name' => $strlogs, 'link' => null, 'type' => 'misc');
+        $navigation = build_navigation($navlinks);
+        print_header($course->shortname .': '. $strlogs, $course->fullname, $navigation, '');
+    }
+
+    print_heading(get_string('loglive', 'coursereport_log'));
+
+    echo '<div class="info">';
+    link_to_popup_window('/course/report/log/live.php?id='. $course->id,'livelog', get_string('livelogs'), 500, 800);
+    echo '<div>';
+
+    print_footer($course);
+
+?>

diff --git a/course/report/log/live.php b/course/report/log/live.php
index 3f1f518ea32c6bf27ec812fb9242ca604e27004e..8dce7e52192b3418b15173f40c57de7b012bcabb 100644 (file)
--- a/course/report/log/live.php
+++ b/course/report/log/live.php
@@ -14,7 +14,7 @@
     require_login($course);
 
     $context = get_context_instance(CONTEXT_COURSE, $course->id);
-    require_capability('coursereport/log:view', $context);
+    require_capability('coursereport/log:viewlive', $context);
 
     add_to_log($course->id, "course", "report live", "report/log/live.php?id=$course->id", $course->id); 
 

diff --git a/course/report/log/mod.php b/course/report/log/mod.php
index a3eff2b78010a5b47ad724351dec50b8c2976b1d..970253b84c18841e59ebce5dcb4eeaf95349f7c1 100644 (file)
--- a/course/report/log/mod.php
+++ b/course/report/log/mod.php
@@ -11,7 +11,9 @@
         print_heading(get_string('chooselogs') .':');
 
         print_log_selector_form($course);
+    }
 
+    if (has_capability('coursereport/log:viewlive', $context)) {
         print_heading(get_string('chooselivelogs') .':');
         echo '<p>';
         link_to_popup_window('/course/report/log/live.php?id='. $course->id,'livelog', get_string('livelogs'), 500, 800);

diff --git a/course/report/log/version.php b/course/report/log/version.php
index c62920f9d7c3b16beef80cb5ecdda5b699bf041e..702efd5e035e4e291a44dac8f11c80c2c404a865 100644 (file)
--- a/course/report/log/version.php
+++ b/course/report/log/version.php
@@ -23,7 +23,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-$plugin->version  = 2007101500;
+$plugin->version  = 2007101502;
 $plugin->requires = 2007101532;
 
 ?>

diff --git a/lang/en_utf8/coursereport_log.php b/lang/en_utf8/coursereport_log.php
index 6b1de3371238a697c30fb820d79e97802e5913ce..721454522e09872781f4ed3b6a7109efdb695e67 100644 (file)
--- a/lang/en_utf8/coursereport_log.php
+++ b/lang/en_utf8/coursereport_log.php
@@ -1,5 +1,8 @@
 <?PHP // $Id$
 
 $string['log:view'] = 'View course logs';
+$string['log:viewlive'] = 'View live logs';
+
+$string['loglive'] = 'Live logs';
 
 ?>

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 90194a67345529b77db279ce5f6109d8b6c95014..186824e851f11053180daf678fd420f3c29a4812 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2389,7 +2389,8 @@ body#course-info .generalbox.info {
   margin-right:5px;
 }
 
-#course-report-log-index .info {
+#course-report-log-index .info,
+#course-report-log-indexlive .info {
   margin-left:auto;
   margin-right:auto;
   text-align:center;

diff --git a/version.php b/version.php
index 466df6e87ae3f6264173136c212e238356543966..9add45692ad50c8cf2b0c4dee99003a4aafdd6e8 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2008112900;  // YYYYMMDD   = date of the last version bump
+    $version = 2008112901;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20081128)';  // Human-friendly version name