From 61c72439c52a940d541285ca3af1f771a49b525a Mon Sep 17 00:00:00 2001 From: stronk7 Date: Thu, 9 Sep 2004 09:06:18 +0000 Subject: [PATCH] Solved an small issue when "not clasified" was selected and we tried to edit categories. Merged from MOODLE_14_STABLE --- mod/glossary/editcategories.php | 252 ++++++++++++++++---------------- 1 file changed, 126 insertions(+), 126 deletions(-) diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php index 95476f48bc..da00f5eb83 100644 --- a/mod/glossary/editcategories.php +++ b/mod/glossary/editcategories.php @@ -7,7 +7,7 @@ require_variable($id); // Course Module ID, or optional_variable($mode); // cat - optional_variable($hook); // category ID + optional_variable($hook,0); // category ID optional_variable($action); // what to do optional_variable($usedynalink); // category ID optional_variable($confirm); // confirm the action @@ -32,147 +32,145 @@ error("Course module is incorrect"); } - if ($hook) { - if ($category = get_record("glossary_categories","id",$hook)) { - //Check it belongs to the same glossary - if ($category->glossaryid != $glossary->id) { - error("Glossary is incorrect"); - } - } else { - error("Category is incorrect"); - } + if ($hook > 0) { + if ($category = get_record("glossary_categories","id",$hook)) { + //Check it belongs to the same glossary + if ($category->glossaryid != $glossary->id) { + error("Glossary is incorrect"); + } + } else { + error("Category is incorrect"); + } } require_login($course->id); - if ( !isteacher($course->id) ) { + if ( !isteacher($course->id) ) { error("You must be a teacher to use this page."); - } - -// add_to_log($course->id, "glossary", "edit categories", "view.php?id=$cm->id", "$glossary->id", $cm->id); + } $strglossaries = get_string("modulenameplural", "glossary"); $strglossary = get_string("modulename", "glossary"); print_header_simple(strip_tags("$glossary->name"), "", - "id>$strglossaries -> id&tab=GLOSSARY_CATEGORY_VIEW>$glossary->name -> " . get_string("categories","glossary"), - "", "", true, update_module_button($cm->id, $course->id, $strglossary), - navmenu($course, $cm)); - - if ( $hook ) { - - if ( $action == "edit" ) { - if ( $confirm ) { - $action = ""; - $cat->id = $hook; - $cat->name = $name; - $cat->usedynalink = $usedynalink; - - if ( !update_record("glossary_categories", $cat) ) { - error("Weird error. The category was not updated."); - redirect("editcategories.php?id=$cm->id"); - } else { - add_to_log($course->id, "glossary", "edit category", "editcategories.php?id=$cm->id", $hook,$cm->id); - } - } else { - echo "

" . get_string("edit"). " " . get_string("category","glossary") . ""; - - $name = $category->name; - $usedynalink = $category->usedynalink; - require "editcategories.html"; - print_footer(); - die; - } - } elseif ( $action == "delete" ) { - if ( $confirm ) { - - delete_records("glossary_entries_categories","categoryid", $hook); - delete_records("glossary_categories","id", $hook); - - print_simple_box_start("center","40%", "#FFBBBB"); - echo "

" . get_string("categorydeleted","glossary") ."
"; - echo ""; - print_simple_box_end(); - - print_footer($course); + "id>$strglossaries -> id&tab=GLOSSARY_CATEGORY_VIEW>$glossary->name -> " . get_string("categories","glossary"), + "", "", true, update_module_button($cm->id, $course->id, $strglossary), + navmenu($course, $cm)); - add_to_log($course->id, "glossary", "delete category", "editcategories.php?id=$cm->id", $hook,$cm->id); - + if ( $hook >0 ) { + + if ( $action == "edit" ) { + if ( $confirm ) { + $action = ""; + $cat->id = $hook; + $cat->name = $name; + $cat->usedynalink = $usedynalink; + + if ( !update_record("glossary_categories", $cat) ) { + error("Weird error. The category was not updated."); redirect("editcategories.php?id=$cm->id"); - } else { - echo "

" . get_string("delete"). " " . get_string("category","glossary") . ""; + } else { + add_to_log($course->id, "glossary", "edit category", "editcategories.php?id=$cm->id", $hook,$cm->id); + } + } else { + echo "

" . get_string("edit"). " " . get_string("category","glossary") . ""; + + $name = $category->name; + $usedynalink = $category->usedynalink; + require "editcategories.html"; + print_footer(); + die; + } + + } elseif ( $action == "delete" ) { + if ( $confirm ) { + delete_records("glossary_entries_categories","categoryid", $hook); + delete_records("glossary_categories","id", $hook); + + print_simple_box_start("center","40%", "#FFBBBB"); + echo "

" . get_string("categorydeleted","glossary") ."
"; + echo ""; + print_simple_box_end(); + print_footer($course); + + add_to_log($course->id, "glossary", "delete category", "editcategories.php?id=$cm->id", $hook,$cm->id); + + redirect("editcategories.php?id=$cm->id"); + } else { + echo "

" . get_string("delete"). " " . get_string("category","glossary") . ""; - print_simple_box_start("center","40%", "#FFBBBB"); - echo "

$category->name
"; + print_simple_box_start("center","40%", "#FFBBBB"); + echo "
$category->name
"; - $num_entries = count_records("glossary_entries_categories","categoryid",$category->id); - if ( $num_entries ) { - print_string("deletingnoneemptycategory","glossary"); - } - echo "

"; - print_string("areyousuredelete","glossary"); - - ?> -

- - - - - - -
- "> - - - $id); - print_single_button("editcategories.php", $options, get_string("no") ); - echo "
"; - echo "
"; - print_simple_box_end(); - } - } - } elseif ( $action == "add" ) { - if ( $confirm ) { - $dupcategory = get_record("glossary_categories","lcase(name)",strtolower($name),"glossaryid",$glossary->id); - if ( $dupcategory ) { - echo "

" . get_string("add"). " " . get_string("category","glossary") . ""; + $num_entries = count_records("glossary_entries_categories","categoryid",$category->id); + if ( $num_entries ) { + print_string("deletingnoneemptycategory","glossary"); + } + echo "

"; + print_string("areyousuredelete","glossary"); +?> +

+ + + + + + +
+ "> + + + + $id); + print_single_button("editcategories.php", $options, get_string("no") ); + echo "
"; + echo "
"; + print_simple_box_end(); + } + } + + } elseif ( $action == "add" ) { + if ( $confirm ) { + $dupcategory = get_record("glossary_categories","lcase(name)",strtolower($name),"glossaryid",$glossary->id); + if ( $dupcategory ) { + echo "

" . get_string("add"). " " . get_string("category","glossary") . ""; - print_simple_box_start("center","40%", "#FFBBBB"); - echo "

" . get_string("duplicatedcategory","glossary") ."
"; - echo ""; - print_simple_box_end(); + print_simple_box_start("center","40%", "#FFBBBB"); + echo "
" . get_string("duplicatedcategory","glossary") ."
"; + echo ""; + print_simple_box_end(); - print_footer($course); + print_footer($course); - redirect("editcategories.php?id=$cm->id&action=add&&name=$name"); + redirect("editcategories.php?id=$cm->id&action=add&&name=$name"); - } else { - $action = ""; - $cat->name = $name; - $cat->usedynalink = $usedynalink; - $cat->glossaryid = $glossary->id; + } else { + $action = ""; + $cat->name = $name; + $cat->usedynalink = $usedynalink; + $cat->glossaryid = $glossary->id; - if ( ! $cat->id = insert_record("glossary_categories", $cat) ) { - error("Weird error. The category was not inserted."); + if ( ! $cat->id = insert_record("glossary_categories", $cat) ) { + error("Weird error. The category was not inserted."); - redirect("editcategories.php?id=$cm->id"); - } else { - add_to_log($course->id, "glossary", "add category", "editcategories.php?id=$cm->id", $cat->id,$cm->id); - } - } - } else { - echo "

" . get_string("add"). " " . get_string("category","glossary") . ""; - $name=""; - require "editcategories.html"; - } - } + redirect("editcategories.php?id=$cm->id"); + } else { + add_to_log($course->id, "glossary", "add category", "editcategories.php?id=$cm->id", $cat->id,$cm->id); + } + } + } else { + echo "

" . get_string("add"). " " . get_string("category","glossary") . ""; + $name=""; + require "editcategories.html"; + } + } - if ( $action ) { - print_footer(); - die; - } + if ( $action ) { + print_footer(); + die; + } ?> @@ -190,13 +188,15 @@ + id,"name ASC"); + $categories = get_records("glossary_categories","glossaryid",$glossary->id,"name ASC"); + + if ( $categories ) { + foreach ($categories as $category) { + $num_entries = count_records("glossary_entries_categories","categoryid",$category->id); +?> - if ( $categories ) { - foreach ($categories as $category) { - $num_entries = count_records("glossary_entries_categories","categoryid",$category->id); - ?>