Changeset 516

Timestamp:

08/01/07 18:04:12 (1 year ago)

Author:

laurentj

Message:

ticket #232: now PHP 5.1 is the default target
ticket #8: added default variables in jtpl : j_datenow, j_timenow, j_basepath, j_jelixwww
ticket #202: a new parameter in the config, jelixWWWPath, which contains the url path to the jelix-www directory

Files:

trunk/build/buildjelix.php (modified) (1 diff)
trunk/build/buildjelix.php (modified) (1 diff)
trunk/lib/jelix/core/defaultconfig.ini.php (modified) (1 diff)
trunk/lib/jelix/core/defaultconfig.ini.php (modified) (1 diff)
trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (2 diffs)
trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (2 diffs)
trunk/lib/jelix/core/jRequest.class.php (modified) (1 diff)
trunk/lib/jelix/core/jRequest.class.php (modified) (1 diff)
trunk/lib/jelix/tpl/jTpl.class.php (modified) (1 diff)
trunk/lib/jelix/tpl/jTpl.class.php (modified) (1 diff)
trunk/testapp/modules/testapp/templates/main.tpl (modified) (1 diff)
trunk/testapp/modules/testapp/templates/main.tpl (modified) (1 diff)

Legend:

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

trunk/build/buildjelix.php

r479	r516
16	16	),
17	17	'PHP_VERSION_TARGET'=> array(
18		"PHP5 version for which jelix will be generated (by default, ~~for all PHP5 version~~)",
19		'5.0'
	18	"PHP5 version for which jelix will be generated (by default, the target is php 5.1)",
	19	'5.1'
20	20	),
21	21	'EDITION_NAME'=> array(

trunk/build/buildjelix.php

r479	r516
16	16	),
17	17	'PHP_VERSION_TARGET'=> array(
18		"PHP5 version for which jelix will be generated (by default, ~~for all PHP5 version~~)",
19		'5.0'
	18	"PHP5 version for which jelix will be generated (by default, the target is php 5.1)",
	19	'5.1'
20	20	),
21	21	'EDITION_NAME'=> array(

trunk/lib/jelix/core/defaultconfig.ini.php

r474	r516
109	109	basePath = ""
110	110
	111	; this is the url path to the jelix-www content (you can found this content in lib/jelix-www/)
	112	; because the jelix-www directory is outside the yourapp/www/ directory, you should create a link to
	113	; jelix-www, or copy its content in yourapp/www/ (with a name like 'jelix' for example)
	114	; so you should indicate the relative path of this link/directory to the basePath, or an absolute path.
	115	jelixWWWPath = "jelix/"
	116
111	117	defaultEntrypoint= index
112	118

trunk/lib/jelix/core/defaultconfig.ini.php

r474	r516
109	109	basePath = ""
110	110
	111	; this is the url path to the jelix-www content (you can found this content in lib/jelix-www/)
	112	; because the jelix-www directory is outside the yourapp/www/ directory, you should create a link to
	113	; jelix-www, or copy its content in yourapp/www/ (with a name like 'jelix' for example)
	114	; so you should indicate the relative path of this link/directory to the basePath, or an absolute path.
	115	jelixWWWPath = "jelix/"
	116
111	117	defaultEntrypoint= index
112	118

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

r478	r516
62	62	}
63	63
	64	if($path!='' && $config->urlengine['jelixWWWPath']{0} != '/')
	65	$config->urlengine['jelixWWWPath'] = $path.$config->urlengine['jelixWWWPath'];
	66
	67
64	68	/*if(preg_match("/^([a-zA-Z]{2})(?:_([a-zA-Z]{2}))?$/",$config->defaultLocale,$m)){
65	69	if(!isset($m[2])){
…	…
106	110	$config['urlengine']['basePath'] = $path;
107	111	}
	112
	113	if($path!='' && $config['urlengine']['jelixWWWPath']{0} != '/')
	114	$config['urlengine']['jelixWWWPath'] = $path.$config['urlengine']['jelixWWWPath'];
108	115
109	116	/*if(preg_match("/^([a-zA-Z]{2})(?:_([a-zA-Z]{2}))?$/",$config['defaultLocale'],$m)){

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

r478	r516
62	62	}
63	63
	64	if($path!='' && $config->urlengine['jelixWWWPath']{0} != '/')
	65	$config->urlengine['jelixWWWPath'] = $path.$config->urlengine['jelixWWWPath'];
	66
	67
64	68	/*if(preg_match("/^([a-zA-Z]{2})(?:_([a-zA-Z]{2}))?$/",$config->defaultLocale,$m)){
65	69	if(!isset($m[2])){
…	…
106	110	$config['urlengine']['basePath'] = $path;
107	111	}
	112
	113	if($path!='' && $config['urlengine']['jelixWWWPath']{0} != '/')
	114	$config['urlengine']['jelixWWWPath'] = $path.$config['urlengine']['jelixWWWPath'];
108	115
109	116	/*if(preg_match("/^([a-zA-Z]{2})(?:_([a-zA-Z]{2}))?$/",$config['defaultLocale'],$m)){

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

r451	r516
87	87	if($gJConfig->urlengine['basePath'] == ''){ // for beginners or simple site, we "guess" the base path
88	88	$gJConfig->urlengine['basePath'] = $this->url_script_path;
	89	if($gJConfig->urlengine['jelixWWWPath']{0} != '/')
	90	$gJConfig->urlengine['jelixWWWPath'] = $this->url_script_path.$gJConfig->urlengine['jelixWWWPath'];
89	91	}else if(strpos($this->url_script_path,$gJConfig->urlengine['basePath']) !== 0){
90	92	die('Jelix Error: basePath in config file doesn\'t correspond to current base path. You should setup it to '.$this->url_script_path);

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

r451	r516
87	87	if($gJConfig->urlengine['basePath'] == ''){ // for beginners or simple site, we "guess" the base path
88	88	$gJConfig->urlengine['basePath'] = $this->url_script_path;
	89	if($gJConfig->urlengine['jelixWWWPath']{0} != '/')
	90	$gJConfig->urlengine['jelixWWWPath'] = $this->url_script_path.$gJConfig->urlengine['jelixWWWPath'];
89	91	}else if(strpos($this->url_script_path,$gJConfig->urlengine['basePath']) !== 0){
90	92	die('Jelix Error: basePath in config file doesn\'t correspond to current base path. You should setup it to '.$this->url_script_path);

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

r510	r516
37	37	public $_meta = array();
38	38
39		public function __construct(){ }
	39	public function __construct(){
	40	global $gJConfig;
	41	$this->_vars['j_basePath'] = $gJConfig->urlengine['basePath'];
	42	$this->_vars['j_jelixwww'] = $gJConfig->urlengine['jelixWWWPath'];
	43	$this->_vars['j_datenow'] = date('Y-m-d');
	44	$this->_vars['j_timenow'] = date('H:i:s');
	45	}
40	46
41	47	/**

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

r510	r516
37	37	public $_meta = array();
38	38
39		public function __construct(){ }
	39	public function __construct(){
	40	global $gJConfig;
	41	$this->_vars['j_basePath'] = $gJConfig->urlengine['basePath'];
	42	$this->_vars['j_jelixwww'] = $gJConfig->urlengine['jelixWWWPath'];
	43	$this->_vars['j_datenow'] = date('Y-m-d');
	44	$this->_vars['j_timenow'] = date('H:i:s');
	45	}
40	46
41	47	/**

trunk/testapp/modules/testapp/templates/main.tpl

r386	r516
12	12
13	13	<div id="footer">
14		page HTML générée par {@jelix~jelix.framework.name@}
	14	page HTML générée le {$j_datenow} à {$j_timenow} par {@jelix~jelix.framework.name@}
15	15	</div>

trunk/testapp/modules/testapp/templates/main.tpl

r386	r516
12	12
13	13	<div id="footer">
14		page HTML générée par {@jelix~jelix.framework.name@}
	14	page HTML générée le {$j_datenow} à {$j_timenow} par {@jelix~jelix.framework.name@}
15	15	</div>

Download in other formats: Unified Diff Zip Archive

Developers' Corner

Changeset 516

Legend: