Changeset 256

Timestamp:

09/13/06 18:17:45 (2 years ago)

Author:

laurentj

Message:

- petite amélioration pour pouvoir mettre des fichiers de conf dans des sous-repertoire de config
- réorganisation des fichiers de conf pour testapp et la commande createapp
- fix bug #8782 : dans un order by, la table n'était pas précisé

Files:

trunk/build/manifests/jelix-dev.mn (modified) (2 diffs)
trunk/build/manifests/testapp.mn (modified) (1 diff)
trunk/lib/jelix-modules/auth/plugins/auth/auth.plugin.ini.php.dist (modified) (1 diff)
trunk/lib/jelix-scripts/commands/createapp.cmd.php (modified) (3 diffs)
trunk/lib/jelix-scripts/templates/var (added)
trunk/lib/jelix-scripts/templates/var/config (added)
trunk/lib/jelix-scripts/templates/var/config/cmdline (added)
trunk/lib/jelix-scripts/templates/var/config/cmdline/config.ini.php.tpl (moved) (moved from trunk/lib/jelix-scripts/templates/config.cmdline.ini.php.tpl)
trunk/lib/jelix-scripts/templates/var/config/dbprofils.ini.php.tpl (moved) (moved from trunk/lib/jelix-scripts/templates/dbprofils.ini.php.tpl)
trunk/lib/jelix-scripts/templates/var/config/defaultconfig.ini.php.tpl (moved) (moved from trunk/lib/jelix-scripts/templates/defaultconfig.ini.php.tpl)
trunk/lib/jelix-scripts/templates/var/config/index (added)
trunk/lib/jelix-scripts/templates/var/config/index/config.ini.php.tpl (moved) (moved from trunk/lib/jelix-scripts/templates/config.classic.ini.php.tpl) (1 diff)
trunk/lib/jelix-scripts/templates/var/config/jsonrpc (added)
trunk/lib/jelix-scripts/templates/var/config/jsonrpc/config.ini.php.tpl (added)
trunk/lib/jelix-scripts/templates/var/config/xmlrpc (added)
trunk/lib/jelix-scripts/templates/var/config/xmlrpc/config.ini.php.tpl (added)
trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (1 diff)
trunk/lib/jelix/core/jCoordinator.class.php (modified) (2 diffs)
trunk/lib/jelix/dao/jDaoGenerator.class.php (modified) (1 diff)
trunk/lib/jelix/dao/jDaoParser.class.php (modified) (2 diffs)
trunk/testapp/var/config/index (added)
trunk/testapp/var/config/index/config.ini.php.dist (moved) (moved from trunk/testapp/var/config/config.classic.ini.php.dist)
trunk/testapp/var/config/jsonrpc (added)
trunk/testapp/var/config/jsonrpc/config.ini.php.dist (added)
trunk/testapp/var/config/xmlrpc (added)
trunk/testapp/var/config/xmlrpc/config.ini.php.dist (added)
trunk/testapp/www/index.php (modified) (1 diff)
trunk/testapp/www/jsonrpc.php (modified) (1 diff)
trunk/testapp/www/xmlrpc.php (modified) (1 diff)

Legend:

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

trunk/build/manifests/jelix-dev.mn

r239	r256
126	126	project.xml.tpl
127	127	application.init.php.tpl
128		~~dbprofils.ini.php.tpl~~
129		~~defaultconfig.ini.php.tpl~~
130		~~config.classic.ini.php.tpl~~
131		~~config.cmdline.ini.php.tpl~~
132	128	controller.cmdline.tpl
133	129	cd lib/jelix-scripts/templates/www
…	…
138	134	cd lib/jelix-scripts/templates/scripts
139	135	cmdline.php.tpl
	136	cd lib/jelix-scripts/templates/var/config/
	137	dbprofils.ini.php.tpl
	138	defaultconfig.ini.php.tpl
	139	cd lib/jelix-scripts/templates/var/config/index/
	140	config.ini.php.tpl
	141	cd lib/jelix-scripts/templates/var/config/jsonrpc/
	142	config.ini.php.tpl
	143	cd lib/jelix-scripts/templates/var/config/xmlrpc/
	144	config.ini.php.tpl
	145	cd lib/jelix-scripts/templates/var/config/cmdline/
	146	config.ini.php.tpl
140	147
141	148	cd lib/jelix/docs

trunk/build/manifests/testapp.mn

r252	r256
73	73	urlsig.classic.php
74	74	dao.classic.php
	75
75	76	cd testapp/var
76	77	.htaccess
77	78	cd testapp/var/log
78	79	cd testapp/var/config
79		~~config.classic.ini.php.dist~~
80	80	defaultconfig.ini.php.dist
81	81	dbprofils.ini.php.dist
82	82	urls.xml
	83	cd testapp/var/config/index
	84	config.ini.php.dist
	85	cd testapp/var/config/xmlrpc
	86	config.ini.php.dist
	87	cd testapp/var/config/jsonrpc
	88	config.ini.php.dist
83	89	cd testapp/var/themes/default/testapp
84	90	hello2.tpl

trunk/lib/jelix-modules/auth/plugins/auth/auth.plugin.ini.php.dist

r241	r256
32	32
33	33	; indique quoi faire en cas de d�ut d'authentification
34		; 1 = erreur. Valeur �ettre imp�tivement pour les web services
	34	; 1 = erreur. Valeur �ettre imp�tivement pour les web services (xmlrpc, jsonrpc...)
35	35	; 2 = redirection vers une action
36	36	on_error = 1

trunk/lib/jelix-scripts/commands/createapp.cmd.php

r242	r256
47	47	$this->createDir(JELIX_APP_LOG_PATH);
48	48	$this->createDir(JELIX_APP_CONFIG_PATH);
	49	$this->createDir(JELIX_APP_CONFIG_PATH.'index/');
	50	$this->createDir(JELIX_APP_CONFIG_PATH.'jsonrpc/');
	51	$this->createDir(JELIX_APP_CONFIG_PATH.'xmlrpc/');
49	52	$this->createDir(JELIX_APP_VAR_PATH.'overloads/');
50	53	$this->createDir(JELIX_APP_VAR_PATH.'themes/');
…	…
58	61
59	62	$this->createFile(JELIX_APP_PATH.'project.xml','project.xml.tpl',$param);
60		$this->createFile(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php','defaultconfig.ini.php.tpl',$param);
61		$this->createFile(JELIX_APP_CONFIG_PATH.'config.classic.ini.php','config.classic.ini.php.tpl',$param);
62		$this->createFile(JELIX_APP_CONFIG_PATH.'dbprofils.ini.php','dbprofils.ini.php.tpl',$param);
	63	$this->createFile(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php','var/config/defaultconfig.ini.php.tpl',$param);
	64	$this->createFile(JELIX_APP_CONFIG_PATH.'dbprofils.ini.php','var/config/dbprofils.ini.php.tpl',$param);
	65	$this->createFile(JELIX_APP_CONFIG_PATH.'index/config.ini.php','var/config/index/config.ini.php.tpl',$param);
	66	$this->createFile(JELIX_APP_CONFIG_PATH.'jsonrpc/config.ini.php','var/config/jsonrpc/config.ini.php.tpl',$param);
	67	$this->createFile(JELIX_APP_CONFIG_PATH.'xmlrpc/config.ini.php','var/config/xmlrpc/config.ini.php.tpl',$param);
63	68
64	69	$param['rp_temp']=jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_TEMP_PATH,true);
…	…
89	94	if ($this->getOption('-withcmdline')) {
90	95	$this->createDir(JELIX_APP_CMD_PATH);
91		$this->createFile(JELIX_APP_CONFIG_PATH.'c~~onfig.cmdline.ini.php','config.cmdline~~.ini.php.tpl',$param);
	96	$this->createFile(JELIX_APP_CONFIG_PATH.'cmdline/config.ini.php','var/config/cmdline/config.ini.php.tpl',$param);
92	97	$param['rp_cmd'] =jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_CMD_PATH,true);
93	98	$this->createFile(JELIX_APP_CMD_PATH.'cmdline.php','scripts/cmdline.php.tpl',$param);

trunk/lib/jelix-scripts/templates/var/config/index/config.ini.php.tpl

r190 r256

3 3
4 4 defaultAction = "default_index"
5 [plugins]
6 ;nom = nom_fichier_ini
7
8 [responses]

trunk/lib/jelix/core/jConfigCompiler.class.php

r248	r256
68	68	$config['urlengine']['basePath'] = $path;
69	69	}
70		self::_saveToIni($config, JELIX_APP_TEMP_PATH.~~$configFile~~.'.resultini.php');
	70	self::_saveToIni($config, JELIX_APP_TEMP_PATH.str_replace('/','~',$configFile).'.resultini.php');
71	71	$config = (object) $config;
72	72	return $config;

trunk/lib/jelix/core/jCoordinator.class.php

r252	r256
99	99	*/
100	100	private function _loadPlugins(){
101
102		foreach($GLOBALS['gJConfig']->plugins as $name=>$conf){
103		~~if($conf && isset($GLOBALS['gJConfig']->_pluginsPathList[$name])~~){
104		~~if($conf=='1')~~
105		~~$conff=$name.'.plugin.ini.php'~~;
	101	global $gJConfig;
	102
	103	foreach($gJConfig->plugins as $name=>$conf){
	104	if($conf && isset($gJConfig->_pluginsPathList[$name])){
	105	$conff= $conf=='1' ? $name.'.plugin.ini.php': $conf;
106	106	if(file_exists(JELIX_APP_CONFIG_PATH.$conff)){
107	107	if( false === ($conf = @parse_ini_file(JELIX_APP_CONFIG_PATH.$conff,true)))
…	…
110	110	$conf = array();
111	111	}
112		include( $~~GLOBALS['gJConfig']~~->_pluginsPathList[$name].$name.".plugin.php");
	112	include( $gJConfig->_pluginsPathList[$name].$name.".plugin.php");
113	113	$class= $name.'Plugin';
114	114	$this->plugins[strtolower($name)] = new $class($conf);

trunk/lib/jelix/dao/jDaoGenerator.class.php

r255	r256
608	608	$ord='';
609	609	if (isset($fields[$name])){
610		$ord = $name;
	610	$ord = $fields[$name]->table.'.'.$fields[$name]->fieldName;
611	611	}elseif($name{0} == '$'){
612	612	$ord = '\'.'.$name.'.\'';

trunk/lib/jelix/dao/jDaoParser.class.php

r255	r256
475	475	}
476	476
477
478		/*
479		~~<eq property="foo" value="" expr=""/>~~
480		~~<noteq property="foo" value="" expr=""/>~~
481		~~<lt property="foo" value="" expr=""/>~~
482		~~<gt property="foo" value="" expr=""/>~~
483		~~<lteq property="foo" value="" expr=""/>~~
484		~~<gteq property="foo" value="" expr=""/>~~
485		~~<in property="foo" value="" expr=""/>~~
486		~~<notin property="foo" value="" expr=""/>~~
487		~~<between property="foo" min="" max="" exprmin="" exprmax=""/>~~
488		~~<notbetween property="foo" min="" max="" exprmin="" exprmax=""/>~~
489		~~<isnull property="foo"/>~~
490		~~<notisnull property="foo"/>~~
491		*/
492
493
494	477	private $_op = array('eq'=>'=', 'neq'=>'<>', 'lt'=>'<', 'gt'=>'>', 'lteq'=>'<=', 'gteq'=>'>=',
495	478	'like'=>'LIKE', 'notlike'=>'NOT LIKE', 'isnull'=>'IS NULL', 'isnotnull'=>'IS NOT NULL','in'=>'IN', 'notin'=>'NOT IN',
…	…
567	550	}
568	551
569		private function _addOrder($order){
570		$attr = $this->_def->getAttr($order, array('property','way'));
571
572		$way = ($attr['way'] !== null ? $attr['way']:'ASC');
573
574		if(substr ($way,0,1) == '$'){
575		if(!in_array (substr ($way,1),$this->_parameters)){
576		throw new jDaoXmlException ('method.orderitem.parameter.unknow', array($this->name, $way));
577		}
578		}
579
580		if ($attr['property'] != ''){
581		$prop =$this->_def->getProperties();
582		if(isset($prop[$attr['property']])){
583		$this->_conditions->addItemOrder($attr['property'], $way);
584		}else{
585		throw new jDaoXmlException ('method.orderitem.bad', array($attr['property'], $this->name));
586		}
587		}else{
588		throw new jDaoXmlException ('method.orderitem.property.missing', array($this->name));
589		}
	552	private function _addOrder($order){
	553	$attr = $this->_def->getAttr($order, array('property','way'));
	554
	555	$way = ($attr['way'] !== null ? $attr['way']:'ASC');
	556
	557	if(substr ($way,0,1) == '$'){
	558	if(!in_array (substr ($way,1),$this->_parameters)){
	559	throw new jDaoXmlException ('method.orderitem.parameter.unknow', array($this->name, $way));
	560	}
	561	}
	562
	563	if ($attr['property'] != ''){
	564	$prop =$this->_def->getProperties();
	565	if(isset($prop[$attr['property']])){
	566	$this->_conditions->addItemOrder($attr['property'], $way);
	567	}elseif(substr ($attr['property'],0,1) == '$'){
	568	if(!in_array (substr ($attr['property'],1),$this->_parameters)){
	569	throw new jDaoXmlException ('method.orderitem.parameter.unknow', array($this->name, $way));
	570	}
	571	$this->_conditions->addItemOrder($attr['property'], $way);
	572	}else{
	573	throw new jDaoXmlException ('method.orderitem.bad', array($attr['property'], $this->name));
	574	}
	575	}else{
	576	throw new jDaoXmlException ('method.orderitem.property.missing', array($this->name));
	577	}
590	578
591	579

trunk/testapp/www/index.php

r38	r256
19	19	require_once (JELIX_LIB_CORE_PATH.'request/jClassicRequest.class.php');
20	20
21		$config_file = '~~config.classic~~.ini.php';
	21	$config_file = 'index/config.ini.php';
22	22
23	23	$jelix = new jCoordinator($config_file);

trunk/testapp/www/jsonrpc.php

r38	r256
17	17	//require_once ('/usr/share/jelix/myapp/application.init.php');
18	18
19		$config_file = '~~config.jsonrpc~~.ini.php';
	19	$config_file = 'jsonrpc/config.ini.php';
20	20
21	21	require_once (JELIX_LIB_CORE_PATH.'request/jJsonRpcRequest.class.php');

trunk/testapp/www/xmlrpc.php

r38	r256
17	17	//require_once ('/usr/share/jelix/testapp/application.init.php');
18	18
19		$config_file = '~~config.xmlrpc~~.ini.php';
	19	$config_file = 'xmlrpc/config.ini.php';
20	20
21	21	require_once (JELIX_LIB_CORE_PATH.'request/jXmlRpcRequest.class.php');

Download in other formats: Unified Diff Zip Archive

r190	r256
3	3
4	4	defaultAction = "default_index"
	5	[plugins]
	6	;nom = nom_fichier_ini
	7
	8	[responses]

Developers' Corner

Changeset 256

Legend: