Changeset 160

Show
Ignore:
Timestamp:
05/05/06 20:15:15 (3 years ago)
Author:
laurentj
Message:

correction de problème restant à propos du bug 6566

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r156 r160  
    2323    Si l'option -withdefaultmodule est pr�nte, cr� �lement un module du 
    2424    m� nom que l'application. 
    25      
     25 
    2626    Si l'option -withcmdline est pr�nte, cr� un point d'entr�afin de d�lopper des 
    2727    scripts en ligne de commande. 
    …… 
    5858       $this->createFile(JELIX_APP_CONFIG_PATH.'dbprofils.ini.php','dbprofils.ini.php.tpl',$param); 
    5959 
    60        $param['rp_temp']=jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_TEMP_PATH); 
    61        $param['rp_var'] =jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_VAR_PATH); 
    62        $param['rp_log'] =jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_LOG_PATH); 
    63        $param['rp_conf']=jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_CONFIG_PATH); 
    64        $param['rp_www'] =jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_WWW_PATH); 
     60       $param['rp_temp']=jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_TEMP_PATH,true); 
     61       $param['rp_var'] =jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_VAR_PATH,true); 
     62       $param['rp_log'] =jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_LOG_PATH,true); 
     63       $param['rp_conf']=jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_CONFIG_PATH,true); 
     64       $param['rp_www'] =jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_WWW_PATH,true); 
     65       $param['rp_cmd'] =jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_CMD_PATH,true); 
    6566 
    6667       $this->createFile(JELIX_APP_PATH.'application.init.php','application.init.php.tpl',$param); 
    …… 
    6869 
    6970       $param = array('appname'=>$GLOBALS['APPNAME']); 
    70        $param['rp_jelix']=jxs_getRelativePath(JELIX_APP_WWW_PATH, JELIX_LIB_PATH ); 
    71        $param['rp_app']=jxs_getRelativePath(JELIX_APP_WWW_PATH, JELIX_APP_PATH ); 
     71       $param['rp_jelix']=jxs_getRelativePath(JELIX_APP_WWW_PATH, JELIX_LIB_PATH ,true); 
     72       $param['rp_app']=jxs_getRelativePath(JELIX_APP_WWW_PATH, JELIX_APP_PATH,true ); 
    7273 
    7374       $this->createFile(JELIX_APP_WWW_PATH.'index.php','www/index.php.tpl',$param); 
    …… 
    8182            $cmd->run(); 
    8283       } 
    83         
     84 
    8485       if ($this->getOption('-withcmdline')) { 
    8586            $this->createDir(JELIX_APP_CMD_PATH); 
    8687            $this->createFile(JELIX_APP_CONFIG_PATH.'config.cmdline.ini.php','config.cmdline.ini.php.tpl',$param); 
    87             $param['rp_cmd'] =jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_CMD_PATH); 
     88            $param['rp_cmd'] =jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_CMD_PATH,true); 
    8889            $this->createFile(JELIX_APP_CMD_PATH.'cmdline.php','scripts/cmdline.php.tpl',$param); 
    8990       } 

  • trunk/lib/jelix-scripts/includes/utils.lib.php

    r153 r160  
    9494 
    9595 
    96 function jxs_getPathSeparator(){ 
    97     if(preg_match("/^(\w+).*$/", PHP_OS, $m)){ 
    98         $os=$m[1]; 
    99     }else{ 
    100         $os=PHP_OS; 
    101     } 
    102     if(strpos(strtolower($os),'win')!== false) 
    103         return array("\\","![/\\\\]!"); 
    104     else 
    105        return array('/','!/!'); 
    106 } 
    10796 
    10897 
    109 function jxs_getRelativePath($path, $targetPath){ 
    110     list($sep, $cut) = jxs_getPathSeparator(); 
     98function jxs_getRelativePath($path, $targetPath, $intoString=false){ 
     99    $cut = (DIRECTORY_SEPARATOR == '/'? '!/!': "![/\\\\]!"); 
     100    $sep = DIRECTORY_SEPARATOR; 
    111101    $path = preg_split($cut,$path); 
    112102    $targetPath = preg_split($cut,$targetPath); 
    …… 
    134124    if(substr($relativePath,-1) != $sep) 
    135125       $relativePath.=$sep; 
     126    if($intoString && $sep =='\\') 
     127      $relativePath = str_replace('\\','\\\\', $relativePath); 
    136128    return $relativePath; 
    137129} 

  • trunk/lib/jelix-scripts/templates/application.init.php.tpl

    r156 r160  
    1111*/ 
    1212 
    13 define ('JELIX_APP_PATH', dirname (__FILE__).'/'); // don't change 
     13define ('JELIX_APP_PATH', dirname (__FILE__).DIRECTORY_SEPARATOR); // don't change 
    1414 
    15 define ('JELIX_APP_TEMP_PATH',    realpath(JELIX_APP_PATH.'{$rp_temp}').'/'); 
    16 define ('JELIX_APP_VAR_PATH',     realpath(JELIX_APP_PATH.'{$rp_var}').'/'); 
    17 define ('JELIX_APP_LOG_PATH',     realpath(JELIX_APP_PATH.'{$rp_log}').'/'); 
    18 define ('JELIX_APP_CONFIG_PATH',  realpath(JELIX_APP_PATH.'{$rp_conf}').'/'); 
    19 define ('JELIX_APP_WWW_PATH',     realpath(JELIX_APP_PATH.'{$rp_www}').'/'); 
    20 define ('JELIX_APP_CMD_PATH',     realpath(JELIX_APP_PATH.'{$rp_cmd}').'/'); 
     15define ('JELIX_APP_TEMP_PATH',    realpath(JELIX_APP_PATH.'{$rp_temp}').DIRECTORY_SEPARATOR); 
     16define ('JELIX_APP_VAR_PATH',     realpath(JELIX_APP_PATH.'{$rp_var}').DIRECTORY_SEPARATOR); 
     17define ('JELIX_APP_LOG_PATH',     realpath(JELIX_APP_PATH.'{$rp_log}').DIRECTORY_SEPARATOR); 
     18define ('JELIX_APP_CONFIG_PATH',  realpath(JELIX_APP_PATH.'{$rp_conf}').DIRECTORY_SEPARATOR); 
     19define ('JELIX_APP_WWW_PATH',     realpath(JELIX_APP_PATH.'{$rp_www}').DIRECTORY_SEPARATOR); 
     20define ('JELIX_APP_CMD_PATH',     realpath(JELIX_APP_PATH.'{$rp_cmd}').DIRECTORY_SEPARATOR); 
    2121 
    2222?> 

  • trunk/lib/jelix-scripts/templates/scripts/cmdline.php.tpl

    r156 r160  
    99*/ 
    1010 
    11 require_once ('{$rp_jelix}/init.php'); 
     11require_once ('{$rp_jelix}init.php'); 
    1212 
    13 require_once ('{$rp_app}/application.init.php'); 
     13require_once ('{$rp_app}application.init.php'); 
    1414 
    1515require_once (JELIX_LIB_CORE_PATH.'request/jCmdLineRequest.class.php'); 

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

    r110 r160  
    137137            $os = PHP_OS; 
    138138        } 
    139         $isWindows = (strtolower($os) == 'win'); 
     139        $isWindows = (strpos(strtolower($os),'win')!== false); 
    140140        if ($isWindows && file_exists($cachefile)) { 
    141141            @unlink($cachefile); 
    142142        } 
     143 
    143144        @rename($_tmp_file, $cachefile); 
    144145        @chmod($cachefile, 0664); 
    …… 
    178179            } 
    179180            if(!isset($m[2])) $m[2]=''; 
    180              
     181 
    181182            return '<?php '.$this->_parseFunction($m[1],$m[2]).'?>'; 
    182183        } 
    …… 
    196197                return ''; 
    197198            } 
    198              
     199 
    199200            $targs=array($res); 
    200201 
    …… 
    207208#else 
    208209                    trigger_error(jLocale::get('jelix~errors.tpl.tag.modifier.unknow',array($this->_currentTag,$m[1],$this->_sourceFile)),E_USER_ERROR); 
    209 #endif                
     210#endif 
    210211                    return ''; 
    211212                } 
Download in other formats: Unified Diff Zip Archive