MDL-23182 - Removed use of tabs. Added in PAGE functions and paramete…

…rs so that nav menu will appear properly. Changed use of 'course' parameter to 'courseid' parameter to be more accurate.
safatshahin · Jul 12, 2010 · f601756 · f601756
1 parent 91b99e8
commit f601756
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 22 deletions.
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
@@ -3134,8 +3134,28 @@ protected function generate_user_settings($courseid, $userid, $gstitle='usercurr
             require_once($CFG->libdir . '/portfoliolib.php');
             if (portfolio_instances(true, false)) {
                 $portfolio = $usersetting->add(get_string('portfolios', 'portfolio'), null, self::TYPE_SETTING);
-                $portfolio->add(get_string('configure', 'portfolio'), new moodle_url('/user/portfolio.php'), self::TYPE_SETTING);
-                $portfolio->add(get_string('logs', 'portfolio'), new moodle_url('/user/portfoliologs.php'), self::TYPE_SETTING);
+
+                $config  = optional_param('config', 0, PARAM_INT);
+                $hide    = optional_param('hide', 0, PARAM_INT);
+                $url = new moodle_url('/user/portfolio.php', array('courseid'=>$course->id));
+                if ($hide !== 0) {
+                    $url->param('hide', $hide);
+                }
+                if ($config !== 0) {
+                    $url->param('config', $config);
+                }
+                $portfolio->add(get_string('configure', 'portfolio'), $url, self::TYPE_SETTING);
+
+                $page = optional_param('page', 0, PARAM_INT);
+                $perpage = optional_param('perpage', 10, PARAM_INT);
+                $url = new moodle_url('/user/portfoliologs.php', array('courseid'=>$course->id));
+                if ($page !== 0) {
+                    $url->param('page', $page);
+                }
+                if ($perpage !== 0) {
+                    $url->param('perpage', $perpage);
+                }
+                $portfolio->add(get_string('logs', 'portfolio'), $url, self::TYPE_SETTING);
             }
         }
 

diff --git a/user/portfolio.php b/user/portfolio.php
@@ -32,20 +32,18 @@
 require_once($CFG->libdir . '/portfoliolib.php');
 require_once($CFG->libdir . '/portfolio/forms.php');
 
-$config = optional_param('config', 0, PARAM_INT);
-$hide = optional_param('hide', 0, PARAM_INT);
-$course  = optional_param('course', SITEID, PARAM_INT);
+$config   = optional_param('config', 0, PARAM_INT);
+$hide     = optional_param('hide', 0, PARAM_INT);
+$courseid = optional_param('courseid', SITEID, PARAM_INT);
 
-$url = new moodle_url('/user/portfolio.php', array('course'=>$course));
+$url = new moodle_url('/user/portfolio.php', array('courseid'=>$courseid));
 if ($hide !== 0) {
     $url->param('hide', $hide);
 }
 if ($config !== 0) {
     $url->param('config', $config);
 }
-$PAGE->set_url($url);
-
-if (! $course = $DB->get_record("course", array("id"=>$course))) {
+if (! $course = $DB->get_record("course", array("id"=>$courseid))) {
     print_error('invalidcourseid');
 }
 
@@ -61,10 +59,14 @@
 
 require_login($course, false);
 
+$PAGE->set_url($url);
+$PAGE->set_context(get_system_context());
+$PAGE->set_title("$course->fullname: $fullname: $strportfolios");
+$PAGE->set_heading($course->fullname);
+$PAGE->set_pagelayout('standard');
+
 echo $OUTPUT->header();
-$currenttab = 'portfolioconf';
 $showroles = 1;
-include('tabs.php');
 
 if (!empty($config)) {
     $instance = portfolio_instance($config);

diff --git a/user/portfoliologs.php b/user/portfoliologs.php
@@ -31,40 +31,39 @@
 
 require_once($CFG->libdir . '/portfoliolib.php');
 
-$course  = optional_param('course', SITEID, PARAM_INT);
+$courseid = optional_param('courseid', SITEID, PARAM_INT);
+$page     = optional_param('page', 0, PARAM_INT);
+$perpage  = optional_param('perpage', 10, PARAM_INT);
 
-$url = new moodle_url('/user/portfoliologs.php', array('course'=>$course));
-
-if (! $course = $DB->get_record("course", array("id"=>$course))) {
+if (! $course = $DB->get_record("course", array("id"=>$courseid))) {
     print_error('invalidcourseid');
 }
 
+require_login($course, false);
+
 $user = $USER;
 $fullname = fullname($user);
 $strportfolios = get_string('portfolios', 'portfolio');
 
-require_login($course, false);
-
-$page = optional_param('page', 0, PARAM_INT);
-$perpage = optional_param('perpage', 10, PARAM_INT);
+$url = new moodle_url('/user/portfoliologs.php', array('courseid'=>$courseid));
 
 if ($page !== 0) {
     $url->param('page', $page);
 }
 if ($perpage !== 0) {
     $url->param('perpage', $perpage);
 }
-$PAGE->set_url($url);
 
+$PAGE->set_url($url);
 $PAGE->set_title("$course->fullname: $fullname: $strportfolios");
 $PAGE->set_heading($course->fullname);
+$PAGE->set_context(get_system_context());
+$PAGE->set_pagelayout('standard');
 
 echo $OUTPUT->header();
 
-$currenttab = 'portfoliologs';
 $showroles = 1;
 $somethingprinted = false;
-include('tabs.php');
 
 echo $OUTPUT->box_start();