Changeset 976
- Timestamp:
- 06/04/08 23:43:50 (6 months ago)
- Files:
-
- trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (1 diff)
- trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (1 diff)
- trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (1 diff)
- trunk/lib/jelix/core/jConfigCompiler.class.php (modified) (1 diff)
- trunk/lib/jelix/core/jCoordinator.class.php (modified) (1 diff)
- trunk/lib/jelix/core/jCoordinator.class.php (modified) (1 diff)
- trunk/lib/jelix/core/jCoordinator.class.php (modified) (1 diff)
- trunk/lib/jelix/core/jCoordinator.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/jelix/core/jConfigCompiler.class.php
r937 r976 30 30 static public function read($configFile){ 31 31 32 if(JELIX_APP_TEMP_PATH=='/'){ 33 // if it equals to '/', this is because realpath has returned false in the application.init.php 34 // so this is because the path doesn't exist. 35 die('Jelix Error: Application temp directory doesn\'t exist !'); 36 } 37 38 if(!is_writable(JELIX_APP_TEMP_PATH)){ 39 die('Jelix Error: Application temp directory is not writable'); 40 } 41 32 42 #if ENABLE_PHP_JELIX 33 43 $config = jelix_read_ini(JELIX_LIB_CORE_PATH.'defaultconfig.ini.php'); 34 44 35 @jelix_read_ini(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php', $config);45 @jelix_read_ini(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php', $config); 36 46 37 47 if($configFile !='defaultconfig.ini.php'){ 38 48 if(!file_exists(JELIX_APP_CONFIG_PATH.$configFile)) 39 49 die("Jelix config file $configFile is missing !"); 40 if( false === @jelix_read_ini(JELIX_APP_CONFIG_PATH.$configFile, $config))50 if( false === @jelix_read_ini(JELIX_APP_CONFIG_PATH.$configFile, $config)) 41 51 die("Syntax error in the Jelix config file $configFile !"); 42 52 } 43 $config->isWindows = (DIRECTORY_SEPARATOR == '\\'); 53 54 $config->isWindows = (DIRECTORY_SEPARATOR === '\\'); 44 55 if(trim( $config->startAction) == '') { 45 56 $config->startAction = ':'; trunk/lib/jelix/core/jConfigCompiler.class.php
r937 r976 30 30 static public function read($configFile){ 31 31 32 if(JELIX_APP_TEMP_PATH=='/'){ 33 // if it equals to '/', this is because realpath has returned false in the application.init.php 34 // so this is because the path doesn't exist. 35 die('Jelix Error: Application temp directory doesn\'t exist !'); 36 } 37 38 if(!is_writable(JELIX_APP_TEMP_PATH)){ 39 die('Jelix Error: Application temp directory is not writable'); 40 } 41 32 42 #if ENABLE_PHP_JELIX 33 43 $config = jelix_read_ini(JELIX_LIB_CORE_PATH.'defaultconfig.ini.php'); 34 44 35 @jelix_read_ini(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php', $config);45 @jelix_read_ini(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php', $config); 36 46 37 47 if($configFile !='defaultconfig.ini.php'){ 38 48 if(!file_exists(JELIX_APP_CONFIG_PATH.$configFile)) 39 49 die("Jelix config file $configFile is missing !"); 40 if( false === @jelix_read_ini(JELIX_APP_CONFIG_PATH.$configFile, $config))50 if( false === @jelix_read_ini(JELIX_APP_CONFIG_PATH.$configFile, $config)) 41 51 die("Syntax error in the Jelix config file $configFile !"); 42 52 } 43 $config->isWindows = (DIRECTORY_SEPARATOR == '\\'); 53 54 $config->isWindows = (DIRECTORY_SEPARATOR === '\\'); 44 55 if(trim( $config->startAction) == '') { 45 56 $config->startAction = ':'; trunk/lib/jelix/core/jConfigCompiler.class.php
r937 r976 30 30 static public function read($configFile){ 31 31 32 if(JELIX_APP_TEMP_PATH=='/'){ 33 // if it equals to '/', this is because realpath has returned false in the application.init.php 34 // so this is because the path doesn't exist. 35 die('Jelix Error: Application temp directory doesn\'t exist !'); 36 } 37 38 if(!is_writable(JELIX_APP_TEMP_PATH)){ 39 die('Jelix Error: Application temp directory is not writable'); 40 } 41 32 42 #if ENABLE_PHP_JELIX 33 43 $config = jelix_read_ini(JELIX_LIB_CORE_PATH.'defaultconfig.ini.php'); 34 44 35 @jelix_read_ini(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php', $config);45 @jelix_read_ini(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php', $config); 36 46 37 47 if($configFile !='defaultconfig.ini.php'){ 38 48 if(!file_exists(JELIX_APP_CONFIG_PATH.$configFile)) 39 49 die("Jelix config file $configFile is missing !"); 40 if( false === @jelix_read_ini(JELIX_APP_CONFIG_PATH.$configFile, $config))50 if( false === @jelix_read_ini(JELIX_APP_CONFIG_PATH.$configFile, $config)) 41 51 die("Syntax error in the Jelix config file $configFile !"); 42 52 } 43 $config->isWindows = (DIRECTORY_SEPARATOR == '\\'); 53 54 $config->isWindows = (DIRECTORY_SEPARATOR === '\\'); 44 55 if(trim( $config->startAction) == '') { 45 56 $config->startAction = ':'; trunk/lib/jelix/core/jConfigCompiler.class.php
r937 r976 30 30 static public function read($configFile){ 31 31 32 if(JELIX_APP_TEMP_PATH=='/'){ 33 // if it equals to '/', this is because realpath has returned false in the application.init.php 34 // so this is because the path doesn't exist. 35 die('Jelix Error: Application temp directory doesn\'t exist !'); 36 } 37 38 if(!is_writable(JELIX_APP_TEMP_PATH)){ 39 die('Jelix Error: Application temp directory is not writable'); 40 } 41 32 42 #if ENABLE_PHP_JELIX 33 43 $config = jelix_read_ini(JELIX_LIB_CORE_PATH.'defaultconfig.ini.php'); 34 44 35 @jelix_read_ini(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php', $config);45 @jelix_read_ini(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php', $config); 36 46 37 47 if($configFile !='defaultconfig.ini.php'){ 38 48 if(!file_exists(JELIX_APP_CONFIG_PATH.$configFile)) 39 49 die("Jelix config file $configFile is missing !"); 40 if( false === @jelix_read_ini(JELIX_APP_CONFIG_PATH.$configFile, $config))50 if( false === @jelix_read_ini(JELIX_APP_CONFIG_PATH.$configFile, $config)) 41 51 die("Syntax error in the Jelix config file $configFile !"); 42 52 } 43 $config->isWindows = (DIRECTORY_SEPARATOR == '\\'); 53 54 $config->isWindows = (DIRECTORY_SEPARATOR === '\\'); 44 55 if(trim( $config->startAction) == '') { 45 56 $config->startAction = ':'; trunk/lib/jelix/core/jCoordinator.class.php
r845 r976 80 80 $gJCoord = $this; 81 81 82 if(JELIX_APP_TEMP_PATH=='/'){ // le realpath dans application.ini.php a renvoyé false...83 die('Jelix Error: Application temp directory doesn\'t exist !');84 }85 if(!is_writable(JELIX_APP_TEMP_PATH)){86 die('Jelix Error: Application temp directory is not writable');87 }88 82 // load configuration data 89 83 $gJConfig = jConfig::load($configFile); trunk/lib/jelix/core/jCoordinator.class.php
r845 r976 80 80 $gJCoord = $this; 81 81 82 if(JELIX_APP_TEMP_PATH=='/'){ // le realpath dans application.ini.php a renvoyé false...83 die('Jelix Error: Application temp directory doesn\'t exist !');84 }85 if(!is_writable(JELIX_APP_TEMP_PATH)){86 die('Jelix Error: Application temp directory is not writable');87 }88 82 // load configuration data 89 83 $gJConfig = jConfig::load($configFile); trunk/lib/jelix/core/jCoordinator.class.php
r845 r976 80 80 $gJCoord = $this; 81 81 82 if(JELIX_APP_TEMP_PATH=='/'){ // le realpath dans application.ini.php a renvoyé false...83 die('Jelix Error: Application temp directory doesn\'t exist !');84 }85 if(!is_writable(JELIX_APP_TEMP_PATH)){86 die('Jelix Error: Application temp directory is not writable');87 }88 82 // load configuration data 89 83 $gJConfig = jConfig::load($configFile); trunk/lib/jelix/core/jCoordinator.class.php
r845 r976 80 80 $gJCoord = $this; 81 81 82 if(JELIX_APP_TEMP_PATH=='/'){ // le realpath dans application.ini.php a renvoyé false...83 die('Jelix Error: Application temp directory doesn\'t exist !');84 }85 if(!is_writable(JELIX_APP_TEMP_PATH)){86 die('Jelix Error: Application temp directory is not writable');87 }88 82 // load configuration data 89 83 $gJConfig = jConfig::load($configFile);
