Minahito
minah****@users*****
2006年 10月 11日 (水) 17:14:11 JST
Index: xoops2jp/html/class/xoopsform/formtextdateselect.php
diff -u xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.4 xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.4.2.1
--- xoops2jp/html/class/xoopsform/formtextdateselect.php:1.2.8.4 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formtextdateselect.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formtextdateselect.php,v 1.2.8.4 2006/09/22 15:47:21 minahito Exp $
+// $Id: formtextdateselect.php,v 1.2.8.4.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -58,18 +58,19 @@
function render()
{
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_textdateselect.html");
$renderTarget->setAttribute("element", $this);
$renderTarget->setAttribute("date", date("Y-m-d", $this->getValue()));
$jstime = formatTimestamp($this->getValue(), '"F j, Y H:i:s"');
- include_once XOOPS_ROOT_PATH.'/include/calendarjs.php';
+ include_once XOOPS_ROOT_PATH.'/include/calendarjs.php'; //< FIXME
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formselect.php
diff -u xoops2jp/html/class/xoopsform/formselect.php:1.2.8.3 xoops2jp/html/class/xoopsform/formselect.php:1.2.8.3.2.1
--- xoops2jp/html/class/xoopsform/formselect.php:1.2.8.3 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formselect.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formselect.php,v 1.2.8.3 2006/09/22 15:47:21 minahito Exp $
+// $Id: formselect.php,v 1.2.8.3.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -179,14 +179,15 @@
*/
function render(){
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_select.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formfile.php
diff -u xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2 xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formfile.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formfile.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formfile.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: formfile.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -84,13 +84,14 @@
*/
function render(){
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_file.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
$renderer->renderWithTarget($renderTarget);
return $renderTarget->getResult();
Index: xoops2jp/html/class/xoopsform/formtextarea.php
diff -u xoops2jp/html/class/xoopsform/formtextarea.php:1.2.8.2 xoops2jp/html/class/xoopsform/formtextarea.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formtextarea.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formtextarea.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formtextarea.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: formtextarea.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -128,14 +128,15 @@
*/
function render(){
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget();
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_textarea.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formtext.php
diff -u xoops2jp/html/class/xoopsform/formtext.php:1.2.8.2 xoops2jp/html/class/xoopsform/formtext.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formtext.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formtext.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formtext.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: formtext.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -128,14 +128,15 @@
*/
function render(){
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_text.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/themeform.php
diff -u xoops2jp/html/class/xoopsform/themeform.php:1.2.8.3 xoops2jp/html/class/xoopsform/themeform.php:1.2.8.3.2.1
--- xoops2jp/html/class/xoopsform/themeform.php:1.2.8.3 Sat Sep 23 15:57:46 2006
+++ xoops2jp/html/class/xoopsform/themeform.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: themeform.php,v 1.2.8.3 2006/09/23 06:57:46 nobunobu Exp $
+// $Id: themeform.php,v 1.2.8.3.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -76,14 +76,14 @@
function render()
{
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_themeform.html");
$renderTarget->setAttribute("form", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
$ret = $renderTarget->getResult();
$ret .= $this->renderValidationJS( true );
Index: xoops2jp/html/class/xoopsform/formcheckbox.php
diff -u xoops2jp/html/class/xoopsform/formcheckbox.php:1.2.8.2 xoops2jp/html/class/xoopsform/formcheckbox.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formcheckbox.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formcheckbox.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formcheckbox.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: formcheckbox.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -144,19 +144,20 @@
function render()
{
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
if ( count($this->getOptions()) > 1 && substr($this->getName(), -2, 2) != "[]" ) {
$newname = $this->getName()."[]";
$this->setName($newname);
}
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_checkbox.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formlabel.php
diff -u xoops2jp/html/class/xoopsform/formlabel.php:1.2.8.2 xoops2jp/html/class/xoopsform/formlabel.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formlabel.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formlabel.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formlabel.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: formlabel.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -80,14 +80,15 @@
*/
function render(){
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_label.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formhidden.php
diff -u xoops2jp/html/class/xoopsform/formhidden.php:1.2.8.2 xoops2jp/html/class/xoopsform/formhidden.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formhidden.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formhidden.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formhidden.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: formhidden.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -91,14 +91,15 @@
*/
function render(){
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_hidden.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/simpleform.php
diff -u xoops2jp/html/class/xoopsform/simpleform.php:1.2.8.2 xoops2jp/html/class/xoopsform/simpleform.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/simpleform.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/simpleform.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: simpleform.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: simpleform.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -62,14 +62,15 @@
function render()
{
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_simpleform.html");
$renderTarget->setAttribute("form", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/grouppermform.php
diff -u xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3 xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3.2.1
--- xoops2jp/html/class/xoopsform/grouppermform.php:1.2.8.3 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/grouppermform.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: grouppermform.php,v 1.2.8.3 2006/09/22 15:47:21 minahito Exp $
+// $Id: grouppermform.php,v 1.2.8.3.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000-2003 XOOPS.org //
@@ -153,14 +153,16 @@
$this->addElement($tray);
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_grouppermform.html");
+
$renderTarget->setAttribute("form", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/form.php
diff -u xoops2jp/html/class/xoopsform/form.php:1.2.8.4 xoops2jp/html/class/xoopsform/form.php:1.2.8.4.2.1
--- xoops2jp/html/class/xoopsform/form.php:1.2.8.4 Sat Sep 23 11:03:09 2006
+++ xoops2jp/html/class/xoopsform/form.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: form.php,v 1.2.8.4 2006/09/23 02:03:09 nobunobu Exp $
+// $Id: form.php,v 1.2.8.4.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -379,9 +379,11 @@
*/
function renderValidationJS( $withtags = true ) {
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget();
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_opt_validationjs.html");
$renderTarget->setAttribute('form', $this);
$renderTarget->setAttribute('withtags', $withtags);
@@ -392,8 +394,7 @@
$renderTarget->setAttribute('required', $required);
$renderTarget->setAttribute('required_count', $reqcount);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
Index: xoops2jp/html/class/xoopsform/formpassword.php
diff -u xoops2jp/html/class/xoopsform/formpassword.php:1.2.8.2 xoops2jp/html/class/xoopsform/formpassword.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formpassword.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formpassword.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formpassword.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: formpassword.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -130,14 +130,15 @@
*/
function render(){
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_password.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formelementtray.php
diff -u xoops2jp/html/class/xoopsform/formelementtray.php:1.2.8.2 xoops2jp/html/class/xoopsform/formelementtray.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formelementtray.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formelementtray.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formelementtray.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: formelementtray.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -165,14 +165,15 @@
*/
function render(){
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_elementtray.html");
$renderTarget->setAttribute("tray", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formbutton.php
diff -u xoops2jp/html/class/xoopsform/formbutton.php:1.2.8.2 xoops2jp/html/class/xoopsform/formbutton.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formbutton.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formbutton.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formbutton.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: formbutton.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -112,14 +112,15 @@
*/
function render(){
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_button.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/tableform.php
diff -u xoops2jp/html/class/xoopsform/tableform.php:1.2.8.2 xoops2jp/html/class/xoopsform/tableform.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/tableform.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/tableform.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: tableform.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: tableform.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -64,14 +64,15 @@
function render()
{
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_tableform.html");
$renderTarget->setAttribute("form", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formdhtmltextarea.php
diff -u xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.6 xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.6.2.1
--- xoops2jp/html/class/xoopsform/formdhtmltextarea.php:1.2.8.6 Tue Sep 26 13:33:57 2006
+++ xoops2jp/html/class/xoopsform/formdhtmltextarea.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formdhtmltextarea.php,v 1.2.8.6 2006/09/26 04:33:57 minahito Exp $
+// $Id: formdhtmltextarea.php,v 1.2.8.6.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -86,14 +86,15 @@
function render()
{
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_dhtmltextarea.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
$ret = $renderTarget->getResult();
$ret .= $this->_renderSmileys();
@@ -112,15 +113,15 @@
$smilesArr =& $handler->getObjects(new Criteria('display', 1));
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+ $renderTarget =& $renderSystem->createRenderTarget('main');
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_opt_smileys.html");
$renderTarget->setAttribute("element", $this);
$renderTarget->setAttribute("smilesArr", $smilesArr);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}
Index: xoops2jp/html/class/xoopsform/formradio.php
diff -u xoops2jp/html/class/xoopsform/formradio.php:1.2.8.2 xoops2jp/html/class/xoopsform/formradio.php:1.2.8.2.2.1
--- xoops2jp/html/class/xoopsform/formradio.php:1.2.8.2 Sat Sep 23 00:47:21 2006
+++ xoops2jp/html/class/xoopsform/formradio.php Wed Oct 11 17:14:11 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: formradio.php,v 1.2.8.2 2006/09/22 15:47:21 minahito Exp $
+// $Id: formradio.php,v 1.2.8.2.2.1 2006/10/11 08:14:11 minahito Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -138,14 +138,15 @@
*/
function render(){
$root =& XCube_Root::getSingleton();
- $renderTarget =& new Legacy_RenderTargetMain();
+ $renderSystem =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
+
+ $renderTarget =& $renderSystem->createRenderTarget();
- $renderTarget->setModuleName("base");
+ $renderTarget->setAttribute('legacy_module', 'base');
$renderTarget->setTemplateName("legacy_xoopsform_radio.html");
$renderTarget->setAttribute("element", $this);
- $renderer =& $root->getRenderSystem(XOOPSFORM_DEPENDENCE_RENDER_SYSTEM);
- $renderer->renderWithTarget($renderTarget);
+ $renderSystem->renderWithTarget($renderTarget);
return $renderTarget->getResult();
}