diff --git a/main/gradebook/gradebook_edit_all.php b/main/gradebook/gradebook_edit_all.php index f4530d7b21..9140ca5179 100755 --- a/main/gradebook/gradebook_edit_all.php +++ b/main/gradebook/gradebook_edit_all.php @@ -34,6 +34,7 @@ require_once ('lib/fe/linkform.class.php'); require_once ('lib/gradebook_data_generator.class.php'); require_once ('lib/fe/gradebooktable.class.php'); require_once ('lib/fe/displaygradebook.php'); +require_once api_get_path(SYS_CODE_PATH).'gradebook/gradebook_function.php'; api_block_anonymous_users(); if (!api_is_allowed_to_create_course()) { @@ -110,12 +111,6 @@ $table_evaluated[4] = array(TABLE_LP_MAIN, 'name','id', get_lang('Learnpath')); $table_evaluated[5] = array(TABLE_FORUM_THREAD, 'thread_title_qualify', 'thread_id', get_lang('Forum')); $table_evaluated[7] = array(TABLE_ATTENDANCE, 'attendance_title_qualify', 'id', get_lang('Attendance')); - -function get_table_type_course($type,$course) { - global $_configuration; - global $table_evaluated; - return Database::get_course_table($table_evaluated[$type][0],$_configuration['db_prefix'].$course); -} $submitted=isset($_POST['submitted'])?$_POST['submitted']:''; if($submitted==1) { Display :: display_confirmation_message(get_lang('GradebookWeightUpdated')) . '

'; diff --git a/main/gradebook/gradebook_flatview.php b/main/gradebook/gradebook_flatview.php index 180108c11d..aeb8755a68 100755 --- a/main/gradebook/gradebook_flatview.php +++ b/main/gradebook/gradebook_flatview.php @@ -14,6 +14,8 @@ require_once 'lib/fe/flatviewtable.class.php'; require_once 'lib/fe/displaygradebook.php'; require_once 'lib/fe/exportgradebook.php'; require_once 'lib/scoredisplay.class.php'; +require_once api_get_path(SYS_CODE_PATH).'gradebook/gradebook_function.php'; + //require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php'; // This is the old library for pdf-export (non UTF-8 compatible). define('_MPDF_PATH', api_get_path(LIBRARY_PATH).'mpdf/'); require_once _MPDF_PATH.'mpdf.php'; @@ -321,17 +323,4 @@ if (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') { echo ''; } -Display :: display_footer(); - -function get_printable_data($users,$alleval, $alllinks) { - $datagen = new FlatViewDataGenerator ($users, $alleval, $alllinks); - $offset = isset($_GET['offset']) ? $_GET['offset'] : '0'; - $count = (($offset + 10) > $datagen->get_total_items_count()) ? ($datagen->get_total_items_count() - $offset) : 10; - $header_names = $datagen->get_header_names($offset, $count); - $data_array = $datagen->get_data(FlatViewDataGenerator :: FVDG_SORT_LASTNAME, 0, null, $offset, $count, true); - $newarray = array(); - foreach ($data_array as $data) { - $newarray[] = array_slice($data, 1); - } - return array ($header_names, $newarray); -} +Display :: display_footer(); \ No newline at end of file diff --git a/main/gradebook/gradebook_view_result.php b/main/gradebook/gradebook_view_result.php index 36d2420e2c..e3b816aba4 100755 --- a/main/gradebook/gradebook_view_result.php +++ b/main/gradebook/gradebook_view_result.php @@ -39,6 +39,8 @@ require_once ('lib/fe/resulttable.class.php'); require_once ('lib/fe/exportgradebook.php'); require_once ('lib/scoredisplay.class.php'); require_once (api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php'); +require_once api_get_path(SYS_CODE_PATH).'gradebook/gradebook_function.php'; + api_block_anonymous_users(); block_students(); @@ -62,76 +64,12 @@ if ($eval[0]->get_category_id() < 0) { } else $currentcat= Category :: load($eval[0]->get_category_id()); //load the result with the evaluation id -function overwritescore($resid, $importscore, $eval_max) { - $result= Result :: load($resid); - if ($importscore > $eval_max) { - header('Location: gradebook_view_result.php?selecteval=' .Security::remove_XSS($_GET['selecteval']) . '&overwritemax='); - exit; - } - $result[0]->set_score($importscore); - $result[0]->save(); - unset ($result); -} + if (isset ($_GET['selecteval'])) { $allresults= Result :: load(null,null,$select_eval); $iscourse= $currentcat[0]->get_course_code() == null ? 1 : 0; } -/** - * XML-parser: handle start of element - */ -function element_start($parser, $data) { -global $user; -global $current_tag; - switch ($data) { - case 'Result' : - $user= array (); - break; - default : - $current_tag= $data; - } -} -/** - * XML-parser: handle end of element - */ -function element_end($parser, $data) { -global $user; -global $users; -global $current_value; - switch ($data) { - case 'Result' : - $users[]= $user; - break; - default : - $user[$data]= $current_value; - break; - } -} -/** - * XML-parser: handle character data - */ -function character_data($parser, $data) { -global $current_value; -$current_value= $data; -} -/** - * Read the XML-file - * @param string $file Path to the XML-file - * @return array All userinformation read from the file - */ -function parse_xml_data($file) { - global $current_tag; - global $current_value; - global $user; - global $users; - $users= array (); - $parser= xml_parser_create(); - xml_set_element_handler($parser, 'element_start', 'element_end'); - xml_set_character_data_handler($parser, "character_data"); - xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, false); - xml_parse($parser, file_get_contents($file)); - xml_parser_free($parser); - return $users; -} + if (isset ($_GET['editres'])) { $edit_res_xml=Security::remove_XSS($_GET['editres']); $select_eval_edit=Security::remove_XSS($_GET['selecteval']);