Constant name fixed and improved empty input check

diff --git a/mod/workshop/form/accumulative/edit_form.php b/mod/workshop/form/accumulative/edit_form.php
index 9643c91cc3d9b6b64a28b8565c008bb93c8fc171..41a55d686e848981c592cf94f0e630cc56642a66 100644 (file)
--- a/mod/workshop/form/accumulative/edit_form.php
+++ b/mod/workshop/form/accumulative/edit_form.php
@@ -70,7 +70,7 @@ class workshop_edit_accumulative_strategy_form extends workshop_edit_strategy_fo
 
         $mform->registerNoSubmitButton('noadddims');
         $mform->addElement('submit', 'noadddims', get_string('addmoredimensions', 'workshopform_accumulative',
-                                                                    WORKSHOP_STRATEGY_ADDDIMS));
+                workshop_accumulative_strategy::ADDDIMS));
         $mform->closeHeaderBefore('noadddims');
         $this->set_data($current);
     }

diff --git a/mod/workshop/form/accumulative/lib.php b/mod/workshop/form/accumulative/lib.php
index b0b577e26cf89e2afb504ca05e778ecfdaca8b62..1b549dae71713c58bd477d43f9c411e73a93f22f 100644 (file)
--- a/mod/workshop/form/accumulative/lib.php
+++ b/mod/workshop/form/accumulative/lib.php
@@ -84,7 +84,7 @@ class workshop_accumulative_strategy implements workshop_strategy {
         for ($i = 0; $i < $nodimensions; $i++) {
             // prepare all editor elements
             $fields = file_prepare_standard_editor($fields, 'description__idx_'.$i, $this->descriptionopts,
-                $PAGE->context, 'workshop_dimension_description', $fields->{'dimensionid__idx_'.$i});
+                $PAGE->context, 'workshopform_accumulative_description', $fields->{'dimensionid__idx_'.$i});
         }
 
         $customdata = array();
@@ -122,7 +122,7 @@ class workshop_accumulative_strategy implements workshop_strategy {
 
         for ($i=0; $i < $norepeats; $i++) {
             $record = $records[$i];
-            if (empty($record->description_editor['text'])) {
+            if (0 == strlen(trim($record->description_editor['text']))) {
                 if (!empty($record->id)) {
                     // existing record with empty description - to be deleted
                     $todelete[] = $record->id;

diff --git a/mod/workshop/form/numerrors/edit_form.php b/mod/workshop/form/numerrors/edit_form.php
index a4c0731f4df5d1641fb4e0ac96a8bad14bcfc19c..0fb2e9ad23575ff1adb0cd4bbcfd9af4a03a272c 100644 (file)
--- a/mod/workshop/form/numerrors/edit_form.php
+++ b/mod/workshop/form/numerrors/edit_form.php
@@ -101,7 +101,7 @@ class workshop_edit_numerrors_strategy_form extends workshop_edit_strategy_form
 
         $mform->registerNoSubmitButton('noadddims');
         $mform->addElement('submit', 'noadddims', get_string('addmoredimensions', 'workshopform_numerrors',
-                                                                    WORKSHOP_STRATEGY_ADDDIMS));
+                workshop_numerrors_strategy::ADDDIMS));
         $mform->closeHeaderBefore('noadddims');
         $this->set_data($current);
 

diff --git a/mod/workshop/form/numerrors/lib.php b/mod/workshop/form/numerrors/lib.php
index 8eceb3c9757d08f2445d374763fec38b502e9756..e2d8ea032deebea8ea4c181db1470af66ea5eb2c 100644 (file)
--- a/mod/workshop/form/numerrors/lib.php
+++ b/mod/workshop/form/numerrors/lib.php
@@ -128,7 +128,7 @@ class workshop_numerrors_strategy implements workshop_strategy {
 
         for ($i=0; $i < $norepeats; $i++) {
             $record = $records[$i];
-            if (empty($record->description_editor['text'])) {
+            if (0 == strlen(trim($record->description_editor['text']))) {
                 if (!empty($record->id)) {
                     // existing dimension record with empty description - to be deleted
                     $todelete[] = $record->id;