Index: scales.php
===================================================================
RCS file: /cvsroot/moodle/moodle/course/scales.php,v
retrieving revision 1.25
diff -u -r1.25 scales.php
--- scales.php	20 Sep 2006 20:31:36 -0000	1.25
+++ scales.php	19 Oct 2006 11:25:26 -0000
@@ -1,8 +1,9 @@
 <?php // $Id: scales.php,v 1.25 2006/09/20 20:31:36 skodak Exp $
       // Allows a creator to edit custom scales, and also display help about scales
-
     require_once("../config.php");
     require_once("lib.php");
+    include("scales_form.php");
+
 
     $id          = required_param('id', PARAM_INT);               // course id
     $scaleid     = optional_param('scaleid', 0, PARAM_INT);       // scale id
@@ -11,6 +12,11 @@
     $description = optional_param('description', '', PARAM_CLEAN);// scale description
     $list        = optional_param('list', 0, PARAM_BOOL);         // show listing in help window
 
+    
+
+    
+    //$mform = new scales_form('scales.php','');
+
     if (! $course = get_record("course", "id", $id)) {
         error("Course ID was incorrect");
     }
@@ -46,24 +52,38 @@
     /// If scale data is being submitted, then save it and continue
     $focus = "";
     $errors = NULL;
+    if ($action == "edit") {
+
+            if (! $scale = get_record("scale", "id", $scaleid)) {
+                error("Scale ID was incorrect");
 
-    if ($action == 'sendform' and confirm_sesskey()) {
-        if ($form = data_submitted()) {
-            if (empty($form->name)) {
-                $errors[$scaleid]->name = true;
-                $focus = "form$scaleid.save";
-            }
-            if (empty($form->scalescale)) {
-                $errors[$scaleid]->scalescale = true;
-                $focus = "form$scaleid.save";
             }
+						
+        } else {
+            $scale = new object();
+            $scale->id = 0;
+            $scale->courseid = $course->id;
+            $scale->name = "";
+            $scale->scale = "";
+            $scale->description = "";
+			
+
+        }
 
-            if (!$errors) {
+$mform_post = new scales_form('scales.php',compact('scale','course','strname','strscale','strsavechanges','strdescription'));
+
+    if ($action == 'sendform' ) {
+		
+
+        if ($formform = $mform_post->data_submitted()) {
+
+            
+               if (!$errors) {
                 $newscale=NULL;
-                $newscale->name = $form->name;
-                $newscale->scale = $form->scalescale;
-                $newscale->description = $form->description;
-                $newscale->courseid = $form->courseid;
+                $newscale->name = $formform->name;
+                $newscale->scale = $formform->scalescale;
+                $newscale->description = $formform->description;
+                $newscale->courseid = $formform->courseid;
                 $newscale->userid = $USER->id;
                 $newscale->timemodified = time();
 
@@ -89,13 +109,14 @@
                 }
             }
         }
+		
     }
 
     //If action is details, show the popup info
     if ($action == "details") {
         //Check for teacher edit
            require_capability('moodle/course:managescales', $context);
-       
+
         //Check for scale
         if (! $scale = get_record("scale", "id", $scaleid)) {
             error("Scale ID was incorrect");
@@ -131,12 +152,15 @@
         $sesskey = !empty($USER->id) ? $USER->sesskey : '';
 
            require_capability('moodle/course:managescales', $context);
-           
+
         //Check for scale if action = edit
-        if ($action == "edit") {
+        /*if ($action == "edit") {
+
             if (! $scale = get_record("scale", "id", $scaleid)) {
                 error("Scale ID was incorrect");
+
             }
+						
         } else {
             $scale = new object();
             $scale->id = 0;
@@ -144,7 +168,10 @@
             $scale->name = "";
             $scale->scale = "";
             $scale->description = "";
+			
+
         }
+		*/
 
         //Calculate the uses
         if ($scale->courseid == 0) {
@@ -177,55 +204,11 @@
             $scale->scale = $form->scalescale;
             $scale->description = $form->description;
         }
-        echo "<form method=\"post\" action=\"scales.php\" name=\"form$scale->id\">";
-        echo "<table cellpadding=\"9\" cellspacing=\"0\" align=\"center\" class=\"generalbox\">";
-        echo "<tr valign=\"top\">";
-        if (!empty($errors[$scale->id]->name)) {
-            $class = "class=\"highlight\"";
-        } else {
-            $class = "";
-        }
-        echo "<td align=\"right\"><b>$strname:</b></td>";
-        echo "<td $class><input type=\"text\" name=\"name\" size=\"50\" value=\"".s($scale->name)."\" />";
-        echo "</td>";
-        echo "</tr>";
-        echo "<tr valign=\"top\">";
-        if (!empty($errors[$scale->id]->scalescale)) {
-            $class = "class=\"highlight\"";
-        } else {
-            $class = "";
-        }
-        echo "<td align=\"right\"><b>$strscale:</b></td>";
-        echo "<td $class><textarea name=\"scalescale\" cols=\"50\" rows=\"2\" wrap=\"virtual\">".s($scale->scale)."</textarea>";
-        echo "</td>";
-        echo "</tr>";
-        echo "<tr valign=\"top\">";
-        echo "<td align=\"right\"><b>$strdescription:</b>";
-        helpbutton("text", $strhelptext);
-        echo "</td>";
-        echo "<td><textarea name=\"description\" cols=\"50\" rows=\"8\" wrap=\"virtual\">".s($scale->description)."</textarea>";
-        echo "</td>";
-        echo "</tr>";
-        echo "<tr>";
-        if ($scale->id) {
-            echo "<tr valign=\"top\">";
-            echo "<td align=\"right\">";
-            echo "</td>";
-            echo "<td>".get_string("usedinnplaces","",$scale_uses);
-            echo "</td>";
-            echo "</tr>";
-        }
-        echo "<tr>";
-        echo "<td colspan=\"2\" align=\"center\">";
-        echo "<input type=\"hidden\" name=\"id\" value=\"$course->id\" />";
-        echo "<input type=\"hidden\" name=\"sesskey\" value=\"$sesskey\" />";
-        echo "<input type=\"hidden\" name=\"courseid\" value=\"$scale->courseid\" />";
-        echo "<input type=\"hidden\" name=\"scaleid\" value=\"$scale->id\" />";
-        echo "<input type=\"hidden\" name=\"action\" value=\"sendform\" />";
-        echo "<input type=\"submit\" name=\"save\" value=\"$strsavechanges\" />";
-        echo "</td></tr></table>";
-        echo "</form>";
-        echo "<br />";
+
+       
+        
+        $mform_post->display();
+
 
         print_footer($course);
 
@@ -373,20 +356,18 @@
 
 /// Print out the main page
 
-    print_header("$course->shortname: $strscales", "$course->fullname", 
-                 "<a href=\"view.php?id=$course->id\">$course->shortname</a> 
+    print_header("$course->shortname: $strscales", "$course->fullname",
+                 "<a href=\"view.php?id=$course->id\">$course->shortname</a>
                   -> $strscales");
 
     print_heading_with_help($strscales, "scales");
 
-    $options = array();
-    $options['id'] = $course->id;
-    $options['scaleid'] = 0;
-    $options['action'] = 'new';
-
-    print_simple_box_start('center');
-    print_single_button($CFG->wwwroot.'/course/scales.php',$options,$srtcreatenewscale,'POST');
-    print_simple_box_end();
+    $mform = new scales_form_add('scales.php',compact('course'));
+
+    //khirod
+    $mform->display();
+
+    //print_simple_box_end();
     echo "<p>";
 
     if (!empty($notify)) {