Some old fixes for whitespaces etc (coding style)

diff --git a/mod/forum/user.php b/mod/forum/user.php
index fadcc41fecd458a0d764e20f65665d7752e0e47b..436fd71e8b9e558f2e70f145ef89d013ef2e3d21 100644 (file)
--- a/mod/forum/user.php
+++ b/mod/forum/user.php
@@ -2,178 +2,179 @@
 
 // Display user activity reports for a course
 
-    require_once('../../config.php');
-    require_once('lib.php');
-    // Course ID
-    $course  = required_param('course', PARAM_INT);
-    // User ID
-    $id      = optional_param('id', 0, PARAM_INT);
-    $mode    = optional_param('mode', 'posts', PARAM_ALPHA);
-    $page    = optional_param('page', 0, PARAM_INT);
-    $perpage = optional_param('perpage', 5, PARAM_INT);
-
-    if (empty($id)) {         // See your own profile by default
-        require_login();
-        $id = $USER->id;
-    }
-
-    if (! $user = $DB->get_record("user", array("id" => $id))) {
-        print_error('invaliduserid');
-    }
-
-    if (! $course = $DB->get_record("course", array("id" => $course))) {
-        print_error('invalidcourseid');
-    }
-
-    $syscontext = get_context_instance(CONTEXT_SYSTEM);
-    $usercontext   = get_context_instance(CONTEXT_USER, $id);
-
-    // do not force parents to enrol
-    if (!$DB->get_record('role_assignments', array('userid' => $USER->id, 'contextid' => $usercontext->id))) {
-        require_course_login($course);
-    }
+require_once('../../config.php');
+require_once('lib.php');
+
+// Course ID
+$course  = required_param('course', PARAM_INT);
+// User ID
+$id      = optional_param('id', 0, PARAM_INT);
+$mode    = optional_param('mode', 'posts', PARAM_ALPHA);
+$page    = optional_param('page', 0, PARAM_INT);
+$perpage = optional_param('perpage', 5, PARAM_INT);
+
+if (empty($id)) {         // See your own profile by default
+    require_login();
+    $id = $USER->id;
+}
+
+if (! $user = $DB->get_record("user", array("id" => $id))) {
+    print_error('invaliduserid');
+}
+
+if (! $course = $DB->get_record("course", array("id" => $course))) {
+    print_error('invalidcourseid');
+}
+
+$syscontext = get_context_instance(CONTEXT_SYSTEM);
+$usercontext   = get_context_instance(CONTEXT_USER, $id);
+
+// do not force parents to enrol
+if (!$DB->get_record('role_assignments', array('userid' => $USER->id, 'contextid' => $usercontext->id))) {
+    require_course_login($course);
+}
+
+if ($user->deleted) {
+    print_header();
+    print_heading(get_string('userdeleted'));
+    print_footer($course);
+    die;
+}
 
-    if ($user->deleted) {
-        print_header();
-        print_heading(get_string('userdeleted'));
-        print_footer($course);
-        die;
-    }
+add_to_log($course->id, "forum", "user report",
+        "user.php?course=$course->id&id=$user->id&mode=$mode", "$user->id");
 
-    add_to_log($course->id, "forum", "user report",
-            "user.php?course=$course->id&id=$user->id&mode=$mode", "$user->id");
+$strforumposts   = get_string('forumposts', 'forum');
+$strparticipants = get_string('participants');
+$strmode         = get_string($mode, 'forum');
+$fullname        = fullname($user, has_capability('moodle/site:viewfullnames', $syscontext));
 
-    $strforumposts   = get_string('forumposts', 'forum');
-    $strparticipants = get_string('participants');
-    $strmode         = get_string($mode, 'forum');
-    $fullname        = fullname($user, has_capability('moodle/site:viewfullnames', $syscontext));
+$navlinks = array();
+if (has_capability('moodle/course:viewparticipants', get_context_instance(CONTEXT_COURSE, $course->id)) || has_capability('moodle/site:viewparticipants', $syscontext)) {
+    $navlinks[] = array('name' => $strparticipants, 'link' => "$CFG->wwwroot/user/index.php?id=$course->id", 'type' => 'core');
+}
+$navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id", 'type' => 'title');
+$navlinks[] = array('name' => $strforumposts, 'link' => '', 'type' => 'title');
+$navlinks[] = array('name' => $strmode, 'link' => '', 'type' => 'title');
 
-    $navlinks = array();
-    if (has_capability('moodle/course:viewparticipants', get_context_instance(CONTEXT_COURSE, $course->id)) || has_capability('moodle/site:viewparticipants', $syscontext)) {
-        $navlinks[] = array('name' => $strparticipants, 'link' => "$CFG->wwwroot/user/index.php?id=$course->id", 'type' => 'core');
-    }
-    $navlinks[] = array('name' => $fullname, 'link' => "$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id", 'type' => 'title');
-    $navlinks[] = array('name' => $strforumposts, 'link' => '', 'type' => 'title');
-    $navlinks[] = array('name' => $strmode, 'link' => '', 'type' => 'title');
+$navigation = build_navigation($navlinks);
 
-    $navigation = build_navigation($navlinks);
+print_header("$course->shortname: $fullname: $strmode", $course->fullname,$navigation);
 
-    print_header("$course->shortname: $fullname: $strmode", $course->fullname,$navigation);
 
+$currenttab = $mode;
+$showroles = 1;
+require($CFG->dirroot.'/user/tabs.php');   /// Prints out tabs as part of user page
 
-    $currenttab = $mode;
-    $showroles = 1;
-    include($CFG->dirroot.'/user/tabs.php');   /// Prints out tabs as part of user page
 
+switch ($mode) {
+    case 'posts' :
+        $searchterms = array('userid:'.$user->id);
+        $extrasql = '';
+        break;
 
-    switch ($mode) {
-        case 'posts' :
-            $searchterms = array('userid:'.$user->id);
-            $extrasql = '';
-            break;
+    default:
+        $searchterms = array('userid:'.$user->id);
+        $extrasql = 'AND p.parent = 0';
+        break;
+}
 
-        default:
-            $searchterms = array('userid:'.$user->id);
-            $extrasql = 'AND p.parent = 0';
-            break;
-    }
+echo '<div class="user-content">';
 
-    echo '<div class="user-content">';
-
-    if ($course->id == SITEID) {
-        if (empty($CFG->forceloginforprofiles) || isloggedin()) {
-            // Search throughout the whole site.
-            $searchcourse = 0;
-        } else {
-            $searchcourse = SITEID;
-        }
+if ($course->id == SITEID) {
+    if (empty($CFG->forceloginforprofiles) || isloggedin()) {
+        // Search throughout the whole site.
+        $searchcourse = 0;
     } else {
-        // Search only for posts the user made in this course.
-        $searchcourse = $course->id;
+        $searchcourse = SITEID;
     }
+} else {
+    // Search only for posts the user made in this course.
+    $searchcourse = $course->id;
+}
 
-    // Get the posts.
-    if ($posts = forum_search_posts($searchterms, $searchcourse, $page*$perpage, $perpage,
-                                    $totalcount, $extrasql)) {
+// Get the posts.
+if ($posts = forum_search_posts($searchterms, $searchcourse, $page*$perpage, $perpage,
+            $totalcount, $extrasql)) {
 
-        print_paging_bar($totalcount, $page, $perpage,
-                         "user.php?id=$user->id&amp;course=$course->id&amp;mode=$mode&amp;perpage=$perpage&amp;");
+    print_paging_bar($totalcount, $page, $perpage,
+            "user.php?id=$user->id&amp;course=$course->id&amp;mode=$mode&amp;perpage=$perpage&amp;");
 
-        $discussions = array();
-        $forums      = array();
-        $cms         = array();
+    $discussions = array();
+    $forums      = array();
+    $cms         = array();
 
-        foreach ($posts as $post) {
+    foreach ($posts as $post) {
 
-            if (!isset($discussions[$post->discussion])) {
-                if (! $discussion = $DB->get_record('forum_discussions', array('id' => $post->discussion))) {
-                    print_error('invaliddiscussionid', 'forum');
-                }
-                $discussions[$post->discussion] = $discussion;
-            } else {
-                $discussion = $discussions[$post->discussion];
+        if (!isset($discussions[$post->discussion])) {
+            if (! $discussion = $DB->get_record('forum_discussions', array('id' => $post->discussion))) {
+                print_error('invaliddiscussionid', 'forum');
             }
+            $discussions[$post->discussion] = $discussion;
+        } else {
+            $discussion = $discussions[$post->discussion];
+        }
 
-            if (!isset($forums[$discussion->forum])) {
-                if (! $forum = $DB->get_record('forum', array('id' => $discussion->forum))) {
-                    print_error('invalidforumid', 'forum');
-                }
-                $forums[$discussion->forum] = $forum;
-            } else {
-                $forum = $forums[$discussion->forum];
+        if (!isset($forums[$discussion->forum])) {
+            if (! $forum = $DB->get_record('forum', array('id' => $discussion->forum))) {
+                print_error('invalidforumid', 'forum');
             }
+            $forums[$discussion->forum] = $forum;
+        } else {
+            $forum = $forums[$discussion->forum];
+        }
 
-            $ratings = null;
-            if ($forum->assessed) {
-                if ($scale = make_grades_menu($forum->scale)) {
-                    $ratings =new object();
-                    $ratings->scale = $scale;
-                    $ratings->assesstimestart = $forum->assesstimestart;
-                    $ratings->assesstimefinish = $forum->assesstimefinish;
-                    $ratings->allow = false;
-                }
+        $ratings = null;
+        if ($forum->assessed) {
+            if ($scale = make_grades_menu($forum->scale)) {
+                $ratings =new object();
+                $ratings->scale = $scale;
+                $ratings->assesstimestart = $forum->assesstimestart;
+                $ratings->assesstimefinish = $forum->assesstimefinish;
+                $ratings->allow = false;
             }
+        }
 
-            if (!isset($cms[$forum->id])) {
-                if (!$cm = get_coursemodule_from_instance('forum', $forum->id)) {
-                    print_error('invalidcoursemodule');
-                }
-                $cms[$forum->id] = $cm;
-                unset($cm); // do not use cm directly, it would break caching
+        if (!isset($cms[$forum->id])) {
+            if (!$cm = get_coursemodule_from_instance('forum', $forum->id)) {
+                print_error('invalidcoursemodule');
             }
+            $cms[$forum->id] = $cm;
+            unset($cm); // do not use cm directly, it would break caching
+        }
 
-            $fullsubject = "<a href=\"view.php?f=$forum->id\">".format_string($forum->name,true)."</a>";
-            if ($forum->type != 'single') {
-                $fullsubject .= " -> <a href=\"discuss.php?d=$discussion->id\">".format_string($discussion->name,true)."</a>";
-                if ($post->parent != 0) {
-                    $fullsubject .= " -> <a href=\"discuss.php?d=$post->discussion&amp;parent=$post->id\">".format_string($post->subject,true)."</a>";
-                }
+        $fullsubject = "<a href=\"view.php?f=$forum->id\">".format_string($forum->name,true)."</a>";
+        if ($forum->type != 'single') {
+            $fullsubject .= " -> <a href=\"discuss.php?d=$discussion->id\">".format_string($discussion->name,true)."</a>";
+            if ($post->parent != 0) {
+                $fullsubject .= " -> <a href=\"discuss.php?d=$post->discussion&amp;parent=$post->id\">".format_string($post->subject,true)."</a>";
             }
+        }
 
-            if ($course->id == SITEID && has_capability('moodle/site:config', $syscontext)) {
-                $postcoursename = $DB->get_field('course', array('shortname' => 'id'), $forum->course);
-                $fullsubject = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$forum->course.'">'.$postcoursename.'</a> -> '. $fullsubject;
-            }
+        if ($course->id == SITEID && has_capability('moodle/site:config', $syscontext)) {
+            $postcoursename = $DB->get_field('course', array('shortname' => 'id'), $forum->course);
+            $fullsubject = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$forum->course.'">'.$postcoursename.'</a> -> '. $fullsubject;
+        }
 
-            $post->subject = $fullsubject;
+        $post->subject = $fullsubject;
 
-            $fulllink = "<a href=\"discuss.php?d=$post->discussion#p$post->id\">".
-                         get_string("postincontext", "forum")."</a>";
+        $fulllink = "<a href=\"discuss.php?d=$post->discussion#p$post->id\">".
+            get_string("postincontext", "forum")."</a>";
 
-            forum_print_post($post, $discussion, $forum, $cms[$forum->id], $course, false, false, false, $ratings, $fulllink);
-            echo "<br />";
-        }
+        forum_print_post($post, $discussion, $forum, $cms[$forum->id], $course, false, false, false, $ratings, $fulllink);
+        echo "<br />";
+    }
 
-        print_paging_bar($totalcount, $page, $perpage,
-                         "user.php?id=$user->id&amp;course=$course->id&amp;mode=$mode&amp;perpage=$perpage&amp;");
+    print_paging_bar($totalcount, $page, $perpage,
+            "user.php?id=$user->id&amp;course=$course->id&amp;mode=$mode&amp;perpage=$perpage&amp;");
+} else {
+    if ($mode == 'posts') {
+        print_heading(get_string('noposts', 'forum'));
     } else {
-        if ($mode == 'posts') {
-            print_heading(get_string('noposts', 'forum'));
-        } else {
-            print_heading(get_string('nodiscussionsstartedby', 'forum'));
-        }
+        print_heading(get_string('nodiscussionsstartedby', 'forum'));
     }
-    echo '</div>';
-    print_footer($course);
+}
+echo '</div>';
+print_footer($course);
 
 ?>