Changeset 145
- Timestamp:
- 04/23/06 10:45:05 (3 years ago)
- Files:
-
- trunk/build/manifests/jelix-dev.mn (modified) (1 diff)
- trunk/build/manifests/jelix-lib.mn (modified) (2 diffs)
- trunk/build/manifests/myapp.mn (modified) (1 diff)
- trunk/build/manifests/testapp.mn (modified) (1 diff)
- trunk/lib/jelix/core/jConfig.class.php (modified) (1 diff)
- trunk/lib/jelix/core/jCoordinator.class.php (modified) (1 diff)
- trunk/lib/jelix/core/response/jResponseHtml.class.php (modified) (1 diff)
- trunk/lib/jelix/core/response/jResponseXul.class.php (modified) (1 diff)
- trunk/lib/jelix/forms/jForms.class.php (modified) (2 diffs)
- trunk/lib/jelix/utils/jFile.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/manifests/jelix-dev.mn
r113 r145 137 137 project.rng 138 138 urls.rng 139 cd lib/jelix-www/xul/test/ 140 testxulform.php 141 testxulform.xul trunk/build/manifests/jelix-lib.mn
r142 r145 86 86 jDbResultSet.postgresql.class.php 87 87 jDbTools.postgresql.class.php 88 88 89 89 cd lib/jelix/db/drivers/sqlite 90 90 jDbConnection.sqlite.class.php 91 91 jDbResultSet.sqlite.class.php 92 jDbTools.sqlite.class.php 92 jDbTools.sqlite.class.php 93 93 94 94 cd lib/jelix/events … … 237 237 magicquotes.plugin.php 238 238 plugin.xml 239 240 241 cd lib/jelix-www 242 json.js 243 cd lib/jelix-www/design 244 jelix.css 245 tooltip.css 246 cd lib/jelix-www/js 247 tooltip.js 248 cd lib/jelix-www/xul 249 jxulform.css 250 jxulform.xml 251 throbber.gif 252 trunk/build/manifests/myapp.mn
r101 r145 10 10 xmlrpc.php 11 11 index.php 12 cd myapp/www/jelix13 json.js14 cd myapp/www/jelix/styles15 tooltip.css16 jylix.css17 cd myapp/www/jelix/js18 tooltip.js19 12 cd myapp/modules 20 13 .htaccess trunk/build/manifests/testapp.mn
r132 r145 16 16 cd testapp/www/design 17 17 screen.css 18 cd testapp/www/jelix19 json.js20 cd testapp/www/jelix/styles21 tooltip.css22 jylix.css23 cd testapp/www/jelix/js24 tooltip.js25 18 cd testapp/modules 26 19 .htaccess trunk/lib/jelix/core/jConfig.class.php
r98 r145 42 42 } 43 43 $config->OS = $os; 44 $config->isWindows = (str tolower($os) == 'win');44 $config->isWindows = (strpos(strtolower($os),'win')!== false); 45 45 if(trim( $config->defaultAction) == '') 46 46 $config->defaultAction = '_'; trunk/lib/jelix/core/jCoordinator.class.php
r138 r145 62 62 $gJCoord = $this; 63 63 64 if(JELIX_APP_TEMP_PATH=='/'){ // le realpath dans application.ini.php a renvoy�alse... 65 die('Jelix Error: Application temp directory doesn\'t exist !'); 66 } 64 67 if(!is_writable(JELIX_APP_TEMP_PATH)){ 65 trigger_error('Temp directory is not writable',E_USER_ERROR);68 die('Jelix Error: Application temp directory is not writable'); 66 69 } 67 70 // load configuration data trunk/lib/jelix/core/response/jResponseHtml.class.php
r138 r145 159 159 final public function outputErrors(){ 160 160 if(!$this->_headSent){ 161 header('Content-Type: text/html;charset='.$this->_charset);161 if(!$this->_sendHttpHeader) header('Content-Type: text/html;charset='.$this->_charset); 162 162 echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">', "\n"; 163 163 echo '<html><head><title>Errors</title></head><body>'; trunk/lib/jelix/core/response/jResponseXul.class.php
r138 r145 116 116 function outputErrors(){ 117 117 if(!$this->_headSent){ 118 if(!$this->_sendHttpHeader) header('Content-Type: application/vnd.mozilla.xul+xml;charset='.$GLOBALS['gJConfig']->defaultCharset); 118 119 echo '<?xml version="1.0" encoding="'.$GLOBALS['gJConfig']->defaultCharset.'" ?>'."\n"; 119 120 echo '<',$this->_root,' title="Erreurs" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">'; trunk/lib/jelix/forms/jForms.class.php
r134 r145 43 43 global $gJCoord; 44 44 if(empty($internalIdName)){ 45 $internalId = 0;45 $internalId = md5(0); 46 46 }else{ 47 47 $internalId = $gJCoord->request->getParam($internalIdName); 48 if($internalId == null) $internalId= 0;48 if($internalId == null) $internalId=md5(0); 49 49 } 50 50 … … 70 70 global $gJCoord; 71 71 if(empty($internalIdName)){ 72 $internalId = 0;72 $internalId = md5(0); 73 73 }else{ 74 74 $internalId = $gJCoord->request->getParam($internalIdName); 75 if($internalId == null) $internalId= 0;75 if($internalId == null) $internalId=md5(0); 76 76 } 77 77 trunk/lib/jelix/utils/jFile.class.php
r12 r145 70 70 // because it cannot overwrite files with rename() 71 71 if ($GLOBALS['gJConfig']->isWindows && file_exists($file)) { 72 @unlink($file);72 unlink($file); 73 73 } 74 @rename($_tmp_file, $file);74 rename($_tmp_file, $file); 75 75 @chmod($file, 0664); 76 76
