Just cleaning up layout a little

diff --git a/repository/manage_instances.php b/repository/manage_instances.php
index 9cf361b976fee8439bf852c1879148e5957be1db..44fc8b65a1821c15e8f500f9ef311b48c4a8bfce 100644 (file)
--- a/repository/manage_instances.php
+++ b/repository/manage_instances.php
@@ -1,182 +1,179 @@
-<?php
-// $Id$
-require_once(dirname(dirname(__FILE__)) . '/config.php');
-require_once($CFG->dirroot . '/repository/lib.php');
-//require_once($CFG->libdir . '/adminlib.php');
-
-// id of repository
-$edit    = optional_param('edit', 0, PARAM_INT);
-$new     = optional_param('new', '', PARAM_FORMAT);
-$delete  = optional_param('delete', 0, PARAM_INT);
-$sure    = optional_param('sure', '', PARAM_ALPHA);
-$contextid = optional_param('contextid', 0, PARAM_INT);
-//$userid = optional_param('userid', 0, PARAM_INT);
-$display = true; // fall through to normal display
-
-if ($edit){
-    $pagename = 'repositoryinstanceedit';
-}else if ($delete) {
-    $pagename = 'repositorydelete';
-} else if ($new) {
-    $pagename = 'repositoryinstancenew';
-}
-else {
-    $pagename = 'repositorylist';
-}
-
-require_login(SITEID, false);
-
-$context = get_context_instance_by_id($contextid);
-
-//security: detect if we are in a course context
-if ($context->contextlevel == CONTEXT_COURSE) {
-    $pagename = get_string("repositorycourse",'repository');
-
-    //is the user is allowed to edit this course, he's allowed to edit list of repository instances
-    require_capability('moodle/course:update',  $context);
-    //retrieve course
-    //Retrieve the course object
-    if ( !$course = $DB->get_record('course', array('id'=>$context->instanceid))) {
-        print_error('invalidcourseid');
-    }
-}
-else {
-    $pagename = get_string("personalrepositories",'repository');
-     //is the user looking at its own repository instances
-    if ($USER->id != $context->instanceid){
-        print_error('notyourinstances', 'repository');
+<?php  // $Id$
+
+    require_once(dirname(dirname(__FILE__)) . '/config.php');
+    require_once($CFG->dirroot . '/repository/lib.php');
+    //require_once($CFG->libdir . '/adminlib.php');
+
+    $edit    = optional_param('edit', 0, PARAM_INT);        // Repository ID
+    $new     = optional_param('new', '', PARAM_FORMAT);
+    $delete  = optional_param('delete', 0, PARAM_INT);
+    $sure    = optional_param('sure', '', PARAM_ALPHA);
+    $contextid = optional_param('contextid', 0, PARAM_INT);
+
+    $display = true; // fall through to normal display
+
+    if ($edit){
+        $pagename = 'repositoryinstanceedit';
+    } else if ($delete) {
+        $pagename = 'repositorydelete';
+    } else if ($new) {
+        $pagename = 'repositoryinstancenew';
+    } else {
+        $pagename = 'repositorylist';
     }
-    if ($context->contextlevel != CONTEXT_USER){
-        print_error('wrongcontext', 'repository');
+
+    require_login(SITEID, false);
+
+    $context = get_context_instance_by_id($contextid);
+
+/// Security: make sure we're allowed to do this operation
+    if ($context->contextlevel == CONTEXT_COURSE) {
+        $pagename = get_string("repositorycourse",'repository');
+
+        // If the user is allowed to edit this course, he's allowed to edit list of repository instances
+        require_capability('moodle/course:update',  $context);
+
+        if ( !$course = $DB->get_record('course', array('id'=>$context->instanceid))) {
+            print_error('invalidcourseid');
+        }
+
+    } else if ($context->contextlevel == CONTEXT_USER) {
+        $pagename = get_string("personalrepositories",'repository');
+        //is the user looking at its own repository instances
+        if ($USER->id != $context->instanceid){
+            print_error('notyourinstances', 'repository');
+        }
+        $user = $USER;
+
+    } else {
+        // throw an error here
+        exit;
     }
-     $user = $USER;
-}
-
-$baseurl    = $CFG->wwwroot . '/repository/manage_instances.php?contextid=' . $contextid . '&amp;sesskey='. sesskey();
-
-//security: we cannot perform any action if the type is not visible
-if (!empty($new)){
-    $type = repository_get_type_by_typename($new);
-} else if (!empty($edit)){
-    $instance = repository_get_instance($edit);
-    $type = repository_get_type_by_id($instance->typeid);
-} else if (!empty($delete)){
-    $instance = repository_get_instance($delete);
-    $type = repository_get_type_by_id($instance->typeid);
-}
-if (isset($type) && !$type->get_visible()) {
-    print_error('typenotvisible', 'repository', $baseurl);
-}
-
-
-
-//Create header crumbtrail
-//$streditrepositoryaccount = get_string("editrepositoryinstance",'repository');
-$navlinks = array();
-if (!empty($course)) {
-    $navlinks[] = array('name' => $course->shortname,
-                        'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
-                        'type' => 'misc');
-    $navlinks[] = array('name' => $pagename,
-                        'link' => null,
-                        'type' => 'misc');    
-    $fullname = $course->fullname;
-}
-else {
-    $fullname = fullname($user);
-    $strrepos = get_string('repositories', 'repository');
-    $navlinks[] = array('name' => $fullname, 'link' => $CFG->wwwroot . '/user/view.php?id=' . $user->id, 'type' => 'misc');
-    $navlinks[] = array('name' => $strrepos, 'link' => null, 'type' => 'misc');
-}
-
-$title = $pagename;
-$navigation = build_navigation($navlinks);
-
-//display page header
-print_header($title, $fullname, $navigation);
-print_heading($pagename);
-
-$return = true;
-
-if (!empty($edit) || !empty($new)) {
-    if (!empty($edit)) {
+
+    $baseurl = $CFG->wwwroot . '/repository/manage_instances.php?contextid=' . $contextid . '&amp;sesskey='. sesskey();
+
+
+/// Security: we cannot perform any action if the type is not visible
+    if (!empty($new)){
+        $type = repository_get_type_by_typename($new);
+    } else if (!empty($edit)){
         $instance = repository_get_instance($edit);
-        $instancetype = repository_get_type_by_id($instance->typeid);
-        $classname = 'repository_' . $instancetype->get_typename();
-        $configs  = $instance->get_instance_option_names();
-        $plugin = $instancetype->get_typename();
-        $typeid = $instance->typeid;
+        $type = repository_get_type_by_id($instance->typeid);
+    } else if (!empty($delete)){
+        $instance = repository_get_instance($delete);
+        $type = repository_get_type_by_id($instance->typeid);
+    }
+    if (isset($type) && !$type->get_visible()) {
+        print_error('typenotvisible', 'repository', $baseurl);
+    }
+
+
+/// Create navigation links
+    $navlinks = array();
+    if (!empty($course)) {
+        $navlinks[] = array('name' => $course->shortname,
+                'link' => "$CFG->wwwroot/course/view.php?id=$course->id",
+                'type' => 'misc');
+        $navlinks[] = array('name' => $pagename,
+                'link' => null,
+                'type' => 'misc');    
+        $fullname = $course->fullname;
     } else {
-        $plugin = $new;
-        $typeid = $new;
-        $instance = null;
+        $fullname = fullname($user);
+        $strrepos = get_string('repositories', 'repository');
+        $navlinks[] = array('name' => $fullname, 'link' => $CFG->wwwroot . '/user/view.php?id=' . $user->id, 'type' => 'misc');
+        $navlinks[] = array('name' => $strrepos, 'link' => null, 'type' => 'misc');
     }
 
-    // create edit form for this instance
-    $mform = new repository_instance_form('', array('plugin' => $plugin, 'typeid' => $typeid,'instance' => $instance, 'contextid' => $contextid));
-    // end setup, begin output
+    $title = $pagename;
+    $navigation = build_navigation($navlinks);
 
-    if ($mform->is_cancelled()){
-        redirect($baseurl);
-        exit;
-    } else if ($fromform = $mform->get_data()){
-        if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', '', $baseurl);
+
+/// Display page header
+    print_header($title, $fullname, $navigation);
+    print_heading($pagename);
+
+    $return = true;
+
+    if (!empty($edit) || !empty($new)) {
+        if (!empty($edit)) {
+            $instance = repository_get_instance($edit);
+            $instancetype = repository_get_type_by_id($instance->typeid);
+            $classname = 'repository_' . $instancetype->get_typename();
+            $configs  = $instance->get_instance_option_names();
+            $plugin = $instancetype->get_typename();
+            $typeid = $instance->typeid;
+        } else {
+            $plugin = $new;
+            $typeid = $new;
+            $instance = null;
         }
-        if ($edit) {
-            $settings = array();
-            $settings['name'] = $fromform->name;
-            foreach($configs as $config) {
-                $settings[$config] = $fromform->$config;
+
+    /// Create edit form for this instance
+        $mform = new repository_instance_form('', array('plugin' => $plugin, 'typeid' => $typeid,'instance' => $instance, 'contextid' => $contextid));
+
+    /// Process the form data if any, or display
+        if ($mform->is_cancelled()){
+            redirect($baseurl);
+            exit;
+
+        } else if ($fromform = $mform->get_data()){
+            if (!confirm_sesskey()) {
+                print_error('confirmsesskeybad', '', $baseurl);
             }
-            $success = $instance->set_option($settings);
-        } else {
-            $success = repository_static_function($plugin, 'create', $plugin, 0, get_context_instance_by_id($contextid), $fromform);
-            $data = data_submitted();
+            if ($edit) {
+                $settings = array();
+                $settings['name'] = $fromform->name;
+                foreach($configs as $config) {
+                    $settings[$config] = $fromform->$config;
+                }
+                $success = $instance->set_option($settings);
+            } else {
+                $success = repository_static_function($plugin, 'create', $plugin, 0, get_context_instance_by_id($contextid), $fromform);
+                $data = data_submitted();
+            }
+            if ($success) {
+                $savedstr = get_string('configsaved', 'repository');
+                //admin_externalpage_print_header();
+                print_heading($savedstr);
+                redirect($baseurl, $savedstr, 3);
+            } else {
+                print_error('instancenotsaved', 'repository', $baseurl);
+            }
+            exit;
+        } else {     // Display the form
+            // admin_externalpage_print_header();
+            print_heading(get_string('configplugin', 'repository_'.$plugin));
+            print_simple_box_start();
+            $mform->display();
+            print_simple_box_end();
+            $return = false;
         }
-        if ($success) {
-            $savedstr = get_string('configsaved', 'repository');
-            //admin_externalpage_print_header();
-            print_heading($savedstr);
-            redirect($baseurl, $savedstr, 3);
-        } else {
-            print_error('instancenotsaved', 'repository', $baseurl);
+    } else if (!empty($delete)) {
+        // admin_externalpage_print_header();
+        $instance = repository_get_instance($delete);
+        if ($sure) {
+            if (!confirm_sesskey()) {
+                print_error('confirmsesskeybad', '', $baseurl);
+            }
+            if ($instance->delete()) {
+                $deletedstr = get_string('instancedeleted', 'repository');
+                print_heading($deletedstr);
+                redirect($baseurl, $deletedstr, 3);
+            } else {
+                print_error('instancenotdeleted', 'repository', $baseurl);
+            }
+            exit;
         }
-        exit;
+        notice_yesno(get_string('confirmdelete', 'repository', $instance->name), $baseurl . '&amp;delete=' . $delete . '&amp;sure=yes', $baseurl);
+        $return = false;
     } else {
-       // admin_externalpage_print_header();
-        print_heading(get_string('configplugin', 'repository_'.$plugin));
-        print_simple_box_start();
-        $mform->display();
-        print_simple_box_end();
+        repository_display_instances_list($context);
         $return = false;
     }
-} else if (!empty($delete)) {
-   // admin_externalpage_print_header();
-    $instance = repository_get_instance($delete);
-    if ($sure) {
-        if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', '', $baseurl);
-        }
-        if ($instance->delete()) {
-            $deletedstr = get_string('instancedeleted', 'repository');
-            print_heading($deletedstr);
-            redirect($baseurl, $deletedstr, 3);
-        } else {
-            print_error('instancenotdeleted', 'repository', $baseurl);
-        }
-        exit;
+
+    if (!empty($return)) {
+        redirect($baseurl);
     }
-    notice_yesno(get_string('confirmdelete', 'repository', $instance->name), $baseurl . '&amp;delete=' . $delete . '&amp;sure=yes', $baseurl);
-    $return = false;
-} else {
-    repository_display_instances_list($context);
-    $return = false;
-}
-
-if (!empty($return)) {
-    redirect($baseurl);
-}
-
-//display page footer
-print_footer($course);
\ No newline at end of file
+
+    print_footer($course);