From: samhemelryk <samhemelryk>
Date: Thu, 24 Sep 2009 07:51:37 +0000 (+0000)
Subject: mod-label MDL-19799 Added set_url calls, replaced deprecated functions
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e2dbe3e8a96fce2f4a12c2ebf3548675851a96cd;p=moodle.git

mod-label MDL-19799 Added set_url calls, replaced deprecated functions
---

diff --git a/mod/imscp/view.php b/mod/imscp/view.php
index 80cfaa94c1..6a0d55528c 100644
--- a/mod/imscp/view.php
+++ b/mod/imscp/view.php
@@ -68,7 +68,7 @@ $PAGE->set_generaltype('topframe');
 $PAGE->set_title($course->shortname.': '.$imscp->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_activity_record($imscp);
-$PAGE->set_button(update_module_button($cm->id, '', get_string('modulename', 'imscp')));
+$PAGE->set_button($OUTPUT->update_module_button($cm->id, 'imscp'));
 echo $OUTPUT->header();
 
 // verify imsmanifest was parsed properly
diff --git a/mod/label/index.php b/mod/label/index.php
index 52311c3ce8..04f5723e8e 100644
--- a/mod/label/index.php
+++ b/mod/label/index.php
@@ -1,10 +1,12 @@
-<?php // $Id$
+<?php
 
-    require_once("../../config.php");
-    require_once("lib.php");
+require_once("../../config.php");
+require_once("lib.php");
 
-    $id = required_param('id',PARAM_INT);   // course
+$id = required_param('id',PARAM_INT);   // course
 
-    redirect("$CFG->wwwroot/course/view.php?id=$id");
+$PAGE->set_url(new moodle_url($CFG->wwwroot.'/mod/label/index.php', array('id'=>$id)));
+
+redirect("$CFG->wwwroot/course/view.php?id=$id");
 
 ?>
diff --git a/mod/label/view.php b/mod/label/view.php
index b4b660f0b8..7eb6d01e31 100644
--- a/mod/label/view.php
+++ b/mod/label/view.php
@@ -1,37 +1,39 @@
-<?php  // $Id$
-
-    require_once("../../config.php");
-
-    $id = optional_param('id',0,PARAM_INT);    // Course Module ID, or
-    $l = optional_param('l',0,PARAM_INT);     // Label ID
-
-    if ($id) {
-        if (! $cm = get_coursemodule_from_id('label', $id)) {
-            print_error('invalidcoursemodule');
-        }
-    
-        if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
-            print_error('coursemisconf');
-        }
-    
-        if (! $label = $DB->get_record("label", array("id"=>$cm->instance))) {
-            print_error('invalidcoursemodule');
-        }
-
-    } else {
-        if (! $label = $DB->get_record("label", array("id"=>$l))) {
-            print_error('invalidcoursemodule');
-        }
-        if (! $course = $DB->get_record("course", array("id"=>$label->course)) ){
-            print_error('coursemisconf');
-        }
-        if (! $cm = get_coursemodule_from_instance("label", $label->id, $course->id)) {
-            print_error('invalidcoursemodule');
-        }
+<?php
+
+require_once("../../config.php");
+
+$id = optional_param('id',0,PARAM_INT);    // Course Module ID, or
+$l = optional_param('l',0,PARAM_INT);     // Label ID
+
+if ($id) {
+    $PAGE->set_url(new moodle_url($CFG->wwwroot.'/mod/label/index.php', array('id'=>$id)));
+    if (! $cm = get_coursemodule_from_id('label', $id)) {
+        print_error('invalidcoursemodule');
+    }
+
+    if (! $course = $DB->get_record("course", array("id"=>$cm->course))) {
+        print_error('coursemisconf');
+    }
+
+    if (! $label = $DB->get_record("label", array("id"=>$cm->instance))) {
+        print_error('invalidcoursemodule');
+    }
+
+} else {
+    $PAGE->set_url(new moodle_url($CFG->wwwroot.'/mod/label/index.php', array('l'=>$l)));
+    if (! $label = $DB->get_record("label", array("id"=>$l))) {
+        print_error('invalidcoursemodule');
+    }
+    if (! $course = $DB->get_record("course", array("id"=>$label->course)) ){
+        print_error('coursemisconf');
+    }
+    if (! $cm = get_coursemodule_from_instance("label", $label->id, $course->id)) {
+        print_error('invalidcoursemodule');
     }
+}
 
-    require_login($course, true, $cm);
+require_login($course, true, $cm);
 
-    redirect("$CFG->wwwroot/course/view.php?id=$course->id");
+redirect("$CFG->wwwroot/course/view.php?id=$course->id");
 
 ?>