Changeset 312

Timestamp:

11/23/06 21:56:31 (2 years ago)

Author:

laurentj

Message:

correction de quelques bugs :
- ticket #43 Erreur de compilation de template avec une locale ayant un module 'default'
- ticket #44 Valeur des checkbox mal gérée dans jForms
- ticket #45 erreur php sur le plugin de template ifacl
- ticket #50 jDateTime : erreur dans les formats de dates
- ticket #52 fonction js ajouter utilisateur dans jxacl doit mettre le focus sur le champ utilisateur
- fix bug sur le build des modules additionnels
- fix bug sur jZone : oubli de protected sur la methode _createContent

Files:

trunk/build/buildmodules.php (modified) (2 diffs)
trunk/lib/jelix-modules/jelix/locales/en_US/format.ISO-8859-1.properties (modified) (1 diff)
trunk/lib/jelix-modules/jelix/locales/fr_FR/format.ISO-8859-1.properties (modified) (1 diff)
trunk/lib/jelix-modules/jelix/locales/fr_FR/format.UTF-8.properties (modified) (1 diff)
trunk/lib/jelix-modules/jxacl/templates/xuladmin.tpl (modified) (1 diff)
trunk/lib/jelix/forms/jFormsBase.class.php (modified) (1 diff)
trunk/lib/jelix/tpl/jTplCompiler.class.php (modified) (2 diffs)
trunk/lib/jelix/tpl/plugins/common/block.ifacl.php (modified) (1 diff)
trunk/lib/jelix/tpl/plugins/common/block.ifnotacl.php (modified) (2 diffs)
trunk/lib/jelix/utils/jDateTime.class.php (modified) (3 diffs)
trunk/lib/jelix/utils/jZone.class.php (modified) (1 diff)

Legend:

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

trunk/build/buildmodules.php

r303	r312
31	31
32	32	if($PACKAGE_TAR_GZ \|\| $PACKAGE_ZIP ){
	33	$BUILD_SUBPATH = 'additionnal-modules/';
33	34	if($NIGHTLY_NAME)
34		$PACKAGE_NAME=~~$APPNAME.'~~-nightly';
	35	$PACKAGE_NAME='additionnal-modules-nightly';
35	36	else
36		$PACKAGE_NAME=$APPNAME.'-SVN-'.$SVN_REVISION;
	37	$PACKAGE_NAME='additionnal-modules-SVN-'.$SVN_REVISION;
	38	}else{
	39	$BUILD_SUBPATH = 'lib/jelix-modules/';
	40
37	41	}
38	42
…	…
40	44
41	45	//... creation des repertoires
42		jBuildUtils::createDir($MAIN_TARGET_PATH);
	46	jBuildUtils::createDir($MAIN_TARGET_PATH.$BUILD_SUBPATH);
43	47
44	48	//... execution des manifests
45		jManifest::process('build/manifests/jelix-modules.mn', 'lib/jelix-modules/', $MAIN_TARGET_PATH, $GLOBALS);
	49	jManifest::process('build/manifests/jelix-modules.mn', 'lib/jelix-modules/', $MAIN_TARGET_PATH.$BUILD_SUBPATH, $GLOBALS);
46	50
47	51	//... packages
48	52
49	53	if($PACKAGE_TAR_GZ){
50		exec('tar czf '.$MAIN_TARGET_PATH.$PACKAGE_NAME.'.tar.gz -C '.$MAIN_TARGET_PATH.' '.$~~APPNAME~~);
	54	exec('tar czf '.$MAIN_TARGET_PATH.$PACKAGE_NAME.'.tar.gz -C '.$MAIN_TARGET_PATH.' '.$BUILD_SUBPATH);
51	55	}
52	56
53	57	if($PACKAGE_ZIP){
54	58	chdir($MAIN_TARGET_PATH);
55		exec('zip -r '.$PACKAGE_NAME.'.zip '.$~~APPNAME~~);
	59	exec('zip -r '.$PACKAGE_NAME.'.zip '.$BUILD_SUBPATH);
56	60	chdir(dirname(__FILE__));
57	61	}

trunk/lib/jelix-modules/jelix/locales/en_US/format.ISO-8859-1.properties

r254	r312
1		# format ~~utilisant les caract�s de remplacement de la fonction date~~
	1	# format string for php date function (see http://www.php.net/manual/en/function.date.php)
2	2	date = m/d/Y
3	3	datetime = m/d/Y H:i:s
4	4	time = H:i:s
5	5
	6	# format string for php strptime function (see http://www.php.net/manual/en/function.strftime.php)
	7	date_st = %m/%d/%Y
	8	datetime_st = %m/%d/%Y %H:%M:%S
	9	time_st = %H:%M:%S
6	10
7	11	format.monetary = $ %d

trunk/lib/jelix-modules/jelix/locales/fr_FR/format.ISO-8859-1.properties

r254	r312
1		# format ~~utilisant les caract�s de remplacement de la fonction date~~
	1	# format pour la fonction date (voir http://www.php.net/manual/en/function.date.php)
2	2	date = d/m/Y
3	3	datetime = d/m/Y H:i:s
4	4	time = H:i:s
5	5
	6	# format pour la fonction strptime (voir http://www.php.net/manual/en/function.strftime.php)
	7	date_st = %d/%m/%Y
	8	datetime_st = %d/%m/%Y %H:%M:%S
	9	time_st = %H:%M:%S
6	10
7	11	format.monetary = %d EURO

trunk/lib/jelix-modules/jelix/locales/fr_FR/format.UTF-8.properties

r254	r312
1		# format ~~utilisant les caractères de remplacement de la fonction date~~
	1	# format pour la fonction date (voir http://www.php.net/manual/en/function.date.php)
2	2	date = d/m/Y
3	3	datetime = d/m/Y H:i:s
4	4	time = H:i:s
5	5
	6	# format pour la fonction strptime (voir http://www.php.net/manual/en/function.strftime.php)
	7	date_st = %d/%m/%Y
	8	datetime_st = %d/%m/%Y %H:%M:%S
	9	time_st = %H:%M:%S
6	10
7	11	format.monetary = %d EURO

trunk/lib/jelix-modules/jxacl/templates/xuladmin.tpl

r307	r312
358	358	<popupset>
359	359	<popup id="addUserMenu">
360		<menuitem label="Ajouter un Utilisateur" onclick="~~openModal('jxaclNotifyBox1','jxaclModalBox2')~~"/>
	360	<menuitem label="Ajouter un Utilisateur" onclick="document.getElementById('user').focus();"/>
361	361	<menuitem label="Supprimer cet Utilisateur" onclick="removeUserFromGrp(document.getElementById('users'));"/>
362	362	</popup>

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

r310	r312
68	68	foreach($this->_controls as $name=>$ctrl){
69	69	$value = $req->getParam($name);
70		if($value !== null)
71		$this->_container->datas[$name]= $value;
	70	//if($value !== null) on commente pour le moment,
	71	// �revoir un meilleur test, pour les formulaires sur plusieurs pages
	72	$this->_container->datas[$name]= $value;
72	73	}
73	74	}

trunk/lib/jelix/tpl/jTplCompiler.class.php

r309	r312
38	38	T_IS_NOT_IDENTICAL, T_IS_SMALLER_OR_EQUAL, T_LOGICAL_AND,
39	39	T_LOGICAL_OR, T_LOGICAL_XOR, T_SR, T_SL, T_DOUBLE_ARROW);
	40
	41	private $_inLocaleOk = array(T_STRING, T_ABSTRACT, T_AS, T_BREAK, T_CASE, T_CATCH, T_CLASS, T_CLONE,
	42	T_CONST, T_CONTINUE, T_DECLARE, T_DEFAULT, T_DO, T_ECHO, T_ELSE, T_ELSEIF, T_EMPTY,
	43	T_EXIT, T_FINAL, T_FOR, T_FOREACH, T_FUNCTION, T_GLOBAL, T_IF, T_IMPLEMENTS, T_INSTANCEOF,
	44	T_INTERFACE, T_LOGICAL_AND, T_LOGICAL_OR, T_LOGICAL_XOR, T_NEW, T_PRIVATE, T_PUBLIC,
	45	T_PROTECTED, T_RETURN, T_STATIC, T_SWITCH, T_THROW, T_TRY, T_USE, T_VAR, T_WHILE);
40	46
41	47	private $_allowedInVar;
…	…
409	415	continue;
410	416	}
411
412		if($type == T_STRING && $inLocale){
	417	if($inLocale && in_array($type,$this->_inLocaleOk)){
413	418	$locale.=$str;
414	419	}elseif($type == T_VARIABLE && $inLocale){

trunk/lib/jelix/tpl/plugins/common/block.ifacl.php

r248	r312
13	13	* a special if block to test easily a right value
14	14	*
15		* usage : {ifacl ~~array('subject',54)~~} ..here generated content if the user has the right {/ifacl}
	15	* usage : {ifacl 'subject',54} ..here generated content if the user has the right {/ifacl}
16	16	* @param jTplCompiler $compiler the template compiler
17	17	* @param boolean true if it is the begin of block, else false
18		* @param $params array 1=>subject 2=>right value 3=>optional resource
	18	* @param $param array 1=>subject 2=>right value 3=>optional resource
19	19	* @return string the php code corresponding to the begin or end of the block
20	20	*/
21		function jtpl_block_ifacl($compiler, $begin, $params=array())
	21	function jtpl_block_ifacl($compiler, $begin, $param=array())
22	22	{
23	23	if($begin){
24	24	if(count($param) == 2){
25		$content = ' if(jAcl::check('.$param[~~1].','.$param[2~~].')){';
	25	$content = ' if(jAcl::check('.$param[0].','.$param[1].')){';
26	26	}elseif(count($param) == 3){
27		$content = ' if(jAcl::check('.$param[~~1].','.$param[2].','.$param[3~~].')){';
	27	$content = ' if(jAcl::check('.$param[0].','.$param[1].','.$param[2].')){';
28	28	}else{
29	29	$content='';

trunk/lib/jelix/tpl/plugins/common/block.ifnotacl.php

r248	r312
13	13	* a special if block to test easily a right value
14	14	*
15		* usage : {ifnotacl ~~array('subject',54)~~} ..here generated content if the user has NOT the right {/ifnotacl}
	15	* usage : {ifnotacl 'subject',54} ..here generated content if the user has NOT the right {/ifnotacl}
16	16	* @param jTplCompiler $compiler the template compiler
17	17	* @param boolean true if it is the begin of block, else false
…	…
22	22	{
23	23	if($begin){
24		if(count($param) == 2){
25		$content = ' if(!jAcl::check('.$param~~[1].','.$param[2~~].')){';
26		}elseif(count($param) == 3){
27		$content = ' if(!jAcl::check('.$param[~~1].','.$param[2].','.$param[3~~].')){';
	24	if(count($params) == 2){
	25	$content = ' if(!jAcl::check('.$params[0].','.$params[1].')){';
	26	}elseif(count($params) == 3){
	27	$content = ' if(!jAcl::check('.$param[0].','.$params[1].','.$params[2].')){';
28	28	}else{
29	29	$content='';

trunk/lib/jelix/utils/jDateTime.class.php

r300	r312
39	39	preg_match_all('/%(\w)/',$format,$patt);
40	40	foreach($patt[1] as $k=>$v){
41		if(isset($plop[$v]))
42		$result[$plop[$v]]= intval($m[$k+1]);
	41	if(!isset($plop[$v])) continue;
	42	$result[$plop[$v]] = intval($m[$k+1]);
	43	if($plop[$v] == 'tm_mon'){
	44	$result[$plop[$v]] -= 1;
	45	}
43	46	}
44	47	$result['tm_year'] -= 1900;
…	…
143	146	switch($format){
144	147	case self::LANG_DFORMAT:
145		$lf = jLocale::get('jelix~format.date');
	148	$lf = jLocale::get('jelix~format.date_st');
146	149	if($res = strptime ( $str, $lf )){
147	150	$ok=true;
148	151	$this->year = $res['tm_year']+1900;
149		$this->month = $res['tm_mon'];
	152	$this->month = $res['tm_mon'] +1;
150	153	$this->day = $res['tm_mday'];
151	154	}
152	155	break;
153	156	case self::LANG_DTFORMAT:
154		$lf = jLocale::get('jelix~format.datetime');
	157	$lf = jLocale::get('jelix~format.datetime_st');
155	158	if($res = strptime ( $str, $lf )){
156	159	$ok=true;
157	160	$this->year = $res['tm_year']+1900;
158		$this->month = $res['tm_mon'];
	161	$this->month = $res['tm_mon'] +1;
159	162	$this->day = $res['tm_mday'];
160	163	$this->hour = $res['tm_hour'];
…	…
164	167	break;
165	168	case self::LANG_TFORMAT:
166		$lf = jLocale::get('jelix~format.time');
	169	$lf = jLocale::get('jelix~format.time_st');
167	170	if($res = strptime ( $str, $lf )){
168	171	$ok=true;

trunk/lib/jelix/utils/jZone.class.php

r248	r312
195	195	* @return string generated content
196	196	*/
197		function _createContent (){
	197	protected function _createContent (){
198	198	if($this->_tplname != ''){
199	199	$this->_tpl = new jTpl();

Download in other formats: Unified Diff Zip Archive

Developers' Corner

Changeset 312

Legend: