Peter M. Groen / knowledgetree

Commit 8a37e96fa2b544f9fb30f14cd7dc66d2a550ce63

Authored by Neil Blakey-Milner
1 parent a1f635a5

Setting bFormDisabled allows for the form to not be created around the 

entire page.

Also, deal with the central payload possibly being a string.


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3442 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 17 additions and 6 deletions
lib/visualpatterns/PatternMainPage.inc
  View file @8a37e96
@@ -66,6 +66,8 @@ class PatternMainPage { @@ -66,6 +66,8 @@ class PatternMainPage {
66 var $additionalJavaScript; 66 var $additionalJavaScript;
67 /** whether or not to use dhtml scrolling **/ 67 /** whether or not to use dhtml scrolling **/
68 var $bScroll; 68 var $bScroll;
  69 +
  70 + var $bFormDisabled = false;
69 71
70 72
71 function PatternMainPage() { 73 function PatternMainPage() {
@@ -169,8 +171,10 @@ class PatternMainPage { @@ -169,8 +171,10 @@ class PatternMainPage {
169 "</div>\n"; 171 "</div>\n";
170 } 172 }
171 173
172 - $sToRender .= "<form name=\"MainForm\" " . (isset($this->sFormEncType) ? "enctype=\"$this->sFormEncType\" " : " ") . " action=\"".$this->sFormAction."\" method=\"$this->sSubmitMethod\" " . (($this->bHasRequiredFields) ? "onsubmit=\"return validateForm(this)\" " : " ") . ">\n" .  
173 - "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"700\" height=\"$default->pageHeight\">\n " . 174 + if ($this->bFormDisabled === false) {
  175 + $sToRender .= "<form name=\"MainForm\" " . (isset($this->sFormEncType) ? "enctype=\"$this->sFormEncType\" " : " ") . " action=\"".$this->sFormAction."\" method=\"$this->sSubmitMethod\" " . (($this->bHasRequiredFields) ? "onsubmit=\"return validateForm(this)\" " : " ") . ">\n";
  176 + }
  177 + $sToRender .= "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"700\" height=\"$default->pageHeight\">\n " .
174 "<tr>\n". 178 "<tr>\n".
175 "<td height=\"0\" valign=\"top\" " . (isset($this->sNorthWestPayloadBackGroundColour) ? " bgcolor=\"" . $this->sNorthWestPayloadBackGroundColour . "\"" : "") . ">\n"; 179 "<td height=\"0\" valign=\"top\" " . (isset($this->sNorthWestPayloadBackGroundColour) ? " bgcolor=\"" . $this->sNorthWestPayloadBackGroundColour . "\"" : "") . ">\n";
176 if (isset($this->oNorthWestPayload)) { 180 if (isset($this->oNorthWestPayload)) {
@@ -212,7 +216,11 @@ class PatternMainPage { @@ -212,7 +216,11 @@ class PatternMainPage {
212 } 216 }
213 $_SESSION['KTErrorMessage'] = array(); 217 $_SESSION['KTErrorMessage'] = array();
214 } 218 }
215 - $sToRender = $sToRender . "\n" . $this->oCentralPayload->render() . "\n"; 219 + if (is_string($this->oCentralPayload)) {
  220 + $sToRender = $sToRender . "\n" . $this->oCentralPayload . "\n";
  221 + } else {
  222 + $sToRender = $sToRender . "\n" . $this->oCentralPayload->render() . "\n";
  223 + }
216 } else { 224 } else {
217 $sToRender = $sToRender . "\nCentral payload not set\n"; 225 $sToRender = $sToRender . "\nCentral payload not set\n";
218 } 226 }
@@ -222,9 +230,12 @@ class PatternMainPage { @@ -222,9 +230,12 @@ class PatternMainPage {
222 } 230 }
223 $sToRender = $sToRender . "</td>\n" . 231 $sToRender = $sToRender . "</td>\n" .
224 "</tr>\n" . 232 "</tr>\n" .
225 - "</table>\n" .  
226 - "</form>\n" .  
227 - "</body>\n" . 233 + "</table>\n";
  234 +
  235 + if ($this->bFormDisabled === false) {
  236 + $sToRender .= "</form>\n";
  237 + }
  238 + $sToRender .= "</body>\n" .
228 "</html>\n"; 239 "</html>\n";
229 echo $sToRender; 240 echo $sToRender;
230 } 241 }