From eabe229959b2e7dad7b5097db8b0c3e931d2c01a Mon Sep 17 00:00:00 2001
From: David Mudrak <david.mudrak@gmail.com>
Date: Mon, 4 Jan 2010 18:15:14 +0000
Subject: [PATCH] Constant name fixed and improved empty input check

---
 mod/workshop/form/accumulative/edit_form.php | 2 +-
 mod/workshop/form/accumulative/lib.php       | 4 ++--
 mod/workshop/form/numerrors/edit_form.php    | 2 +-
 mod/workshop/form/numerrors/lib.php          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mod/workshop/form/accumulative/edit_form.php b/mod/workshop/form/accumulative/edit_form.php
index 9643c91cc3..41a55d686e 100644
--- 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 b0b577e26c..1b549dae71 100644
--- 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 a4c0731f4d..0fb2e9ad23 100644
--- 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 8eceb3c975..e2d8ea032d 100644
--- 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;
-- 
2.39.5