From: agrabs <agrabs>
Date: Thu, 6 Nov 2008 16:10:04 +0000 (+0000)
Subject: MDL-17008 - added a function to access the _form member
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a627a9c17d5827d5b23bc1cdbc31249a78104b88;p=moodle.git

MDL-17008 - added a function to access the _form member
---

diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
index ed5e1624e2..faa8feb801 100644
--- a/mod/feedback/edit_item.php
+++ b/mod/feedback/edit_item.php
@@ -144,7 +144,7 @@
     $itemobj = new $itemclass();
     $item_form = &$itemobj->show_edit($item);
     
-    $i_form = &$item_form->_form;
+    $i_form = &$item_form->get_item_form();
     // $i_form->addElement('header', 'general', 'Titel');
     $i_form->addElement('hidden', 'id', $id);
     $i_form->addElement('hidden', 'itemid', isset($item->id)?$item->id:'');
diff --git a/mod/feedback/item/captcha/captcha_form.php b/mod/feedback/item/captcha/captcha_form.php
index d212342913..d05ebf9ad4 100644
--- a/mod/feedback/item/captcha/captcha_form.php
+++ b/mod/feedback/item/captcha/captcha_form.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once $CFG->libdir.'/formslib.php';
+require_once($CFG->dirroot.'/mod/feedback/item/feedback_item_form_class.php');
 
-class feedback_captcha_form extends moodleform {
+class feedback_captcha_form extends feedback_item_form {
     var $type = "captcha";
     var $requiredcheck;
     var $itemname;
diff --git a/mod/feedback/item/feedback_item_form_class.php b/mod/feedback/item/feedback_item_form_class.php
new file mode 100644
index 0000000000..178c76c903
--- /dev/null
+++ b/mod/feedback/item/feedback_item_form_class.php
@@ -0,0 +1,11 @@
+<?php
+
+require_once $CFG->libdir.'/formslib.php';
+
+class feedback_item_form extends moodleform {
+    
+    function get_item_form() {
+        return $this->_form;
+    }
+}
+?>
diff --git a/mod/feedback/item/label/label_form.php b/mod/feedback/item/label/label_form.php
index 3ebbc220b3..b79d5d7840 100644
--- a/mod/feedback/item/label/label_form.php
+++ b/mod/feedback/item/label/label_form.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once $CFG->libdir.'/formslib.php';
+require_once($CFG->dirroot.'/mod/feedback/item/feedback_item_form_class.php');
 
-class feedback_label_form extends moodleform {
+class feedback_label_form extends feedback_item_form {
     var $type = "label";
     var $area;
     
diff --git a/mod/feedback/item/multichoice/multichoice_form.php b/mod/feedback/item/multichoice/multichoice_form.php
index d0f54ae56d..585b388654 100644
--- a/mod/feedback/item/multichoice/multichoice_form.php
+++ b/mod/feedback/item/multichoice/multichoice_form.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once $CFG->libdir.'/formslib.php';
+require_once($CFG->dirroot.'/mod/feedback/item/feedback_item_form_class.php');
 
-class feedback_multichoice_form extends moodleform {
+class feedback_multichoice_form extends feedback_item_form {
     var $type = "multichoice";
     var $requiredcheck;
     var $itemname;
diff --git a/mod/feedback/item/multichoicerated/multichoicerated_form.php b/mod/feedback/item/multichoicerated/multichoicerated_form.php
index 12cc1b3dff..b049a68fdc 100644
--- a/mod/feedback/item/multichoicerated/multichoicerated_form.php
+++ b/mod/feedback/item/multichoicerated/multichoicerated_form.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once $CFG->libdir.'/formslib.php';
+require_once($CFG->dirroot.'/mod/feedback/item/feedback_item_form_class.php');
 
-class feedback_multichoicerated_form extends moodleform {
+class feedback_multichoicerated_form extends feedback_item_form {
     var $type = "multichoicerated";
     var $requiredcheck;
     var $itemname;
diff --git a/mod/feedback/item/numeric/numeric_form.php b/mod/feedback/item/numeric/numeric_form.php
index 1b99b84d2d..85b95910de 100644
--- a/mod/feedback/item/numeric/numeric_form.php
+++ b/mod/feedback/item/numeric/numeric_form.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once $CFG->libdir.'/formslib.php';
+require_once($CFG->dirroot.'/mod/feedback/item/feedback_item_form_class.php');
 
-class feedback_numeric_form extends moodleform {
+class feedback_numeric_form extends feedback_item_form {
     var $type = "numeric";
     var $requiredcheck;
     var $itemname;
diff --git a/mod/feedback/item/textarea/textarea_form.php b/mod/feedback/item/textarea/textarea_form.php
index 0a9eb50569..bde373d14e 100644
--- a/mod/feedback/item/textarea/textarea_form.php
+++ b/mod/feedback/item/textarea/textarea_form.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once $CFG->libdir.'/formslib.php';
+require_once($CFG->dirroot.'/mod/feedback/item/feedback_item_form_class.php');
 
-class feedback_textarea_form extends moodleform {
+class feedback_textarea_form extends feedback_item_form {
     var $type = "textarea";
     var $requiredcheck;
     var $itemname;
diff --git a/mod/feedback/item/textfield/textfield_form.php b/mod/feedback/item/textfield/textfield_form.php
index 454f6ac508..02d923061f 100644
--- a/mod/feedback/item/textfield/textfield_form.php
+++ b/mod/feedback/item/textfield/textfield_form.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once $CFG->libdir.'/formslib.php';
+require_once($CFG->dirroot.'/mod/feedback/item/feedback_item_form_class.php');
 
-class feedback_textfield_form extends moodleform {
+class feedback_textfield_form extends feedback_item_form {
     var $type = "textfield";
     var $requiredcheck;
     var $itemname;