diff -Naur old/lib.php new/lib.php
--- old/lib.php	2012-01-30 12:29:42.000000000 +0530
+++ new/lib.php	2012-03-26 10:40:43.000000000 +0530
@@ -54,8 +54,6 @@
     var $cm;
     /** @var object */
     var $course;
-    /** @var stdClass */
-    var $coursecontext;
     /** @var object */
     var $assignment;
     /** @var string */
@@ -121,8 +119,6 @@
         } else if (! $this->course = $DB->get_record('course', array('id'=>$this->cm->course))) {
             print_error('invalidid', 'assignment');
         }
-        $this->coursecontext = get_context_instance(CONTEXT_COURSE, $this->course->id);
-        $courseshortname = format_text($this->course->shortname, true, array('context' => $this->coursecontext));
 
         if ($assignment) {
             $this->assignment = $assignment;
@@ -137,7 +133,7 @@
         $this->strassignments = get_string('modulenameplural', 'assignment');
         $this->strsubmissions = get_string('submissions', 'assignment');
         $this->strlastmodified = get_string('lastmodified');
-        $this->pagetitle = strip_tags($courseshortname.': '.$this->strassignment.': '.format_string($this->assignment->name, true, array('context' => $this->context)));
+        $this->pagetitle = strip_tags($this->course->shortname.': '.$this->strassignment.': '.format_string($this->assignment->name,true));
 
         // visibility handled by require_login() with $cm parameter
         // get current group only when really needed
@@ -257,8 +253,6 @@
      *
      * This default method prints the teacher picture and name, date when marked,
      * grade and teacher submissioncomment.
-     * If advanced grading is used the method render_grade from the
-     * advanced grading controller is called to display the grade.
      *
      * @global object
      * @global object
@@ -266,31 +260,30 @@
      * @param object $submission The submission object or NULL in which case it will be loaded
      */
     function view_feedback($submission=NULL) {
-        global $USER, $CFG, $DB, $OUTPUT, $PAGE;
+        global $USER, $CFG, $DB, $OUTPUT;
         require_once($CFG->libdir.'/gradelib.php');
-        require_once("$CFG->dirroot/grade/grading/lib.php");
+
+        if (!is_enrolled($this->context, $USER, 'mod/assignment:view')) {
+            // can not submit assignments -> no feedback
+            return;
+        }
 
         if (!$submission) { /// Get submission for this assignment
-            $userid = $USER->id;
-            $submission = $this->get_submission($userid);
-        } else {
-            $userid = $submission->userid;
+            $submission = $this->get_submission($USER->id);
         }
         // Check the user can submit
-        $canviewfeedback = ($userid == $USER->id && has_capability('mod/assignment:submit', $this->context, $USER->id, false));
+        $cansubmit = has_capability('mod/assignment:submit', $this->context, $USER->id, false);
         // If not then check if the user still has the view cap and has a previous submission
-        $canviewfeedback = $canviewfeedback || (!empty($submission) && $submission->userid == $USER->id && has_capability('mod/assignment:view', $this->context));
-        // Or if user can grade (is a teacher or admin)
-        $canviewfeedback = $canviewfeedback || has_capability('mod/assignment:grade', $this->context);
+        $cansubmit = $cansubmit || (!empty($submission) && has_capability('mod/assignment:view', $this->context, $USER->id, false));
 
-        if (!$canviewfeedback) {
-            // can not view or submit assignments -> no feedback
+        if (!$cansubmit) {
+            // can not submit assignments -> no feedback
             return;
         }
 
-        $grading_info = grade_get_grades($this->course->id, 'mod', 'assignment', $this->assignment->id, $userid);
+        $grading_info = grade_get_grades($this->course->id, 'mod', 'assignment', $this->assignment->id, $USER->id);
         $item = $grading_info->items[0];
-        $grade = $item->grades[$userid];
+        $grade = $item->grades[$USER->id];
 
         if ($grade->hidden or $grade->grade === false) { // hidden or error
             return;
@@ -332,13 +325,9 @@
         echo '<tr>';
         echo '<td class="left side">&nbsp;</td>';
         echo '<td class="content">';
-        $gradestr = '<div class="grade">'. get_string("grade").': '.$grade->str_long_grade. '</div>';
-        if (!empty($submission) && $controller = get_grading_manager($this->context, 'mod_assignment', 'submission')->get_active_controller()) {
-            $controller->set_grade_range(make_grades_menu($this->assignment->grade));
-            echo $controller->render_grade($PAGE, $submission->id, $item, $gradestr, has_capability('mod/assignment:grade', $this->context));
-        } else {
-            echo $gradestr;
-        }
+        echo '<div class="grade">';
+        echo get_string("grade").': '.$grade->str_long_grade;
+        echo '</div>';
         echo '<div class="clearer"></div>';
 
         echo '<div class="comment">';
@@ -627,7 +616,7 @@
 
         if (is_null($mailinfo)) {
             if (optional_param('sesskey', null, PARAM_BOOL)) {
-                set_user_preference('assignment_mailinfo', 0);
+                set_user_preference('assignment_mailinfo', $mailinfo);
             } else {
                 $mailinfo = get_user_preferences('assignment_mailinfo', 0);
             }
@@ -635,12 +624,6 @@
             set_user_preference('assignment_mailinfo', $mailinfo);
         }
 
-        if (!($this->validate_and_preprocess_feedback())) {
-            // form was submitted ('Save' or 'Save and next' was pressed, but validation failed)
-            $this->display_submission();
-            return;
-        }
-
         switch ($mode) {
             case 'grade':                         // We are in a main window grading
                 if ($submission = $this->process_feedback()) {
@@ -671,8 +654,8 @@
                     $col = 'submissioncomment';
                     $commenting = true;
                 }
-                if (isset($_POST['menu'])) {
-                    $col = 'menu';
+                if (isset($_POST['mmenu'])) {
+                    $col = 'mmenu';
                     $grading = true;
                 }
                 if (!$col) {
@@ -700,7 +683,7 @@
                     $updatedb = false;
 
                     if ($grading) {
-                        $grade = $_POST['menu'][$id];
+                        $grade = $_POST['mmenu'][$id];
                         $updatedb = $updatedb || ($submission->grade != $grade);
                         $submission->grade = $grade;
                     } else {
@@ -769,16 +752,9 @@
                 $offset = required_param('offset', PARAM_INT);
                 $nextid = required_param('nextid', PARAM_INT);
                 $id = required_param('id', PARAM_INT);
-                $filter = optional_param('filter', self::FILTER_ALL, PARAM_INT);
-
-                if ($mode == 'next' || $filter !== self::FILTER_REQUIRE_GRADING) {
-                    $offset = (int)$offset+1;
-                }
-                $redirect = new moodle_url('submissions.php',
-                        array('id' => $id, 'offset' => $offset, 'userid' => $nextid,
-                        'mode' => 'single', 'filter' => $filter));
-
-                redirect($redirect);
+                $offset = (int)$offset+1;
+                //$this->display_submission($offset+1 , $nextid);
+                redirect('submissions.php?id='.$id.'&userid='. $nextid . '&mode=single&offset='.$offset);
                 break;
 
             case 'singlenosave':
@@ -792,23 +768,6 @@
     }
 
     /**
-     * Checks if grading method allows quickgrade mode. At the moment it is hardcoded
-     * that advanced grading methods do not allow quickgrade.
-     *
-     * Assignment type plugins are not allowed to override this method
-     *
-     * @return boolean
-     */
-    public final function quickgrade_mode_allowed() {
-        global $CFG;
-        require_once("$CFG->dirroot/grade/grading/lib.php");
-        if ($controller = get_grading_manager($this->context, 'mod_assignment', 'submission')->get_active_controller()) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
      * Helper method updating the listing on the main script from popup using javascript
      *
      * @global object
@@ -822,11 +781,11 @@
 
         $perpage = get_user_preferences('assignment_perpage', 10);
 
-        $quickgrade = get_user_preferences('assignment_quickgrade', 0) && $this->quickgrade_mode_allowed();
+        $quickgrade = get_user_preferences('assignment_quickgrade', 0);
 
         /// Run some Javascript to try and update the parent page
         $output .= '<script type="text/javascript">'."\n<!--\n";
-        if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['submissioncomment'])) {
+       if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['submissioncomment'])) {
             if ($quickgrade){
                 $output.= 'opener.document.getElementById("submissioncomment'.$submission->userid.'").value="'
                 .trim($submission->submissioncomment).'";'."\n";
@@ -836,7 +795,7 @@
             }
         }
 
-        if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['grade'])) {
+         if (empty($SESSION->flextable['mod-assignment-submissions']->collapse['grade'])) {
             //echo optional_param('menuindex');
             if ($quickgrade){
                 $output.= 'opener.document.getElementById("menumenu'.$submission->userid.
@@ -955,11 +914,10 @@
      * @param string $extra_javascript
      */
     function display_submission($offset=-1,$userid =-1, $display=true) {
-        global $CFG, $DB, $PAGE, $OUTPUT, $USER;
+        global $CFG, $DB, $PAGE, $OUTPUT;
         require_once($CFG->libdir.'/gradelib.php');
         require_once($CFG->libdir.'/tablelib.php');
         require_once("$CFG->dirroot/repository/lib.php");
-        require_once("$CFG->dirroot/grade/grading/lib.php");
         if ($userid==-1) {
             $userid = required_param('userid', PARAM_INT);
         }
@@ -997,7 +955,7 @@
         /// Get all ppl that can submit assignments
 
         $currentgroup = groups_get_activity_group($cm);
-        $users = get_enrolled_users($context, 'mod/assignment:submit', $currentgroup, 'u.id');
+        $users = get_enrolled_users($context, 'mod/assignment:view', $currentgroup, 'u.id');
         if ($users) {
             $users = array_keys($users);
             // if groupmembersonly used, remove users who are not in any group
@@ -1020,10 +978,7 @@
             $userfields = user_picture::fields('u', array('lastaccess'));
             $select = "SELECT $userfields,
                               s.id AS submissionid, s.grade, s.submissioncomment,
-                              s.timemodified, s.timemarked,
-                              CASE WHEN s.timemarked > 0 AND s.timemarked >= s.timemodified THEN 1
-                                   ELSE 0 END AS status ";
-
+                              s.timemodified, s.timemarked ";
             $sql = 'FROM {user} u '.
                    'LEFT JOIN {assignment_submissions} s ON u.id = s.userid
                    AND s.assignment = '.$this->assignment->id.' '.
@@ -1036,6 +991,8 @@
 
             if (is_array($auser) && count($auser)>1) {
                 $nextuser = next($auser);
+            /// Calculate user status
+                $nextuser->status = ($nextuser->timemarked > 0) && ($nextuser->timemarked >= $nextuser->timemodified);
                 $nextid = $nextuser->id;
             }
         }
@@ -1077,34 +1034,13 @@
         } elseif ($assignment->assignmenttype == 'uploadsingle') {
             $mformdata->fileui_options = array('subdirs'=>0, 'maxbytes'=>$CFG->userquota, 'maxfiles'=>1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL);
         }
-        $advancedgradingwarning = false;
-        $gradingmanager = get_grading_manager($this->context, 'mod_assignment', 'submission');
-        if ($gradingmethod = $gradingmanager->get_active_method()) {
-            $controller = $gradingmanager->get_controller($gradingmethod);
-            if ($controller->is_form_available()) {
-                $itemid = null;
-                if (!empty($submission->id)) {
-                    $itemid = $submission->id;
-                }
-                if ($gradingdisabled && $itemid) {
-                    $mformdata->advancedgradinginstance = $controller->get_current_instance($USER->id, $itemid);
-                } else if (!$gradingdisabled) {
-                    $instanceid = optional_param('advancedgradinginstanceid', 0, PARAM_INT);
-                    $mformdata->advancedgradinginstance = $controller->get_or_create_instance($instanceid, $USER->id, $itemid);
-                }
-            } else {
-                $advancedgradingwarning = $controller->form_unavailable_notification();
-            }
-        }
 
         $submitform = new mod_assignment_grading_form( null, $mformdata );
 
          if (!$display) {
             $ret_data = new stdClass();
             $ret_data->mform = $submitform;
-            if (isset($mformdata->fileui_options)) {
-                $ret_data->fileui_options = $mformdata->fileui_options;
-            }
+            $ret_data->fileui_options = $mformdata->fileui_options;
             return $ret_data;
         }
 
@@ -1123,9 +1059,6 @@
         echo $OUTPUT->heading(get_string('feedback', 'assignment').': '.fullname($user, true));
 
         // display mform here...
-        if ($advancedgradingwarning) {
-            echo $OUTPUT->notification($advancedgradingwarning, 'error');
-        }
         $submitform->display();
 
         $customfeedback = $this->custom_feedbackform($submission, true);
@@ -1158,6 +1091,7 @@
      * @return bool|void
      */
     function display_submissions($message='') {
+	//$mform =& $this->_form;
         global $CFG, $DB, $USER, $DB, $OUTPUT, $PAGE;
         require_once($CFG->libdir.'/gradelib.php');
 
@@ -1182,7 +1116,8 @@
          * from database
          */
         $perpage    = get_user_preferences('assignment_perpage', 10);
-        $quickgrade = get_user_preferences('assignment_quickgrade', 0) && $this->quickgrade_mode_allowed();
+        $quickgrade = get_user_preferences('assignment_quickgrade', 0);
+	//$mform->addElement('text', 'firstname', get_string('firstname'), 'maxlength="100" size="30"');
         $filter = get_user_preferences('assignment_filter', 0);
         $grading_info = grade_get_grades($this->course->id, 'mod', 'assignment', $this->assignment->id);
 
@@ -1257,7 +1192,7 @@
         }
 
         /// Get all ppl that are allowed to submit assignments
-        list($esql, $params) = get_enrolled_sql($context, 'mod/assignment:submit', $currentgroup);
+        list($esql, $params) = get_enrolled_sql($context, 'mod/assignment:view', $currentgroup);
 
         if ($filter == self::FILTER_ALL) {
             $sql = "SELECT u.id FROM {user} u ".
@@ -1302,28 +1237,19 @@
             }
         }
 
-        $extrafields = get_extra_user_fields($context);
-        $tablecolumns = array_merge(array('picture', 'fullname'), $extrafields,
-                array('grade', 'submissioncomment', 'timemodified', 'timemarked', 'status', 'finalgrade'));
+        $tablecolumns = array('picture', 'fullname', 'grade', 'submissioncomment', 'timemodified', 'timemarked', 'status', 'finalgrade');
         if ($uses_outcomes) {
             $tablecolumns[] = 'outcome'; // no sorting based on outcomes column
         }
 
-        $extrafieldnames = array();
-        foreach ($extrafields as $field) {
-            $extrafieldnames[] = get_user_field_name($field);
-        }
-        $tableheaders = array_merge(
-                array('', get_string('fullnameuser')),
-                $extrafieldnames,
-                array(
-                    get_string('grade'),
-                    get_string('comment', 'assignment'),
-                    get_string('lastmodified').' ('.get_string('submission', 'assignment').')',
-                    get_string('lastmodified').' ('.get_string('grade').')',
-                    get_string('status'),
-                    get_string('finalgrade', 'grades'),
-                ));
+        $tableheaders = array('',
+                              get_string('fullnameuser'),
+                              get_string('grade'),
+                              get_string('comment', 'assignment'),
+                              get_string('lastmodified').' ('.get_string('submission', 'assignment').')',
+                              get_string('lastmodified').' ('.get_string('grade').')',
+                              get_string('status'),
+                              get_string('finalgrade', 'grades'));
         if ($uses_outcomes) {
             $tableheaders[] = get_string('outcome', 'grades');
         }
@@ -1344,9 +1270,6 @@
 
         $table->column_class('picture', 'picture');
         $table->column_class('fullname', 'fullname');
-        foreach ($extrafields as $field) {
-            $table->column_class($field, $field);
-        }
         $table->column_class('grade', 'grade');
         $table->column_class('submissioncomment', 'comment');
         $table->column_class('timemodified', 'timemodified');
@@ -1387,14 +1310,11 @@
             $sort = ' ORDER BY '.$sort;
         }
 
-        $ufields = user_picture::fields('u', $extrafields);
+        $ufields = user_picture::fields('u');
         if (!empty($users)) {
             $select = "SELECT $ufields,
                               s.id AS submissionid, s.grade, s.submissioncomment,
-                              s.timemodified, s.timemarked,
-                              CASE WHEN s.timemarked > 0 AND s.timemarked >= s.timemodified THEN 1
-                                   ELSE 0 END AS status ";
-
+                              s.timemodified, s.timemarked ";
             $sql = 'FROM {user} u '.
                    'LEFT JOIN {assignment_submissions} s ON u.id = s.userid
                     AND s.assignment = '.$this->assignment->id.' '.
@@ -1416,7 +1336,6 @@
                 $currentposition = 0;
                 foreach ($ausers as $auser) {
                     if ($currentposition == $offset && $offset < $endposition) {
-                        $rowclass = null;
                         $final_grade = $grading_info->items[0]->grades[$auser->id];
                         $grademax = $grading_info->items[0]->grademax;
                         $final_grade->formatted_grade = round($final_grade->grade,2) .' / ' . round($grademax,2);
@@ -1425,8 +1344,8 @@
                             $locked_overridden = 'overridden';
                         }
 
-                        // TODO add here code if advanced grading grade must be reviewed => $auser->status=0
-
+                    /// Calculate user status
+                        $auser->status = ($auser->timemarked > 0) && ($auser->timemarked >= $auser->timemodified);
                         $picture = $OUTPUT->user_picture($auser);
 
                         if (empty($auser->submissionid)) {
@@ -1439,16 +1358,11 @@
                         ///attach file or print link to student answer, depending on the type of the assignment.
                         ///Refer to print_student_answer in inherited classes.
                             if ($auser->timemodified > 0) {
-                                $studentmodifiedcontent = $this->print_student_answer($auser->id)
-                                        . userdate($auser->timemodified);
-                                if ($assignment->timedue && $auser->timemodified > $assignment->timedue) {
-                                    $studentmodifiedcontent .= assignment_display_lateness($auser->timemodified, $assignment->timedue);
-                                    $rowclass = 'late';
-                                }
+                                $studentmodified = '<div id="ts'.$auser->id.'">'.$this->print_student_answer($auser->id)
+                                                 . userdate($auser->timemodified).'</div>';
                             } else {
-                                $studentmodifiedcontent = '&nbsp;';
+                                $studentmodified = '<div id="ts'.$auser->id.'">&nbsp;</div>';
                             }
-                            $studentmodified = html_writer::tag('div', $studentmodifiedcontent, array('id' => 'ts' . $auser->id));
                         ///Print grade, dropdown or text
                             if ($auser->timemarked > 0) {
                                 $teachermodified = '<div id="tt'.$auser->id.'">'.userdate($auser->timemarked).'</div>';
@@ -1456,11 +1370,14 @@
                                 if ($final_grade->locked or $final_grade->overridden) {
                                     $grade = '<div id="g'.$auser->id.'" class="'. $locked_overridden .'">'.$final_grade->formatted_grade.'</div>';
                                 } else if ($quickgrade) {
-                                    $attributes = array();
-                                    $attributes['tabindex'] = $tabindex++;
-                                    $menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes);
-                                    $grade = '<div id="g'.$auser->id.'">'. $menu .'</div>';
-                                } else {
+						$attributes = array();
+						$attributes['tabindex'] = $tabindex++;	
+						$grade= '<div id="g'.$auser->id.'">'
+                                         . '<textarea tabindex="'.$tabindex++.'" name="mmenu['.$auser->id.']" id="submissioncomment'
+                                         . $auser->id.'" rows="2" cols="20">'.($auser->grade).'</textarea></div>';
+                                   	 $grade = '<div id="g'.$auser->id.'">'. $grade .'</div>';
+                                } 
+				else {
                                     $grade = '<div id="g'.$auser->id.'">'.$this->display_grade($auser->grade).'</div>';
                                 }
 
@@ -1469,10 +1386,12 @@
                                 if ($final_grade->locked or $final_grade->overridden) {
                                     $grade = '<div id="g'.$auser->id.'" class="'. $locked_overridden .'">'.$final_grade->formatted_grade.'</div>';
                                 } else if ($quickgrade) {
-                                    $attributes = array();
-                                    $attributes['tabindex'] = $tabindex++;
-                                    $menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes);
-                                    $grade = '<div id="g'.$auser->id.'">'.$menu.'</div>';
+						$attributes = array();
+						$attributes['tabindex'] = $tabindex++;
+						$grade = '<div id="g'.$auser->id.'">'
+                                         . '<textarea tabindex="'.$tabindex++.'" name="mmenu['.$auser->id.']" id="submissioncomment'
+                                         . $auser->id.'" rows="2" cols="20">'.($auser->grade).'</textarea></div>';
+                                    	$grade = '<div id="g'.$auser->id.'">'.$grade.'</div>';
                                 } else {
                                     $grade = '<div id="g'.$auser->id.'">'.$this->display_grade($auser->grade).'</div>';
                                 }
@@ -1496,12 +1415,13 @@
                             if ($final_grade->locked or $final_grade->overridden) {
                                 $grade = '<div id="g'.$auser->id.'">'.$final_grade->formatted_grade . '</div>';
                                 $hassubmission = true;
-                            } else if ($quickgrade) {   // allow editing
-                                $attributes = array();
-                                $attributes['tabindex'] = $tabindex++;
-                                $menu = html_writer::select(make_grades_menu($this->assignment->grade), 'menu['.$auser->id.']', $auser->grade, array(-1=>get_string('nograde')), $attributes);
-                                $grade = '<div id="g'.$auser->id.'">'.$menu.'</div>';
-                                $hassubmission = true;
+                            } else if ($quickgrade) { 
+							$attributes = array();
+							$attributes['tabindex'] = $tabindex++;
+							$grade = '<div id="g'.$auser->id.'">'
+                                         	. '<textarea tabindex="'.$tabindex++.'" name="mmenu['.$auser->id.']" id="submissioncomment'
+                                         	. $auser->id.'" rows="2" cols="20">'.($auser->grade).'</textarea></div>';
+                                $grade = '<div id="g'.$auser->id.'">'.$grade.'</div>';
                             } else {
                                 $grade = '<div id="g'.$auser->id.'">-</div>';
                             }
@@ -1557,17 +1477,11 @@
                         }
 
                         $userlink = '<a href="' . $CFG->wwwroot . '/user/view.php?id=' . $auser->id . '&amp;course=' . $course->id . '">' . fullname($auser, has_capability('moodle/site:viewfullnames', $this->context)) . '</a>';
-                        $extradata = array();
-                        foreach ($extrafields as $field) {
-                            $extradata[] = $auser->{$field};
-                        }
-                        $row = array_merge(array($picture, $userlink), $extradata,
-                                array($grade, $comment, $studentmodified, $teachermodified,
-                                $status, $finalgrade));
+                        $row = array($picture, $userlink, $grade, $comment, $studentmodified, $teachermodified, $status, $finalgrade);
                         if ($uses_outcomes) {
                             $row[] = $outcomes;
                         }
-                        $table->add_data($row, $rowclass);
+                        $table->add_data($row);
                     }
                     $currentposition++;
                 }
@@ -1623,11 +1537,9 @@
         $mform->addElement('text', 'perpage', get_string('pagesize', 'assignment'), array('size'=>1));
         $mform->setDefault('perpage', $perpage);
 
-        if ($this->quickgrade_mode_allowed()) {
-            $mform->addElement('checkbox', 'quickgrade', get_string('quickgrade','assignment'));
-            $mform->setDefault('quickgrade', $quickgrade);
-            $mform->addHelpButton('quickgrade', 'quickgrade', 'assignment');
-        }
+        $mform->addElement('checkbox', 'quickgrade', get_string('quickgrade','assignment'));
+        $mform->setDefault('quickgrade', $quickgrade);
+        $mform->addHelpButton('quickgrade', 'quickgrade', 'assignment');
 
         $mform->addElement('submit', 'savepreferences', get_string('savepreferences'));
 
@@ -1637,58 +1549,6 @@
     }
 
     /**
-     * If the form was cancelled ('Cancel' or 'Next' was pressed), call cancel method
-     * from advanced grading (if applicable) and returns true
-     * If the form was submitted, validates it and returns false if validation did not pass.
-     * If validation passes, preprocess advanced grading (if applicable) and returns true.
-     *
-     * Note to the developers: This is NOT the correct way to implement advanced grading
-     * in grading form. The assignment grading was written long time ago and unfortunately
-     * does not fully use the mforms. Usually function is_validated() is called to
-     * validate the form and get_data() is called to get the data from the form.
-     *
-     * Here we have to push the calculated grade to $_POST['xgrade'] because further processing
-     * of the form gets the data not from form->get_data(), but from $_POST (using statement
-     * like  $feedback = data_submitted() )
-     */
-    protected function validate_and_preprocess_feedback() {
-        global $USER, $CFG;
-        require_once($CFG->libdir.'/gradelib.php');
-        if (!($feedback = data_submitted()) || !isset($feedback->userid) || !isset($feedback->offset)) {
-            return true;      // No incoming data, nothing to validate
-        }
-        $userid = required_param('userid', PARAM_INT);
-        $offset = required_param('offset', PARAM_INT);
-        $gradinginfo = grade_get_grades($this->course->id, 'mod', 'assignment', $this->assignment->id, array($userid));
-        $gradingdisabled = $gradinginfo->items[0]->grades[$userid]->locked || $gradinginfo->items[0]->grades[$userid]->overridden;
-        if ($gradingdisabled) {
-            return true;
-        }
-        $submissiondata = $this->display_submission($offset, $userid, false);
-        $mform = $submissiondata->mform;
-        $gradinginstance = $mform->use_advanced_grading();
-        if (optional_param('cancel', false, PARAM_BOOL) || optional_param('next', false, PARAM_BOOL)) {
-            // form was cancelled
-            if ($gradinginstance) {
-                $gradinginstance->cancel();
-            }
-        } else if ($mform->is_submitted()) {
-            // form was submitted (= a submit button other than 'cancel' or 'next' has been clicked)
-            if (!$mform->is_validated()) {
-                return false;
-            }
-            // preprocess advanced grading here
-            if ($gradinginstance) {
-                $data = $mform->get_data();
-                // create submission if it did not exist yet because we need submission->id for storing the grading instance
-                $submission = $this->get_submission($userid, true);
-                $_POST['xgrade'] = $gradinginstance->submit_and_get_grade($data->advancedgrading, $submission->id);
-            }
-        }
-        return true;
-    }
-
-    /**
      *  Process teacher feedback submission
      *
      * This is called by submissions() when a grading even has taken place.
@@ -1728,7 +1588,7 @@
         if (!($grading_info->items[0]->grades[$feedback->userid]->locked ||
             $grading_info->items[0]->grades[$feedback->userid]->overridden) ) {
 
-            $submission->grade      = $feedback->xgrade;
+            $submission->grade      = $feedback->ourgrade;
             $submission->submissioncomment    = $feedback->submissioncomment_editor['text'];
             $submission->teacher    = $USER->id;
             $mailinfo = get_user_preferences('assignment_mailinfo', 0);
@@ -1908,7 +1768,7 @@
                 $info->username = fullname($user, true);
                 $info->assignment = format_string($this->assignment->name,true);
                 $info->url = $CFG->wwwroot.'/mod/assignment/submissions.php?id='.$this->cm->id;
-                $info->timeupdated = userdate($submission->timemodified, '%c', $teacher->timezone);
+                $info->timeupdated = strftime('%c',$submission->timemodified);
 
                 $postsubject = $strsubmitted.': '.$info->username.' -> '.$this->assignment->name;
                 $posttext = $this->email_teachers_text($info);
@@ -1997,9 +1857,8 @@
      * @return string
      */
     function email_teachers_text($info) {
-        $posttext  = format_string($this->course->shortname, true, array('context' => $this->coursecontext)).' -> '.
-                     $this->strassignments.' -> '.
-                     format_string($this->assignment->name, true, array('context' => $this->context))."\n";
+        $posttext  = format_string($this->course->shortname).' -> '.$this->strassignments.' -> '.
+                     format_string($this->assignment->name)."\n";
         $posttext .= '---------------------------------------------------------------------'."\n";
         $posttext .= get_string("emailteachermail", "assignment", $info)."\n";
         $posttext .= "\n---------------------------------------------------------------------\n";
@@ -2015,9 +1874,9 @@
     function email_teachers_html($info) {
         global $CFG;
         $posthtml  = '<p><font face="sans-serif">'.
-                     '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$this->course->id.'">'.format_string($this->course->shortname, true, array('context' => $this->coursecontext)).'</a> ->'.
+                     '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$this->course->id.'">'.format_string($this->course->shortname).'</a> ->'.
                      '<a href="'.$CFG->wwwroot.'/mod/assignment/index.php?id='.$this->course->id.'">'.$this->strassignments.'</a> ->'.
-                     '<a href="'.$CFG->wwwroot.'/mod/assignment/view.php?id='.$this->cm->id.'">'.format_string($this->assignment->name, true, array('context' => $this->context)).'</a></font></p>';
+                     '<a href="'.$CFG->wwwroot.'/mod/assignment/view.php?id='.$this->cm->id.'">'.format_string($this->assignment->name).'</a></font></p>';
         $posthtml .= '<hr /><font face="sans-serif">';
         $posthtml .= '<p>'.get_string('emailteachermailhtml', 'assignment', $info).'</p>';
         $posthtml .= '</font><hr />';
@@ -2062,20 +1921,16 @@
                 $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/mod_assignment/submission/'.$submission->id.'/'.$filename);
                 $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'.s($filename).'</a>';
                 if ($CFG->enableportfolios && $this->portfolio_exportable() && has_capability('mod/assignment:exportownsubmission', $this->context)) {
-                    $button->set_callback_options('assignment_portfolio_caller', array('id' => $this->cm->id, 'submissionid' => $submission->id, 'fileid' => $file->get_id()), '/mod/assignment/locallib.php');
+                    $button->set_callback_options('assignment_portfolio_caller', array('id' => $this->cm->id, 'fileid' => $file->get_id()), '/mod/assignment/locallib.php');
                     $button->set_format_by_file($file);
                     $output .= $button->to_html(PORTFOLIO_ADD_ICON_LINK);
                 }
-
-                if ($CFG->enableplagiarism) {
-                    require_once($CFG->libdir.'/plagiarismlib.php');
-                    $output .= plagiarism_get_links(array('userid'=>$userid, 'file'=>$file, 'cmid'=>$this->cm->id, 'course'=>$this->course, 'assignment'=>$this->assignment));
-                    $output .= '<br />';
-                }
+                $output .= plagiarism_get_links(array('userid'=>$userid, 'file'=>$file, 'cmid'=>$this->cm->id, 'course'=>$this->course, 'assignment'=>$this->assignment));
+                $output .= '<br />';
             }
             if ($CFG->enableportfolios && count($files) > 1  && $this->portfolio_exportable() && has_capability('mod/assignment:exportownsubmission', $this->context)) {
-                $button->set_callback_options('assignment_portfolio_caller', array('id' => $this->cm->id, 'submissionid' => $submission->id), '/mod/assignment/locallib.php');
-                $output .= '<br />'  . $button->to_html(PORTFOLIO_ADD_TEXT_LINK);
+                $button->set_callback_options('assignment_portfolio_caller', array('id' => $this->cm->id), '/mod/assignment/locallib.php');
+                $output .= '<br />'  . $button->to_html();
             }
         }
 
@@ -2153,6 +2008,12 @@
      */
     function user_complete($user, $grade=null) {
         global $OUTPUT;
+        if ($grade) {
+            echo $OUTPUT->container(get_string('grade').': '.$grade->str_long_grade);
+            if ($grade->str_feedback) {
+                echo $OUTPUT->container(get_string('feedback').': '.$grade->str_feedback);
+            }
+        }
 
         if ($submission = $this->get_submission($user->id)) {
 
@@ -2179,12 +2040,6 @@
             echo $OUTPUT->box_end();
 
         } else {
-            if ($grade) {
-                echo $OUTPUT->container(get_string('grade').': '.$grade->str_long_grade);
-                if ($grade->str_feedback) {
-                    echo $OUTPUT->container(get_string('feedback').': '.$grade->str_feedback);
-                }
-            }
             print_string("notsubmittedyet", "assignment");
         }
     }
@@ -2223,10 +2078,11 @@
      * when printing this activity in a course listing.  See get_array_of_activities() in course/lib.php.
      *
      * @param $coursemodule object The coursemodule object (record).
-     * @return cached_cm_info Object used to customise appearance on course page
+     * @return object An object on information that the courses will know about (most noticeably, an icon).
+     *
      */
     function get_coursemodule_info($coursemodule) {
-        return null;
+        return false;
     }
 
     /**
@@ -2365,17 +2221,11 @@
 
 
 class mod_assignment_grading_form extends moodleform {
-    /** @var stores the advaned grading instance (if used in grading) */
-    private $advancegradinginstance;
 
     function definition() {
         global $OUTPUT;
         $mform =& $this->_form;
 
-        if (isset($this->_customdata->advancedgradinginstance)) {
-            $this->use_advanced_grading($this->_customdata->advancedgradinginstance);
-        }
-
         $formattr = $mform->getAttributes();
         $formattr['id'] = 'submitform';
         $mform->setAttributes($formattr);
@@ -2421,53 +2271,52 @@
 
     }
 
-    /**
-     * Gets or sets the instance for advanced grading
-     *
-     * @param gradingform_instance $gradinginstance
-     */
-    public function use_advanced_grading($gradinginstance = false) {
-        if ($gradinginstance !== false) {
-            $this->advancegradinginstance = $gradinginstance;
-        }
-        return $this->advancegradinginstance;
-    }
-
     function add_grades_section() {
         global $CFG;
+global $DB;
         $mform =& $this->_form;
         $attributes = array();
         if ($this->_customdata->gradingdisabled) {
             $attributes['disabled'] ='disabled';
         }
 
-        $mform->addElement('header', 'Grades', get_string('grades', 'grades'));
 
         $grademenu = make_grades_menu($this->_customdata->assignment->grade);
-        if ($gradinginstance = $this->use_advanced_grading()) {
-            $gradinginstance->get_controller()->set_grade_range($grademenu);
-            $gradingelement = $mform->addElement('grading', 'advancedgrading', get_string('grade').':', array('gradinginstance' => $gradinginstance));
-            if ($this->_customdata->gradingdisabled) {
-                $gradingelement->freeze();
-            } else {
-                $mform->addElement('hidden', 'advancedgradinginstanceid', $gradinginstance->get_id());
-            }
-        } else {
-            // use simple direct grading
-            $grademenu['-1'] = get_string('nograde');
 
-            $mform->addElement('select', 'xgrade', get_string('grade').':', $grademenu, $attributes);
-            $mform->setDefault('xgrade', $this->_customdata->submission->grade ); //@fixme some bug when element called 'grade' makes it break
-            $mform->setType('xgrade', PARAM_INT);
-        }
+        $grademenu['-1'] = get_string('nogradeanagha');
+//$mform->addElement('text', 'firstname', get_string('firstname'), 'maxlength="100" size="30"');
+
+        $mform->addElement('header', 'Grades', get_string('grades', 'grades'));
+
+ 
+$mform->addElement('text', 'ourgrade', get_string('grade'), 'maxlength="100" size="30"');//newly added line .
+ $mform->setType('ourgrade', PARAM_INT);
+
+//$data1 = new stdClass();
+//$ourgrade->grademy  = $_POST['ourgrade'];
+
+
+//$query = "insert into mdl_mygrade(grademy) Values('$ourgrade')";
+//$result=mysql_query($query) or die(mysql_error());
+
+//$data1->grademy  = 'over';
+
+//$DB->insert_record('mygrade',$ourgrade);
+
+
+
+//$DB->insert_record('mygrade', $data1);
+       // $mform->addElement('select', 'xgrade', get_string('gradeanagha').':', $grademenu, $attributes);// newly added comment
+       //$mform->setDefault('xgrade', $this->_customdata->submission->grade ); //@fixme some bug when element called 'grade' makes it break// newly added comment
+        //$mform->setType('xgrade', PARAM_INT);*/// newly added comment
+	// $mform->setType('xgrade', PARAM_INT);
 
         if (!empty($this->_customdata->enableoutcomes)) {
             foreach($this->_customdata->grading_info->outcomes as $n=>$outcome) {
                 $options = make_grades_menu(-$outcome->scaleid);
                 if ($outcome->grades[$this->_customdata->submission->userid]->locked) {
                     $options[0] = get_string('nooutcome', 'grades');
-                    $mform->addElement('static', 'outcome_'.$n.'['.$this->_customdata->userid.']', $outcome->name.':',
-                            $options[$outcome->grades[$this->_customdata->submission->userid]->grade]);
+                    echo $options[$outcome->grades[$this->_customdata->submission->userid]->grade];
                 } else {
                     $options[''] = get_string('nooutcome', 'grades');
                     $attributes = array('id' => 'menuoutcome_'.$n );
@@ -2476,8 +2325,8 @@
                     $mform->setDefault('outcome_'.$n.'['.$this->_customdata->userid.']', $outcome->grades[$this->_customdata->submission->userid]->grade );
                 }
             }
-        }
-        $course_context = get_context_instance(CONTEXT_MODULE , $this->_customdata->cm->id);
+        } 
+       $course_context = get_context_instance(CONTEXT_MODULE , $this->_customdata->cm->id);
         if (has_capability('gradereport/grader:view', $course_context) && has_capability('moodle/grade:viewall', $course_context)) {
             $grade = '<a href="'.$CFG->wwwroot.'/grade/report/grader/index.php?id='. $this->_customdata->courseid .'" >'.
                         $this->_customdata->grading_info->items[0]->grades[$this->_customdata->userid]->str_grade . '</a>';
@@ -2555,7 +2404,6 @@
         $editoroptions['noclean'] = false;
         $editoroptions['maxfiles'] = 0; //TODO: no files for now, we need to first implement assignment_feedback area, integration with gradebook, files support in quickgrading, etc. (skodak)
         $editoroptions['maxbytes'] = $this->_customdata->maxbytes;
-        $editoroptions['context'] = $this->_customdata->context;
         return $editoroptions;
     }
 
@@ -2610,11 +2458,6 @@
             }
             $data = file_postupdate_standard_editor($data, 'submissioncomment', $editoroptions, $this->_customdata->context, $editoroptions['component'], $editoroptions['filearea'], $itemid);
         }
-
-        if ($this->use_advanced_grading() && !isset($data->advancedgrading)) {
-            $data->advancedgrading = null;
-        }
-
         return $data;
     }
 }
@@ -2657,7 +2500,7 @@
 function assignment_update_instance($assignment){
     global $CFG;
 
-    $assignment->assignmenttype = clean_param($assignment->assignmenttype, PARAM_PLUGIN);
+    $assignment->assignmenttype = clean_param($assignment->assignmenttype, PARAM_SAFEDIR);
 
     require_once("$CFG->dirroot/mod/assignment/type/$assignment->assignmenttype/assignment.class.php");
     $assignmentclass = "assignment_$assignment->assignmenttype";
@@ -2674,7 +2517,7 @@
 function assignment_add_instance($assignment) {
     global $CFG;
 
-    $assignment->assignmenttype = clean_param($assignment->assignmenttype, PARAM_PLUGIN);
+    $assignment->assignmenttype = clean_param($assignment->assignmenttype, PARAM_SAFEDIR);
 
     require_once("$CFG->dirroot/mod/assignment/type/$assignment->assignmenttype/assignment.class.php");
     $assignmentclass = "assignment_$assignment->assignmenttype";
@@ -2778,10 +2621,8 @@
             /// mail is customised for the receiver.
             cron_setup_user($user, $course);
 
-            $coursecontext = get_context_instance(CONTEXT_COURSE, $submission->course);
-            $courseshortname = format_string($course->shortname, true, array('context' => $coursecontext));
-            if (!is_enrolled($coursecontext, $user->id)) {
-                echo fullname($user)." not an active participant in " . $courseshortname . "\n";
+            if (!is_enrolled(get_context_instance(CONTEXT_COURSE, $submission->course), $user->id)) {
+                echo fullname($user)." not an active participant in " . format_string($course->shortname) . "\n";
                 continue;
             }
 
@@ -2807,15 +2648,15 @@
             $assignmentinfo->assignment = format_string($submission->name,true);
             $assignmentinfo->url = "$CFG->wwwroot/mod/assignment/view.php?id=$mod->id";
 
-            $postsubject = "$courseshortname: $strassignments: ".format_string($submission->name,true);
-            $posttext  = "$courseshortname -> $strassignments -> ".format_string($submission->name,true)."\n";
+            $postsubject = "$course->shortname: $strassignments: ".format_string($submission->name,true);
+            $posttext  = "$course->shortname -> $strassignments -> ".format_string($submission->name,true)."\n";
             $posttext .= "---------------------------------------------------------------------\n";
             $posttext .= get_string("assignmentmail", "assignment", $assignmentinfo)."\n";
             $posttext .= "---------------------------------------------------------------------\n";
 
             if ($user->mailformat == 1) {  // HTML
                 $posthtml = "<p><font face=\"sans-serif\">".
-                "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$courseshortname</a> ->".
+                "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> ->".
                 "<a href=\"$CFG->wwwroot/mod/assignment/index.php?id=$course->id\">$strassignments</a> ->".
                 "<a href=\"$CFG->wwwroot/mod/assignment/view.php?id=$mod->id\">".format_string($submission->name,true)."</a></font></p>";
                 $posthtml .= "<hr /><font face=\"sans-serif\">";
@@ -3531,13 +3372,13 @@
  * when printing this activity in a course listing.  See get_array_of_activities() in course/lib.php.
  *
  * @param $coursemodule object The coursemodule object (record).
- * @return cached_cm_info An object on information that the courses will know about (most noticeably, an icon).
+ * @return object An object on information that the courses will know about (most noticeably, an icon).
+ *
  */
 function assignment_get_coursemodule_info($coursemodule) {
     global $CFG, $DB;
 
-    if (! $assignment = $DB->get_record('assignment', array('id'=>$coursemodule->instance),
-            'id, assignmenttype, name, intro, introformat')) {
+    if (! $assignment = $DB->get_record('assignment', array('id'=>$coursemodule->instance), 'id, assignmenttype, name')) {
         return false;
     }
 
@@ -3547,15 +3388,14 @@
         require_once($libfile);
         $assignmentclass = "assignment_$assignment->assignmenttype";
         $ass = new $assignmentclass('staticonly');
-        if (!($result = $ass->get_coursemodule_info($coursemodule))) {
-            $result = new cached_cm_info();
-            $result->name = $assignment->name;
-        }
-        if ($coursemodule->showdescription) {
-            // Convert intro to html. Do not filter cached version, filters run at display time.
-            $result->content = format_module_intro('assignment', $assignment, $coursemodule->id, false);
+        if ($result = $ass->get_coursemodule_info($coursemodule)) {
+            return $result;
+        } else {
+            $info = new stdClass();
+            $info->name = $assignment->name;
+            return $info;
         }
-        return $result;
+
     } else {
         debugging('Incorrect assignment type: '.$assignment->assignmenttype);
         return false;
@@ -3842,7 +3682,7 @@
  * Returns all other caps used in module
  */
 function assignment_get_extra_capabilities() {
-    return array('moodle/site:accessallgroups', 'moodle/site:viewfullnames', 'moodle/grade:managegradingforms');
+    return array('moodle/site:accessallgroups', 'moodle/site:viewfullnames');
 }
 
 /**
@@ -3860,8 +3700,6 @@
         case FEATURE_GRADE_OUTCOMES:          return true;
         case FEATURE_GRADE_HAS_GRADE:         return true;
         case FEATURE_BACKUP_MOODLE2:          return true;
-        case FEATURE_SHOW_DESCRIPTION:        return true;
-        case FEATURE_ADVANCED_GRADING:        return true;
 
         default: return null;
     }
@@ -3915,7 +3753,7 @@
 function assignment_pack_files($filesforzipping) {
         global $CFG;
         //create path for new zip file.
-        $tempzip = tempnam($CFG->tempdir.'/', 'assignment_');
+        $tempzip = tempnam($CFG->dataroot.'/temp/', 'assignment_');
         //zip files
         $zipper = new zip_packer();
         if ($zipper->archive_to_pathname($filesforzipping, $tempzip)) {
@@ -3954,12 +3792,3 @@
     );
     return $module_pagetype;
 }
-
-/**
- * Lists all gradable areas for the advanced grading methods gramework
- *
- * @return array
- */
-function assignment_grading_areas_list() {
-    return array('submission' => get_string('submissions', 'mod_assignment'));
-}