Changeset 610

Timestamp:

10/13/07 22:56:23 (1 year ago)

Author:

laurentj

Message:

fixed bug #301: jforms, deprecated name attribut should not be generated
fixed bug #302: jforms html: bad value in method attribute

Files:

branches/1.0beta3.x/lib/jelix-www/js/jforms.js (modified) (1 diff)
branches/1.0beta3.x/lib/jelix-www/js/jforms.js (modified) (1 diff)
branches/1.0beta3.x/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (1 diff)
branches/1.0beta3.x/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (1 diff)
branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (2 diffs)
branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (2 diffs)
trunk/lib/jelix-www/js/jforms.js (modified) (1 diff)
trunk/lib/jelix-www/js/jforms.js (modified) (1 diff)
trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (1 diff)
trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (1 diff)
trunk/lib/jelix/plugins/tpl/html/block.form.php (modified) (1 diff)
trunk/lib/jelix/plugins/tpl/html/block.form.php (modified) (1 diff)
trunk/lib/jelix/plugins/tpl/html/function.formfull.php (modified) (1 diff)
trunk/lib/jelix/plugins/tpl/html/function.formfull.php (modified) (1 diff)
trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (2 diffs)
trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

branches/1.0beta3.x/lib/jelix-www/js/jforms.js

r609	r610
51	51
52	52	verifyForm : function(frmElt){
53		var f = this._forms[frmElt.~~name~~];
	53	var f = this._forms[frmElt.getAttribute('id')];
54	54	var msg = '';
55	55	var valid = true;

branches/1.0beta3.x/lib/jelix-www/js/jforms.js

r609	r610
51	51
52	52	verifyForm : function(frmElt){
53		var f = this._forms[frmElt.~~name~~];
	53	var f = this._forms[frmElt.getAttribute('id')];
54	54	var msg = '';
55	55	var valid = true;

branches/1.0beta3.x/lib/jelix/forms/jFormsBuilderBase.class.php

r607	r610
108	108	public function outputHeader($params){
109	109	$url = jUrl::get($this->_action, $this->_actionParams, 2); // retourne le jurl correspondant
110		echo '<form action="',$url->scriptName,$url->pathInfo,'" method="~~POST" name~~="', $this->_name,'" onsubmit="return jForms.verifyForm(this)"';
	110	echo '<form action="',$url->scriptName,$url->pathInfo,'" method="post" id="', $this->_name,'" onsubmit="return jForms.verifyForm(this)"';
111	111	if($this->_form->hasUpload())
112	112	echo ' enctype="multipart/form-data">';

branches/1.0beta3.x/lib/jelix/forms/jFormsBuilderBase.class.php

r607	r610
108	108	public function outputHeader($params){
109	109	$url = jUrl::get($this->_action, $this->_actionParams, 2); // retourne le jurl correspondant
110		echo '<form action="',$url->scriptName,$url->pathInfo,'" method="~~POST" name~~="', $this->_name,'" onsubmit="return jForms.verifyForm(this)"';
	110	echo '<form action="',$url->scriptName,$url->pathInfo,'" method="post" id="', $this->_name,'" onsubmit="return jForms.verifyForm(this)"';
111	111	if($this->_form->hasUpload())
112	112	echo ' enctype="multipart/form-data">';

branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php

r609	r610
80	80	$builder->outputHeader(array('',''));
81	81	$out = ob_get_clean();
82		$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="~~POST" name~~="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="module" value="jelix_tests"/>
	82	$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="post" id="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="module" value="jelix_tests"/>
83	83	<input type="hidden" name="action" value="urlsig_url1"/>
84	84	</div><script type="text/javascript">
…	…
94	94	$builder->outputHeader(array('',''));
95	95	$out = ob_get_clean();
96		$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="~~POST" name~~="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="foo" value="b>ar"/>
	96	$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="post" id="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="foo" value="b>ar"/>
97	97	<input type="hidden" name="module" value="jelix_tests"/>
98	98	<input type="hidden" name="action" value="urlsig_url1"/>

branches/1.0beta3.x/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php

r609	r610
80	80	$builder->outputHeader(array('',''));
81	81	$out = ob_get_clean();
82		$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="~~POST" name~~="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="module" value="jelix_tests"/>
	82	$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="post" id="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="module" value="jelix_tests"/>
83	83	<input type="hidden" name="action" value="urlsig_url1"/>
84	84	</div><script type="text/javascript">
…	…
94	94	$builder->outputHeader(array('',''));
95	95	$out = ob_get_clean();
96		$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="~~POST" name~~="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="foo" value="b>ar"/>
	96	$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="post" id="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="foo" value="b>ar"/>
97	97	<input type="hidden" name="module" value="jelix_tests"/>
98	98	<input type="hidden" name="action" value="urlsig_url1"/>

trunk/lib/jelix-www/js/jforms.js

r609	r610
51	51
52	52	verifyForm : function(frmElt){
53		var f = this._forms[frmElt.~~name~~];
	53	var f = this._forms[frmElt.getAttribute('id')];
54	54	var msg = '';
55	55	var valid = true;

trunk/lib/jelix-www/js/jforms.js

r609	r610
51	51
52	52	verifyForm : function(frmElt){
53		var f = this._forms[frmElt.~~name~~];
	53	var f = this._forms[frmElt.getAttribute('id')];
54	54	var msg = '';
55	55	var valid = true;

trunk/lib/jelix/forms/jFormsBuilderBase.class.php

r608	r610
109	109	public function outputHeader($params){
110	110	$url = jUrl::get($this->_action, $this->_actionParams, 2); // retourne le jurl correspondant
111		echo '<form action="',$url->scriptName,$url->pathInfo,'" method="'.$params[2].'" ~~name~~="', $this->_name,'" onsubmit="return jForms.verifyForm(this)"';
	111	echo '<form action="',$url->scriptName,$url->pathInfo,'" method="'.$params[2].'" id="', $this->_name,'" onsubmit="return jForms.verifyForm(this)"';
112	112	if($this->_form->hasUpload())
113	113	echo ' enctype="multipart/form-data">';

trunk/lib/jelix/forms/jFormsBuilderBase.class.php

r608	r610
109	109	public function outputHeader($params){
110	110	$url = jUrl::get($this->_action, $this->_actionParams, 2); // retourne le jurl correspondant
111		echo '<form action="',$url->scriptName,$url->pathInfo,'" method="'.$params[2].'" ~~name~~="', $this->_name,'" onsubmit="return jForms.verifyForm(this)"';
	111	echo '<form action="',$url->scriptName,$url->pathInfo,'" method="'.$params[2].'" id="', $this->_name,'" onsubmit="return jForms.verifyForm(this)"';
112	112	if($this->_form->hasUpload())
113	113	echo ' enctype="multipart/form-data">';

trunk/lib/jelix/plugins/tpl/html/block.form.php

r608	r610
53	53	$helpdecorator = "'jFormsHelpDecoratorAlert'";
54	54
55		$method = strto~~upper(isset($param[5])?$param[5]:'POST~~');
56		if($method!='~~GET' && $method!='POST~~')
57		$method='~~POST~~';
	55	$method = strtolower(isset($param[5])?$param[5]:'post');
	56	if($method!='get' && $method!='post')
	57	$method='post';
58	58
59	59	$content = ' $t->_privateVars[\'__form\'] = '.$param[0].';

trunk/lib/jelix/plugins/tpl/html/block.form.php

r608	r610
53	53	$helpdecorator = "'jFormsHelpDecoratorAlert'";
54	54
55		$method = strto~~upper(isset($param[5])?$param[5]:'POST~~');
56		if($method!='~~GET' && $method!='POST~~')
57		$method='~~POST~~';
	55	$method = strtolower(isset($param[5])?$param[5]:'post');
	56	if($method!='get' && $method!='post')
	57	$method='post';
58	58
59	59	$content = ' $t->_privateVars[\'__form\'] = '.$param[0].';

trunk/lib/jelix/plugins/tpl/html/function.formfull.php

r608	r610
20	20	*/
21	21	function jtpl_function_html_formfull($tpl, $form, $action, $params=array(),
22		$errDecorator='jFormsErrorDecoratorAlert', $helpDecorator='jFormsHelpDecoratorAlert', $method='~~POST~~')
	22	$errDecorator='jFormsErrorDecoratorAlert', $helpDecorator='jFormsHelpDecoratorAlert', $method='post')
23	23	{
24	24

trunk/lib/jelix/plugins/tpl/html/function.formfull.php

r608	r610
20	20	*/
21	21	function jtpl_function_html_formfull($tpl, $form, $action, $params=array(),
22		$errDecorator='jFormsErrorDecoratorAlert', $helpDecorator='jFormsHelpDecoratorAlert', $method='~~POST~~')
	22	$errDecorator='jFormsErrorDecoratorAlert', $helpDecorator='jFormsHelpDecoratorAlert', $method='post')
23	23	{
24	24

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php

r608	r610
78	78	$formname = $builder->getName();
79	79	ob_start();
80		$builder->outputHeader(array('','','~~POST~~'));
	80	$builder->outputHeader(array('','','post'));
81	81	$out = ob_get_clean();
82		$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="~~POST" name~~="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="module" value="jelix_tests"/>
	82	$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="post" id="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="module" value="jelix_tests"/>
83	83	<input type="hidden" name="action" value="urlsig_url1"/>
84	84	</div><script type="text/javascript">
…	…
92	92	$formname = $builder->getName();
93	93	ob_start();
94		$builder->outputHeader(array('','','~~GET~~'));
	94	$builder->outputHeader(array('','','get'));
95	95	$out = ob_get_clean();
96		$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="~~GET" name~~="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="foo" value="b>ar"/>
	96	$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="get" id="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="foo" value="b>ar"/>
97	97	<input type="hidden" name="module" value="jelix_tests"/>
98	98	<input type="hidden" name="action" value="urlsig_url1"/>

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php

r608	r610
78	78	$formname = $builder->getName();
79	79	ob_start();
80		$builder->outputHeader(array('','','~~POST~~'));
	80	$builder->outputHeader(array('','','post'));
81	81	$out = ob_get_clean();
82		$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="~~POST" name~~="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="module" value="jelix_tests"/>
	82	$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="post" id="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="module" value="jelix_tests"/>
83	83	<input type="hidden" name="action" value="urlsig_url1"/>
84	84	</div><script type="text/javascript">
…	…
92	92	$formname = $builder->getName();
93	93	ob_start();
94		$builder->outputHeader(array('','','~~GET~~'));
	94	$builder->outputHeader(array('','','get'));
95	95	$out = ob_get_clean();
96		$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="~~GET" name~~="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="foo" value="b>ar"/>
	96	$result ='<form action="'.$GLOBALS['gJConfig']->urlengine['basePath'].'index.php" method="get" id="'.$formname.'" onsubmit="return jForms.verifyForm(this)"><div><input type="hidden" name="foo" value="b>ar"/>
97	97	<input type="hidden" name="module" value="jelix_tests"/>
98	98	<input type="hidden" name="action" value="urlsig_url1"/>

Download in other formats: Unified Diff Zip Archive

Developers' Corner

Changeset 610

Legend: