fixed issue MDL-14531

added an option to switch autonumbering on or off

diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php
index 67192edd12a7c8d48197f998d866d2d53b5beeb6..7ce9cd9cd9ecaa1b0e925412ff8c6c081bd2ea1a 100644 (file)
--- a/mod/feedback/analysis.php
+++ b/mod/feedback/analysis.php
@@ -146,7 +146,14 @@
             $itemclass = 'feedback_item_'.$item->typ;
             //get the instance of the item-class
             $itemobj = new $itemclass();
-            $itemnr = $itemobj->print_analysed($item, $itemnr, $mygroupid);
+            $itemnr++;
+            if($feedback->autonumbering) {
+                $printnr = $itemnr.'.';
+            } else {
+                $printnr = '';
+            }
+            $itemobj->print_analysed($item, $printnr, $mygroupid);
+            // $itemnr = $itemobj->print_analysed($item, $itemnr, $mygroupid);
             echo '</table>';
         }
     }else {

diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index 2088aadb62c267d529bb265cbb00c3a333027dc9..a78cbda8bf2e27b3630aa8aa25d29c9d2260d0f6 100644 (file)
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -169,7 +169,13 @@
             $itemclass = 'feedback_item_'.$item->typ;
             //get the instance of the item-class
             $itemobj = new $itemclass();
-            $itemnr = $itemobj->print_analysed($item, $itemnr, $mygroupid, $coursefilter);
+            $itemnr++;
+            if($feedback->autonumbering) {
+                $printnr = $itemnr.'.';
+            } else {
+                $printnr = '';
+            }
+            $itemobj->print_analysed($item, $printnr, $mygroupid, $coursefilter);
             if (eregi('rated$', $item->typ)) {
                  echo '<tr><td colspan="2"><a href="#" onclick="setcourseitemfilter('.$item->id.',\''.$item->typ.'\'); return false;">'.
                     get_string('sort_by_course', 'feedback').'</a></td></tr>'; 

diff --git a/mod/feedback/backuplib.php b/mod/feedback/backuplib.php
index f66ace3c322726846810119a6503a72f47efb750..e9fc46ab95cb888da1858f2be31b7132bba2e6de 100644 (file)
--- a/mod/feedback/backuplib.php
+++ b/mod/feedback/backuplib.php
@@ -62,6 +62,7 @@
       fwrite ($bf,full_tag("ANONYMOUS",4,false,$feedback->anonymous));
       fwrite ($bf,full_tag("EMAILNOTIFICATION",4,false,$feedback->email_notification));
       fwrite ($bf,full_tag("MULTIPLESUBMIT",4,false,$feedback->multiple_submit));
+      fwrite ($bf,full_tag("AUTONUMBERING",4,false,$feedback->autonumbering));
       fwrite ($bf,full_tag("PAGEAFTERSUB",4,false,$feedback->page_after_submit));
       fwrite ($bf,full_tag("PUBLISHSTATS",4,false,$feedback->publish_stats));
       fwrite ($bf,full_tag("TIMEOPEN",4,false,$feedback->timeopen));

diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index 062ec413eff137e5ce177c8a80b50aca96c21962..0fc3919b735197cbeeffcf584b368324cdf1199d 100644 (file)
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -325,9 +325,9 @@
                         }
                     }
                     echo '<tr>';
-                    if($feedbackitem->hasvalue == 1) {
+                    if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
                         $itemnr++;
-                        echo '<td valign="top">' . $itemnr . '.)&nbsp;</td>';
+                        echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
                     } else {
                         echo '<td>&nbsp;</td>';
                     }

diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 1ececf702afaf140fca66a8528c862a3884b6cbf..aa29e8e7cd64e33a130dbd20084ede1fd09da177 100644 (file)
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -300,9 +300,9 @@
                         }
                     }
                     echo '<tr>';
-                    if($feedbackitem->hasvalue == 1) {
+                    if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
                         $itemnr++;
-                        echo '<td valign="top">' . $itemnr . '.)&nbsp;</td>';
+                        echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
                     } else {
                         echo '<td>&nbsp;</td>';
                     }

diff --git a/mod/feedback/db/install.xml b/mod/feedback/db/install.xml
index d04f07b73fdf59fe9a217c2f69ea64d17d1cde43..8db4df76783392a1fe3842abc3f2303d2339904a 100644 (file)
--- a/mod/feedback/db/install.xml
+++ b/mod/feedback/db/install.xml
@@ -9,7 +9,8 @@
         <FIELD NAME="summary" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="name" NEXT="anonymous"/>
         <FIELD NAME="anonymous" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="summary" NEXT="email_notification"/>
         <FIELD NAME="email_notification" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="anonymous" NEXT="multiple_submit"/>
-        <FIELD NAME="multiple_submit" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="email_notification" NEXT="page_after_submit"/>
+        <FIELD NAME="multiple_submit" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="email_notification" NEXT="autonumbering"/>
+        <FIELD NAME="autonumbering" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="1" SEQUENCE="false" ENUM="false" PREVIOUS="multiple_submit" NEXT="page_after_submit"/>
         <FIELD NAME="page_after_submit" TYPE="text" LENGTH="small" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="multiple_submit" NEXT="publish_stats"/>
         <FIELD NAME="publish_stats" TYPE="int" LENGTH="1" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="page_after_submit" NEXT="timeopen"/>
         <FIELD NAME="timeopen" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="publish_stats" NEXT="timeclose"/>

diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php
index b37dc83c26b12af76470f6322c4f20deb7415785..9da23720ce1e651ea6c94a043628527c5ca23dab 100644 (file)
--- a/mod/feedback/db/upgrade.php
+++ b/mod/feedback/db/upgrade.php
@@ -199,15 +199,14 @@ function xmldb_feedback_upgrade($oldversion=0) {
         $result = $result && insert_record('log_display', $new_log_display);
     }
 
-/// And upgrade begins here. For each one, you'll need one 
-/// block of code similar to the next one. Please, delete 
-/// this comment lines once this file start handling proper
-/// upgrade code.
-
-/// if ($result && $oldversion < YYYYMMDD00) { //New version in version.php
-///      $result = result of "/lib/ddllib.php" function calls
-/// }
-
+    if ($result && $oldversion < 2008042900) {
+        /// Define field autonumbering to be added to feedback
+        $table = new XMLDBTable('feedback');
+        $field = new XMLDBField('autonumbering');
+        $field->setAttributes(XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '1', 'multiple_submit');
+        /// Launch add field2
+        $result = $result && add_field($table, $field);
+    }
     return $result;
 }
 

diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index 33e1c660aae15333c5ff9dcfb65e895325288e52..13a7d5599f610c3fb55f7b1ea253811acc31e6f7 100644 (file)
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -248,9 +248,9 @@
                 }
                 echo '<tr>';
                 //items without value only are labels
-                if($feedbackitem->hasvalue == 1) {
+                if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
                     $itemnr++;
-                    echo '<td valign="top">' . $itemnr . '.)&nbsp;</td>';
+                    echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
                 } else {
                     echo '<td>&nbsp;</td>';
                 }

diff --git a/mod/feedback/item/captcha/lib.php b/mod/feedback/item/captcha/lib.php
index ab1ff6718ddfcc79041f0d22f1905899b55659b1..b94735d5ff490a304f9be9ae4d1764715f618a43 100644 (file)
--- a/mod/feedback/item/captcha/lib.php
+++ b/mod/feedback/item/captcha/lib.php
@@ -38,7 +38,7 @@ class feedback_item_captcha extends feedback_item_base {
         return '';
     }
 
-    function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
+    function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
         return $itemnr;
     }
 

diff --git a/mod/feedback/item/feedback_item_class.php b/mod/feedback/item/feedback_item_class.php
index 1047fa7cbbd5c4236a063e582f854f2fdc191d9d..33d64d6d53858ac76aff26ec4f665e82567ebda4 100644 (file)
--- a/mod/feedback/item/feedback_item_class.php
+++ b/mod/feedback/item/feedback_item_class.php
@@ -51,12 +51,12 @@ class feedback_item_base {
 
     /**
      * @param $item the db-object from feedback_item
-     * @param integer $itemnr
+     * @param string $itemnr
      * @param integer $groupid
      * @param integer $courseid
      * @return integer the new itemnr
     */
-    function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
+    function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
       return 0;
     }
 

diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
index b342a0d24ecf396ab76cd30daffd0d80bf02ebbe..43e7f709d6216a9b8d0213a430e432dadeaf7589 100644 (file)
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -133,7 +133,7 @@ class feedback_item_multichoice extends feedback_item_base {
         return $printval;
     }
 
-    function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
+    function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
         $sep_dec = get_string('separator_decimal', 'feedback');
         if(substr($sep_dec, 0, 2) == '[['){
             $sep_dec = FEEDBACK_DECIMAL;
@@ -146,9 +146,9 @@ class feedback_item_multichoice extends feedback_item_base {
             
         $analysedItem = $this->get_analysed($item, $groupid, $courseid);
         if($analysedItem) {
-            $itemnr++;
+            // $itemnr++;
             $itemname = stripslashes($analysedItem[1]);
-            echo '<tr><th colspan="2" align="left">'. $itemnr . '.)&nbsp;' . $itemname .'</th></tr>';
+            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;' . $itemname .'</th></tr>';
             $analysedVals = $analysedItem[2];
             $pixnr = 0;
             foreach($analysedVals as $val) {
@@ -164,7 +164,7 @@ class feedback_item_multichoice extends feedback_item_base {
                 echo '<tr><td align="left" valign="top">-&nbsp;&nbsp;' . trim($val->answertext) . ':</td><td align="left" style="width: '.FEEDBACK_MAX_PIX_LENGTH.'"><img alt="'.$intvalue.'" src="'.$pix.'" height="5" width="'.$pixwidth.'" />&nbsp;' . $val->answercount . (($val->quotient > 0)?'&nbsp;('. $quotient . '&nbsp;%)':'').'</td></tr>';
             }
         }
-        return $itemnr;
+        // return $itemnr;
     }
 
     function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) {

diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php
index f896956d2de7e93d316fc92250d41d898906fa38..e861281b60f64d800d7e424b54d01dc294349837 100644 (file)
--- a/mod/feedback/item/multichoicerated/lib.php
+++ b/mod/feedback/item/multichoicerated/lib.php
@@ -109,7 +109,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
         return $printval;
     }
 
-    function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
+    function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
         $sep_dec = get_string('separator_decimal', 'feedback');
         if(substr($sep_dec, 0, 2) == '[['){
             $sep_dec = FEEDBACK_DECIMAL;
@@ -123,8 +123,8 @@ class feedback_item_multichoicerated extends feedback_item_base {
         $analysedItem = $this->get_analysed($item, $groupid, $courseid);
         if($analysedItem) {
             //echo '<table>';
-            $itemnr++;
-            echo '<tr><th colspan="2" align="left">'. $itemnr . '.)&nbsp;' . stripslashes($analysedItem[1]) .'</th></tr>';
+            // $itemnr++;
+            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;' . stripslashes($analysedItem[1]) .'</th></tr>';
             $analysedVals = $analysedItem[2];
             $pixnr = 0;
             $avg = 0.0;
@@ -146,7 +146,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
             echo '<tr><td align="left" colspan="2"><b>'.get_string('average', 'feedback').': '.$avg.'</b></td></tr>';
             //echo '</table>';
         }
-        return $itemnr;
+        // return $itemnr;
     }
 
     function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) {

diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php
index 28a9731949425347dea5770e332192b0ef3221c3..8acc3aff29c75e9eb0f1461720bf7bc86260484b 100644 (file)
--- a/mod/feedback/item/numeric/lib.php
+++ b/mod/feedback/item/numeric/lib.php
@@ -68,7 +68,7 @@ class feedback_item_numeric extends feedback_item_base {
         return $value->value;
     }
 
-    function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
+    function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
         $sep_dec = get_string('separator_decimal', 'feedback');
         if(substr($sep_dec, 0, 2) == '[['){
             $sep_dec = FEEDBACK_DECIMAL;
@@ -84,16 +84,20 @@ class feedback_item_numeric extends feedback_item_base {
 
         if(isset($values->data) AND is_array($values->data)) {
             //echo '<table>';2
-            $itemnr++;
-            echo '<tr><th colspan="2" align="left">'. $itemnr . '.)&nbsp;' . stripslashes($item->name) .'</th></tr>';
+            // $itemnr++;
+            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;' . stripslashes($item->name) .'</th></tr>';
             foreach($values->data as $value) {
                 echo '<tr><td colspan="2" valign="top" align="left">-&nbsp;&nbsp;' . $value . '</td></tr>';
             }
             //echo '</table>';
-            $avg = number_format($values->avg, 2, $sep_dec, $sep_thous);
+            if(isset($values->avg)) {
+                $avg = number_format($values->avg, 2, $sep_dec, $sep_thous);
+            } else {
+                $avg = number_format(0, 2, $sep_dec, $sep_thous);
+            }
             echo '<tr><td align="left" colspan="2"><b>'.get_string('average', 'feedback').': '.$avg.'</b></td></tr>';
         }
-        return $itemnr;
+        // return $itemnr;
     }
 
     function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) {

diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php
index e70995eadc09dcd59280ebf1e577438daa8c5374..bbe9fbe4417e92045530c88d0cb84fbb44f34cc6 100644 (file)
--- a/mod/feedback/item/textarea/lib.php
+++ b/mod/feedback/item/textarea/lib.php
@@ -58,18 +58,18 @@ class feedback_item_textarea extends feedback_item_base {
         return $value->value;
     }
 
-    function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
+    function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
         $values = feedback_get_group_values($item, $groupid, $courseid);
         if($values) {
             //echo '<table>';2
-            $itemnr++;
-            echo '<tr><th colspan="2" align="left">'. $itemnr . '.)&nbsp;' . stripslashes_safe($item->name) .'</th></tr>';
+            // $itemnr++;
+            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;' . stripslashes_safe($item->name) .'</th></tr>';
             foreach($values as $value) {
                 echo '<tr><td valign="top" align="left">-&nbsp;&nbsp;</td><td align="left" valign="top">' . str_replace("\n", '<br />', $value->value) . '</td></tr>';
             }
             //echo '</table>';
         }
-        return $itemnr;
+        // return $itemnr;
     }
 
     function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) {

diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php
index 0e3ce6014780f853080271094f9e7f842f8bf604..998f477160a6370aa8b763f1f5b2ceb792233204 100644 (file)
--- a/mod/feedback/item/textfield/lib.php
+++ b/mod/feedback/item/textfield/lib.php
@@ -57,18 +57,18 @@ class feedback_item_textfield extends feedback_item_base {
         return $value->value;
     }
 
-    function print_analysed($item, $itemnr = 0, $groupid = false, $courseid = false) {
+    function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) {
         $values = feedback_get_group_values($item, $groupid, $courseid);
         if($values) {
             //echo '<table>';2
-            $itemnr++;
-            echo '<tr><th colspan="2" align="left">'. $itemnr . '.)&nbsp;' . stripslashes_safe($item->name) .'</th></tr>';
+            // $itemnr++;
+            echo '<tr><th colspan="2" align="left">'. $itemnr . '&nbsp;' . stripslashes_safe($item->name) .'</th></tr>';
             foreach($values as $value) {
                 echo '<tr><td colspan="2" valign="top" align="left">-&nbsp;&nbsp;' . str_replace("\n", '<br />', $value->value) . '</td></tr>';
             }
             //echo '</table>';
         }
-        return $itemnr;
+        // return $itemnr;
     }
 
     function excelprint_item(&$worksheet, $rowOffset, $item, $groupid, $courseid = false) {

diff --git a/mod/feedback/mod_form.php b/mod/feedback/mod_form.php
index b503a321dbdf8586257e2e7ba1adb0bae2631371..6076a9f24fdedbc08f18e14932b83f3b964e50f7 100644 (file)
--- a/mod/feedback/mod_form.php
+++ b/mod/feedback/mod_form.php
@@ -69,10 +69,13 @@ class mod_feedback_mod_form extends moodleform_mod {
             $multiple_submit_value = $feedback->multiple_submit ? get_string('yes') : get_string('no');
             $mform->addElement('text', 'multiple_submit_static', get_string('multiple_submit', 'feedback'), array('size'=>'4','disabled'=>'disabled', 'value'=>$multiple_submit_value));
             $mform->addElement('hidden', 'multiple_submit', '');
+            $mform->setHelpButton('multiple_submit_static', array('multiplesubmit', get_string('multiple_submit', 'feedback'), 'feedback'));
         }else {
             $mform->addElement('selectyesno', 'multiple_submit', get_string('multiple_submit', 'feedback'));
+            $mform->setHelpButton('multiple_submit', array('multiplesubmit', get_string('multiple_submit', 'feedback'), 'feedback'));
         }
-        $mform->setHelpButton('multiple_submit', array('multiplesubmit', get_string('multiple_submit', 'feedback'), 'feedback'));
+        $mform->addElement('selectyesno', 'autonumbering', get_string('autonumbering', 'feedback'));
+        $mform->setHelpButton('autonumbering', array('autonumbering', get_string('autonumbering', 'feedback'), 'feedback'));
         
         //-------------------------------------------------------------------------------
         $mform->addElement('header', 'aftersubmithdr', get_string('after_submit', 'feedback'));

diff --git a/mod/feedback/print.php b/mod/feedback/print.php
index dd5f2af27c8a32d47b5b4dd490d6376d41bd5ddb..7a452c4ef00fc9e3f3d317ce2608cbcd7bc2036f 100644 (file)
--- a/mod/feedback/print.php
+++ b/mod/feedback/print.php
@@ -72,9 +72,9 @@
             $itempos++;
             echo '<tr>';
             //Items without value only are labels
-            if($feedbackitem->hasvalue == 1) {
+            if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
                 $itemnr++;
-                echo '<td valign="top">' . $itemnr . '.)&nbsp;</td>';
+                echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
             } else {
                 echo '<td>&nbsp;</td>';
             }

diff --git a/mod/feedback/restorelib.php b/mod/feedback/restorelib.php
index abe1d063808e2934397680ddad0d38db0fd425e6..884f78866b92679b2f9fcae1b457e017d02d408f 100644 (file)
--- a/mod/feedback/restorelib.php
+++ b/mod/feedback/restorelib.php
@@ -54,6 +54,7 @@
             $feedback->anonymous = backup_todb($info['MOD']['#']['ANONYMOUS']['0']['#']);
             $feedback->email_notification = backup_todb($info['MOD']['#']['EMAILNOTIFICATION']['0']['#']);
             $feedback->multiple_submit = backup_todb($info['MOD']['#']['MULTIPLESUBMIT']['0']['#']);
+            $feedback->autonumbering = backup_todb($info['MOD']['#']['AUTONUMBERING']['0']['#']);
             $feedback->page_after_submit = backup_todb($info['MOD']['#']['PAGEAFTERSUB']['0']['#']);
             $feedback->publish_stats = backup_todb($info['MOD']['#']['PUBLISHSTATS']['0']['#']);
             $feedback->timeopen = backup_todb($info['MOD']['#']['TIMEOPEN']['0']['#']);

diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index 07bcf2b1f10b1d8b108a45ddcf4ec198bc41704b..d81078ce5e08a90cc467548f26c1156dc669ba3b 100644 (file)
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -266,9 +266,9 @@
                 //get the values
                 $value = get_record_select('feedback_value','completed ='.$feedbackcompleted->id.' AND item='.$feedbackitem->id);
                 echo '<tr>';
-                if($feedbackitem->hasvalue == 1) {
+                if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
                     $itemnr++;
-                    echo '<td valign="top">' . $itemnr . '.)&nbsp;</td>';
+                    echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
                 } else {
                     echo '<td>&nbsp;</td>';
                 }

diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
index 44918f3078145499851498c328d8b7f3685496bd..74f3e4e602f2e5a245341936a88e40ada8e436c8 100644 (file)
--- a/mod/feedback/show_entries_anonym.php
+++ b/mod/feedback/show_entries_anonym.php
@@ -149,9 +149,9 @@
                 //get the values
                 $value = get_record_select('feedback_value','completed ='.$feedbackcompleted->id.' AND item='.$feedbackitem->id);
                 echo '<tr>';
-                if($feedbackitem->hasvalue == 1) {
+                if($feedbackitem->hasvalue == 1 AND $feedback->autonumbering) {
                     $itemnr++;
-                    echo '<td valign="top">' . $itemnr . '.)&nbsp;</td>';
+                    echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
                 } else {
                     echo '<td>&nbsp;</td>';
                 }

diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php
index d46223cb6aec08757fd0b14fa3091362609f1385..39053ac13c02e275dcd4263d8293c500ca0f60c8 100644 (file)
--- a/mod/feedback/use_templ.php
+++ b/mod/feedback/use_templ.php
@@ -101,9 +101,9 @@
         echo '<div align="center"><table>';
         foreach($templateitems as $templateitem){
             echo '<tr>';
-            if($templateitem->hasvalue == 1) {
+            if($templateitem->hasvalue == 1 AND $feedback->autonumbering) {
                 $itemnr++;
-                echo '<td valign="top">' . $itemnr . '.)&nbsp;</td>';
+                echo '<td valign="top">' . $itemnr . '.&nbsp;</td>';
             } else {
                 echo '<td>&nbsp;</td>';
             }

diff --git a/mod/feedback/version.php b/mod/feedback/version.php
index ed9207426b73aebc74939ff67aa1e2d2304e54b5..d7af244cd087de94689e6207622f5655e763982a 100644 (file)
--- a/mod/feedback/version.php
+++ b/mod/feedback/version.php
@@ -10,7 +10,7 @@
 */
 
    
-    $module->version = 2008042802; // The current module version (Date: YYYYMMDDXX)
+    $module->version = 2008042900; // The current module version (Date: YYYYMMDDXX)
     $module->requires = 2007101503;  // Requires this Moodle version
     $feedback_version_intern = 1; //this version is used for restore older backups
     $module->cron = 0; // Period for cron to check this module (secs)