Continued:

[core.git] / framework / main / classes / helper / html / forms / class_HtmlFormHelper.php

diff --git a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
index 31fa98b0e0418f226a4408b83592560250fa2e7e..01793e5062e183892504986f38548e58b94a9350 100644 (file)
--- a/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
+++ b/framework/main/classes/helper/html/forms/class_HtmlFormHelper.php
@@ -94,7 +94,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (is_null($formId)) {
                        // Use form id from form name
                        $formId = $formName;
-               } // END - if
+               }
 
                // Set form name
                $helperInstance->setFormName($formName);
@@ -158,7 +158,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                        if ($this->ifGroupOpenedPreviously()) {
                                // Then automatically close it here
                                $this->addFormGroup();
-                       } // END - if
+                       }
 
                        // Simply close it
                        $this->formOpened = false;
@@ -182,7 +182,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<input type="text" class="form-control" id="%s_%s_field" name="%s" value="%s" />',
@@ -225,7 +225,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<input type="password" class="form-control" id="%s_%s_field" name="%s" value="%s" />',
@@ -253,7 +253,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<input type="hidden" name="%s" value="%s" />',
@@ -310,7 +310,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Set whether the check box is checked...
                $checked = ($fieldChecked ? ' checked="checked"' : ' ');
@@ -340,7 +340,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, 'reset'), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<input type="reset" class="reset_button" id="%s_reset" value="%s" />',
@@ -365,7 +365,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, 'submit'), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<input type="submit" class="submit_button" id="%s_submit" name="%s_submit" value="%s" />',
@@ -404,7 +404,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->ifGroupOpenedPreviously() === false) && ($groupId === $this->getPreviousGroupId())) {
                        // Abort here silently
                        return false;
-               } // END - if
+               }
 
                // Initialize content with closing div by default
                $content = "    </div>\n</div><!-- Group - CLOSE //-->";
@@ -432,7 +432,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                        if ($this->ifSubGroupOpenedPreviously()) {
                                // Close it here
                                $this->addFormSubGroup();
-                       } // END - if
+                       }
 
                        // Get previous group id
                        $prevGroupId = $this->getPreviousGroupId();
@@ -444,7 +444,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                        if ((!empty($groupId)) && ($groupId != $prevGroupId)) {
                                //* DEBUG: */ echo $groupId.'/'.$prevGroupId."<br />\n";
                                $this->addFormGroup($groupId, $groupText);
-                       } // END - if
+                       }
                }
        }
 
@@ -476,7 +476,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->ifSubGroupOpenedPreviously() === false) && ($subGroupId == $this->getPreviousSubGroupId())) {
                        // Abort here silently
                        return false;
-               } // END - if
+               }
 
                // Initialize content with closing div by default
                $content = "    </div>\n</div><!-- Sub group- CLOSE //-->";
@@ -509,7 +509,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                        // All call it again if sub group name is not empty
                        if ((!empty($subGroupId)) && ($subGroupId != $prevSubGroupId)) {
                                $this->addFormSubGroup($subGroupId, $subGroupText);
-                       } // END - if
+                       }
                }
        }
 
@@ -527,7 +527,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, $fieldName), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Default is no title attribute
                $titleAttribute = '';
@@ -536,7 +536,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (!empty($fieldTitle)) {
                        // Create title attribute
                        $titleAttribute = sprintf(' title="%s" data-toggle="tooltip"', $fieldTitle);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf('<label class="col-form-label" for="%s_%s_field"%s>
@@ -566,7 +566,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, 'form_notes'), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Generate the content
                $inputContent = sprintf("       <div id=\"form_note_%s\">
@@ -594,7 +594,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if (($this->formOpened === false) && ($this->formEnabled === true)) {
                        // Throw an exception
                        throw new FormClosedException (array($this, 'form_notes'), self::EXCEPTION_CLOSED_FORM);
-               } // END - if
+               }
 
                // Shall we close or open the sub group?
                if (($this->ifSubGroupOpenedPreviously() === false) && ($this->getPreviousSubGroupId() !== $selectId)) {
@@ -604,7 +604,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                                $firstEntry = sprintf("<option value=\"invalid\" disabled=\"disabled\">%s</option>\n",
                                        $firstEntry
                                );
-                       } // END - if
+                       }
 
                        // Construct the opening select tag
                        $content = sprintf("<select class=\"select_box\" id=\"%s_%s\" name=\"%s\">\n%s",
@@ -641,7 +641,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifSubGroupOpenedPreviously() === false) {
                        // Then throw an exception here
                        throw new HelperNoPreviousOpenedSubGroupException(array($this, $content), self::EXCEPTION_NO_PREVIOUS_SUB_GROUP_OPENED);
-               } // END - if
+               }
 
                // Render the content
                $content = sprintf("<option value=\"invalid\" class=\"suboption suboption_%s\" disabled=\"disabled\">%s</option>\n",
@@ -669,7 +669,7 @@ class HtmlFormHelper extends BaseHtmlHelper implements HelpableTemplate {
                if ($this->ifSubGroupOpenedPreviously() === false) {
                        // Then throw an exception here
                        throw new HelperNoPreviousOpenedSubGroupException(array($this, $content), self::EXCEPTION_NO_PREVIOUS_SUB_GROUP_OPENED);
-               } // END - if
+               }
 
                // Render the content
                $content = sprintf("<option value=\"%s\" class=\"option option_%s\">%s</option>\n",