diff --git a/course/category.php b/course/category.php index 32430f9..b676a26 100644 --- a/course/category.php +++ b/course/category.php @@ -256,8 +256,7 @@ if (has_capability('moodle/category:create', $context)) { // Print button for creating new categories unset($options); - $options['categoryadd'] = 1; - $options['id'] = $id; + $options['parent'] = $id; print_single_button('editcategory.php', $options, get_string('addsubcategory'), 'get'); } echo ''; diff --git a/course/editcategory.php b/course/editcategory.php index cc687da..63befe8 100644 --- a/course/editcategory.php +++ b/course/editcategory.php @@ -1,80 +1,86 @@ coursesperpage, PARAM_INT); // how many per page -$hide = optional_param('hide', 0, PARAM_INT); -$show = optional_param('show', 0, PARAM_INT); -$moveup = optional_param('moveup', 0, PARAM_INT); -$movedown = optional_param('movedown', 0, PARAM_INT); -$moveto = optional_param('moveto', 0, PARAM_INT); -$categoryedit = optional_param('categoryedit', -1, PARAM_BOOL); // Enables Move/Delete/Hide icons near each category in the list -$categoryadd = optional_param('categoryadd', 0, PARAM_BOOL); // Enables the Add Category form -$categoryupdate = optional_param('categoryupdate', 0, PARAM_BOOL); // Enables the Edit Category form -$resort = optional_param('resort', 0, PARAM_BOOL); +$id = optional_param('id', 0, PARAM_INT); // category id to edit (0 for to add category) +$parent = optional_param('parent', 0, PARAM_INT); // parent category id -if (!$site = get_site()) { - error("Site isn't defined!"); -} +$originalparent = 0; +$category = null; + +if($id){ + // editing category + + if (!$category = get_record('course_categories', 'id', $id)) { + print_error('unknowncategory', 'error'); + } + $originalparent = $category->parent; -if ($categoryadd) { // Show Add category form: if $id is given, it is used as the parent category - $strtitle = get_string("addnewcategory"); - $context = get_context_instance(CONTEXT_SYSTEM); - $category = null; -} elseif (!is_null($id) && !$categoryadd) { // Show Edit category form: $id is given as the identifier of the category being edited - $strtitle = get_string("editcategorysettings"); $context = get_context_instance(CONTEXT_COURSECAT, $id); - if (!$category = get_record("course_categories", "id", $id)) { - error("Category not known!"); + require_capability('moodle/category:update', $context); + $strtitle = get_string('editcategorysettings'); +}else{ + // adding category + + if($parent){ + if (! record_exists('course_categories', 'id', $parent)) { + print_error('parentdoesntexist', 'error'); + } + + $originalparent = $parent; + $context = get_context_instance(CONTEXT_COURSECAT, $parent); + }else{ + // no parent, use system permissions + $context = get_context_instance(CONTEXT_SYSTEM); } + + $strtitle = get_string('addnewcategory'); + require_capability('moodle/category:create', $context); } -$mform = new editcategory_form('editcategory.php', compact(array('category', 'id'))); -if (!empty($category)) { +$mform = new editcategory_form('editcategory.php', array('id' => $id, 'originalparent'=> $originalparent)); + +if($id){ $mform->set_data($category); -} elseif (!is_null($id)) { - $data = new stdClass(); - $data->parent = $id; - $data->categoryadd = 1; - $mform->set_data($data); } - + + if ($mform->is_cancelled()){ if (empty($category)) { redirect($CFG->wwwroot .'/course/index.php?categoryedit=on'); } else { redirect($CFG->wwwroot.'/course/category.php?categoryedit=on&id='.$category->id); } -} else if (($data = $mform->get_data())) { +} else if ($data = $mform->get_data()) { + $newcategory = new stdClass(); $newcategory->name = $data->name; $newcategory->description = $data->description; $newcategory->sortorder = 999; - $newcategory->parent = $data->parent; // if $id = 0, the new category will be a top-level category + $newcategory->parent = $data->parent; if (!empty($data->theme) && !empty($CFG->allowcategorythemes)) { $newcategory->theme = $data->theme; - theme_setup(); } - if (empty($category) && has_capability('moodle/category:create', $context)) { // Create a new category + if (!$id){ + // Adding category if (!$newcategory->id = insert_record('course_categories', $newcategory)) { notify( "Could not insert the new category '$newcategory->name' "); } else { $newcategory->context = get_context_instance(CONTEXT_COURSECAT, $newcategory->id); mark_context_dirty($newcategory->context->path); - redirect('index.php?categoryedit=on'); } - } elseif (has_capability('moodle/category:update', $context)) { + + } else { + // editting category + $newcategory->id = $category->id; if ($newcategory->parent != $category->parent) { @@ -85,249 +91,38 @@ if ($mform->is_cancelled()){ if (!update_record('course_categories', $newcategory)) { error( "Could not update the category '$newcategory->name' "); } else { - if ($newcategory->parent == 0) { - $redirect_link = 'index.php?categoryedit=on'; - } else { - $redirect_link = 'category.php?id='.$newcategory->id.'&categoryedit=on'; - } fix_course_sortorder(); - redirect($redirect_link); } } -} - - -// If id is given, but not categoryadd or categoryupdate, we show the category with its list of subcategories -if ($id && !$categoryadd && !$categoryupdate && false) { - /* TODO implement - - if ($CFG->forcelogin) { - require_login(); - } - - // Determine whether to allow user to see this category - if (has_capability('moodle/course:create', $context)) { - if ($categoryedit !== -1) { - $USER->categoryediting = $categoryedit; - } - $navbaritem = update_category_button($category->id); - $creatorediting = !empty($USER->categoryediting); - $adminediting = (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM)) and $creatorediting); - - } else { - if (!$category->visible) { - print_error('notavailable', 'error'); - } - $navbaritem = print_course_search("", true, "navbar"); - $adminediting = false; - $creatorediting = false; - } - - // Resort the category if requested - if ($resort and confirm_sesskey()) { - if ($courses = get_courses($id, "fullname ASC", 'c.id,c.fullname,c.sortorder')) { - // move it off the range - $count = get_record_sql('SELECT MAX(sortorder) AS max, 1 - FROM ' . $CFG->prefix . 'course WHERE category=' . $category->id); - $count = $count->max + 100; - begin_sql(); - foreach ($courses as $course) { - set_field('course', 'sortorder', $count, 'id', $course->id); - $count++; - } - commit_sql(); - fix_course_sortorder($category->id); - } - } - - // Print headings - $numcategories = count_records("course_categories"); - - $stradministration = get_string("administration"); - $strcategories = get_string("categories"); - $strcategory = get_string("category"); - $strcourses = get_string("courses"); - - $navlinks = array(); - $navlinks[] = array('name' => $strcategories, 'link' => 'index.php', 'type' => 'misc'); - $navlinks[] = array('name' => $category->name, 'link' => null, 'type' => 'misc'); - $navigation = build_navigation($navlinks); - - if ($creatorediting) { - if ($adminediting) { - // modify this to treat this as an admin page - - require_once($CFG->libdir.'/adminlib.php'); - admin_externalpage_setup('categorymgmt'); - admin_externalpage_print_header(); - } else { - print_header("$site->shortname: $category->name", "$site->fullname: $strcategories", $navigation, "", "", true, $navbaritem); - } - } else { - print_header("$site->shortname: $category->name", "$site->fullname: $strcategories", $navigation, "", "", true, $navbaritem); - } - - // Print button to turn editing off - if ($adminediting) { - echo '
'.update_category_button($category->id).'
'; - } - - // Print link to roles - - if (has_capability('moodle/role:assign', $context)) { - echo '
'.get_string('assignroles','role').'
'; - } - - // Print the category selector - - $displaylist = array(); - $parentlist = array(); - - make_categories_list($displaylist, $parentlist, ""); - - echo '
'; - popup_form('category.php?id=', $displaylist, 'switchcategory', $category->id, '', '', '', false, 'self', $strcategories.':'); - echo '
'; - - // Print current category description - if ($category->description) { - print_box_start(); - print_heading(get_string('description')); - echo $category->description; - print_box_end(); - } - - // Editing functions - if ($creatorediting) { - // Move a specified category to a new category - - if (!empty($moveto) and $data = data_submitted() and confirm_sesskey()) { // Some courses are being moved - - // user must have category update in both cats to perform this - require_capability('moodle/category:update', $context); - require_capability('moodle/category:update', get_context_instance(CONTEXT_COURSECAT, $moveto)); - - if (!$destcategory = get_record("course_categories", "id", $data->moveto)) { - error("Error finding the destination category"); - } - // TODO function to move the category - } - - // Hide or show a category - if ((!empty($hide) or !empty($show)) and confirm_sesskey()) { - require_capability('moodle/category:visibility', $context); - if (!empty($hide)) { - $category = get_record("course_categories", "id", $hide); - $visible = 0; - } else { - $category = get_record("course_categories", "id", $show); - $visible = 1; - } - if ($category) { - if (! set_field("course_categories", "visible", $visible, "id", $category->id)) { - notify("Could not update that category!"); - } - } - } - - - // Move a category up or down - if ((!empty($moveup) or !empty($movedown)) and confirm_sesskey()) { - require_capability('moodle/category:update', $context); - $movecategory = NULL; - $swapcategory = NULL; - - // TODO something like fix_course_sortorder() ? - - // we are going to need to know the range - $max = get_record_sql('SELECT MAX(sortorder) AS max, 1 FROM ' . $CFG->prefix . 'course_categories WHERE id=' . $category->id); - $max = $max->max + 100; - - if (!empty($moveup)) { - $movecategory = get_record('course_categories', 'id', $moveup); - $swapcategory = get_record('course_categories', - 'category', $category->id, - 'sortorder', $movecategory->sortorder - 1); - } else { - $movecategory = get_record('course_categories', 'id', $movedown); - $swapcategory = get_record('course_categories', - 'category', $category->id, - 'sortorder', $movecategory->sortorder + 1); - } - - if ($swapcourse and $movecourse) { // Renumber everything for robustness - begin_sql(); - if (!( set_field("course", "sortorder", $max, "id", $swapcourse->id) - && set_field("course", "sortorder", $swapcourse->sortorder, "id", $movecourse->id) - && set_field("course", "sortorder", $movecourse->sortorder, "id", $swapcourse->id) - )) { - notify("Could not update that course!"); - } - commit_sql(); - } - - } - - } // End of editing stuff - - // Print out all the sub-categories - if ($subcategories = get_records("course_categories", "parent", $category->id, "sortorder ASC")) { - $firstentry = true; - foreach ($subcategories as $subcategory) { - if ($subcategory->visible or has_capability('moodle/course:create', $context)) { - $subcategorieswereshown = true; - if ($firstentry) { - echo ''; - echo ''; - echo '
'.get_string('subcategories').'
'; - $firstentry = false; - } - $catlinkcss = $subcategory->visible ? "" : " class=\"dimmed\" "; - echo ''. - format_string($subcategory->name).'
'; - } - } - if (!$firstentry) { - echo "
"; - echo "
"; - } - } + redirect('category.php?id='.$newcategory->id.'&categoryedit=on'); +} - // print option to add a subcategory - if (has_capability('moodle/category:create', $context) && $creatorediting) { - $cat->id = $id; - $mform->set_data($cat); - $mform->display(); - } - */ -} // Print the form $site = get_site(); -$straddnewcategory = get_string("addnewcategory"); -$stradministration = get_string("administration"); -$strcategories = get_string("categories"); +$straddnewcategory = get_string('addnewcategory'); +$stradministration = get_string('administration'); +$strcategories = get_string('categories'); $navlinks = array(); if (!empty($category->name)) { $navlinks[] = array('name' => $strtitle, - 'link' => null, - 'type' => 'misc'); + 'link' => null, + 'type' => 'misc'); $title = $strtitle; $fullname = $category->name; } else { $navlinks[] = array('name' => $stradministration, - 'link' => "$CFG->wwwroot/$CFG->admin/index.php", - 'type' => 'misc'); + 'link' => "$CFG->wwwroot/$CFG->admin/index.php", + 'type' => 'misc'); $navlinks[] = array('name' => $strcategories, - 'link' => 'index.php', - 'type' => 'misc'); + 'link' => 'index.php', + 'type' => 'misc'); $navlinks[] = array('name' => $straddnewcategory, - 'link' => null, - 'type' => 'misc'); + 'link' => null, + 'type' => 'misc'); $title = "$site->shortname: $straddnewcategory"; $fullname = $site->fullname; } diff --git a/course/editcategory_form.php b/course/editcategory_form.php index 37efa02..7f9f519 100644 --- a/course/editcategory_form.php +++ b/course/editcategory_form.php @@ -11,8 +11,15 @@ class editcategory_form extends moodleform { $options = array(get_string('top')); $parents = array(); make_categories_list($options, $parents); + + if($this->_customdata['id'] > 0){ + // don't allow changing parent to self + unset($options[$this->_customdata['id']]); + } $mform->addElement('select', 'parent', get_string('parentcategory'), $options); + $mform->setDefault('parent', $this->_customdata['originalparent']); + $mform->addElement('text', 'name', get_string('categoryname'), array('size'=>'30')); $mform->addRule('name', get_string('required'), 'required', null); $mform->addElement('htmleditor', 'description', get_string('description')); @@ -25,10 +32,46 @@ class editcategory_form extends moodleform { } $mform->setHelpButton('description', array('writing', 'richtext'), false, 'editorhelpbutton'); - $mform->addElement('hidden', 'id', null); - $mform->addElement('hidden', 'categoryadd', 0); + $mform->addElement('hidden', 'id', 0); $mform->setType('id', PARAM_INT); + $mform->setDefault('id', $this->_customdata['id']); + $this->add_action_buttons(true, get_string('savechanges')); } + + /* + * Validate the permissions on the parent category, to ensure the user + * doesn't do something they shouldn't/ lock themelf out of a category? + */ + function validation($data, $files) { + $errors = array(); + + $errors = parent::validation($data, $files); + + + + if( $data['parent'] > 0 ){ + $context = get_context_instance(CONTEXT_COURSECAT, $data['parent']); + }else{ + $context = get_context_instance(CONTEXT_SYSTEM); + } + + if($data['id'] == 0){ + // adding a category + if(! has_capability('moodle/category:create', $context) ){ + $errors['parent'] = get_string('cantcreatecategoryhere', 'error'); + } + }else if ($this->_customdata['originalparent'] != $data['parent']){ + // only check permissions if its changed + + // TODO: decide what the best behaviour is here? + if(! has_capability('moodle/category:update', $context) ){ + $errors['parent'] = get_string('cantmovecategoryhere', 'error'); + } + } + + + return $errors; + } } ?> diff --git a/course/index.php b/course/index.php index c1543ec..f6aa562 100644 --- a/course/index.php +++ b/course/index.php @@ -301,11 +301,10 @@ if (has_capability('moodle/category:create', $context)) { unset($options); if (!empty($category->id)) { - $options['id'] = $category->id; - } else { - $options['id'] = 0; + $options['parent'] = $category->id; + }else{ + $options['parent'] = 0; } - $options['categoryadd'] = 1; print_single_button('editcategory.php', $options, get_string('addnewcategory'), 'get'); } diff --git a/lang/en_utf8/error.php b/lang/en_utf8/error.php index 731ab15..ca48d68 100644 --- a/lang/en_utf8/error.php +++ b/lang/en_utf8/error.php @@ -18,6 +18,8 @@ $string['cannotsavezipfile'] = 'Cannot save ZIP file.'; $string['cannotunzipfile'] = 'Cannot unzip file.'; $string['cannotupdaterecord'] = 'Could not update record ID $a'; $string['cannotviewprofile'] = 'You can not view the profile of this user.'; +$string['cantcreatecategoryhere'] = 'You do not have permission to create a category here'; +$string['cantmovecategoryhere'] = 'You do not have permission to move a category here'; $string['cantunenrollfrommetacourse'] = 'You can not unenrol from this meta course.'; $string['cantunenrollinthisrole'] = 'You can not unenrol from this course while you are in your current role.'; $string['cmunknown'] = 'Couldn\'t find this course module'; @@ -104,6 +106,7 @@ $string['socksnotsupported'] = 'SOCKS5 proxy is not supported in PHP4'; $string['statscatchupmode'] = 'Statistics is currently in catchup mode. So far $a->daysdone day(s) have been processed and $a->dayspending are pending. Check back soon!'; $string['tagnotfound'] = 'The specified tag was not found in the database'; $string['unicodeupgradeerror'] = 'Sorry, but your database is not already in Unicode, and this version of Moodle is not able to migrate your database to Unicode. Please upgrade to Moodle 1.7.x first and perform the Unicode migration from the Admin page. After that is done you should be able to migrate to Moodle $a'; +$string['unknowncategory'] = 'Category not found.'; $string['unknowncourse'] = 'Unknown course named \"$a\"'; $string['unknowncourseidnumber'] = 'Unknown Course ID \"$a\"'; $string['unknowngroup'] = 'Unknown group \"$a\"';