Changeset 920

branches/experimental/jforms-groups/build/manifests/testapp.mn

r895	r920
163	163	jforms.check_datas.html_cli.php
164	164	jforms.compiler.html_cli.php
	165	jforms.compiler_1_1.html_cli.php
165	166	jforms.htmlbuilder.html_cli.php
	167	jforms.htmlbuilder2.html_cli.php
166	168	jforms.with_dao.html_cli.php
167	169	jtpl.compiler.html_cli.php

branches/experimental/jforms-groups/build/manifests/testapp.mn

r895	r920
163	163	jforms.check_datas.html_cli.php
164	164	jforms.compiler.html_cli.php
	165	jforms.compiler_1_1.html_cli.php
165	166	jforms.htmlbuilder.html_cli.php
	167	jforms.htmlbuilder2.html_cli.php
166	168	jforms.with_dao.html_cli.php
167	169	jtpl.compiler.html_cli.php

branches/experimental/jforms-groups/build/manifests/testapp.mn

r895	r920
163	163	jforms.check_datas.html_cli.php
164	164	jforms.compiler.html_cli.php
	165	jforms.compiler_1_1.html_cli.php
165	166	jforms.htmlbuilder.html_cli.php
	167	jforms.htmlbuilder2.html_cli.php
166	168	jforms.with_dao.html_cli.php
167	169	jtpl.compiler.html_cli.php

branches/experimental/jforms-groups/build/manifests/testapp.mn

r895	r920
163	163	jforms.check_datas.html_cli.php
164	164	jforms.compiler.html_cli.php
	165	jforms.compiler_1_1.html_cli.php
165	166	jforms.htmlbuilder.html_cli.php
	167	jforms.htmlbuilder2.html_cli.php
166	168	jforms.with_dao.html_cli.php
167	169	jtpl.compiler.html_cli.php

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_EN/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
19	20
20	21	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/en_US/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) content of %1$s tag is missing (file %2$s)
18	18	notunique.tag=(817) tag %1$s must be unique (file %2$s)
	19	control.not.allowed= (818) The tag %1$s is not allowed in %2$s (file %3$s)
	20	no.child.control= (819) The tag %1$s must contain some controls (file %2$s)
19	21
20	22	js.err.invalid= "%s" field is invalid

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit �e unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autoris�ans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contr� (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit �e unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autoris�ans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contr� (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit �e unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autoris�ans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contr� (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-1.properties

r702	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit �e unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autoris�ans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contr� (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit �e unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autoris�ans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contr� (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit �e unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autoris�ans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contr� (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit �e unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autoris�ans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contr� (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.ISO-8859-15.properties

r791	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit �e unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autoris�ans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contr� (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit être unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autorisé dans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contrôles (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit être unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autorisé dans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contrôles (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit être unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autorisé dans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contrôles (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/core-modules/jelix/locales/fr_FR/formserr.UTF-8.properties

r702	r920
17	17	content.missing=(816) le contenu de %1$s est manquant (fichier %2$s)
18	18	notunique.tag=(817) La balise %1$s doit être unique (fichier %2$s)
	19	control.not.allowed= (818) La balise %1$s n'est pas autorisé dans %2$s (fichier %3$s)
	20	no.child.control= (819) La balise %1$s doit contenir des balises de contrôles (fichier %2$s)
19	21
20	22	js.err.invalid=La saisie de "%s" est invalide

branches/experimental/jforms-groups/lib/jelix/forms/jFormsBase.class.php

r918	r920
638	638
639	639	function removeControl($name) {
	640	if(!isset($this->topControls [$name]))
	641	return;
640	642	unset($this->topControls [$name]);
641	643	unset($this->controls [$name]);

branches/experimental/jforms-groups/lib/jelix/forms/jFormsBase.class.php

r918	r920
638	638
639	639	function removeControl($name) {
	640	if(!isset($this->topControls [$name]))
	641	return;
640	642	unset($this->topControls [$name]);
641	643	unset($this->controls [$name]);

branches/experimental/jforms-groups/lib/jelix/forms/jFormsBase.class.php

r918	r920
638	638
639	639	function removeControl($name) {
	640	if(!isset($this->topControls [$name]))
	641	return;
640	642	unset($this->topControls [$name]);
641	643	unset($this->controls [$name]);

branches/experimental/jforms-groups/lib/jelix/forms/jFormsBase.class.php

r918	r920
638	638
639	639	function removeControl($name) {
	640	if(!isset($this->topControls [$name]))
	641	return;
640	642	unset($this->topControls [$name]);
641	643	unset($this->controls [$name]);

branches/experimental/jforms-groups/lib/jelix/forms/jFormsCompiler_jf_1_0.class.php

r914	r920
24	24	protected $sourceFile;
25	25
	26	protected $srcBuilders;
	27	protected $buildersCompilers;
	28
26	29	public function __construct($sourceFile) {
27	30	$this->sourceFile = $sourceFile;
…	…
31	34
32	35	global $gJConfig;
	36
	37	$this->srcBuilders = &$srcBuilders;
	38	$this->buildersCompilers = &$buildersCompilers;
33	39
34	40	$xml = simplexml_import_dom($doc);
…	…
47	53	protected function generatePHPControl($controltype, $control){
48	54	$source = array();
	55	$twocontrols = $this->_generatePHPControl($source, $controltype, $control);
	56
	57	$source[]='$this->addControl($ctrl);';
	58	if ($twocontrols)
	59	$source[]='$this->addControl($ctrl2);';
	60	return implode("\n", $source);
	61	}
	62
	63	protected function _generatePHPControl(&$source, $controltype, $control){
49	64	$class = 'jFormsControl'.$controltype;
50	65
…	…
67	82	unset($attributes['ref']);
68	83
69		$~~genadd~~ = $this->$method($source, $control, $attributes);
	84	$twocontrols = $this->$method($source, $control, $attributes);
70	85
71	86	if(count($attributes)) {
…	…
73	88	throw new jException('jelix~formserr.attribute.not.allowed',array(key($attributes),$controltype,$this->sourceFile));
74	89	}
75
76		if ($genadd)
77		$source[]='$this->addControl($ctrl);';
78		return implode("\n", $source);
	90	return $twocontrols;
79	91	}
80	92
…	…
114	126	$this->readHelpHintAlert($source, $control);
115	127	$this->attrSize($source, $attributes);
116		~~$source[]='$this->addControl($ctrl);';~~
117	128	$this->attrReadOnly($source, $attributes);
118	129	return false;
…	…
123	134	$this->attrRequired($source, $attributes);
124	135	$this->attrDefaultvalue($source, $attributes);
	136	$this->attrReadOnly($source, $attributes);
125	137
126	138	if(isset($attributes['minlength'])){
…	…
147	159	unset($attributes['cols']);
148	160	}
149		~~$source[]='$this->addControl($ctrl);';~~
150		~~$this->attrReadOnly($source, $attributes);~~
151	161	return false;
152	162	}
…	…
156	166	$this->readLabel($source, $control, 'output');
157	167	$this->readHelpHintAlert($source, $control);
158		return ~~tru~~e;
	168	return false;
159	169	}
160	170
…	…
163	173	$this->readHelpHintAlert($source, $control);
164	174	$this->readDatasource($source, $control, 'submit', $attributes);
165		return ~~tru~~e;
	175	return false;
166	176	}
167	177
…	…
169	179

Developers' Corner

Legend: