Changeset 669

Show
Ignore:
Timestamp:
11/30/07 16:11:52 (1 year ago)
Author:
laurentj
Message:

ticket #312: some optimization in the source code have been done.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ext/jelix/jelix.c

    r649 r669  
    9191 
    9292    REGISTER_STRING_CONSTANT("JELIX_NAMESPACE_BASE", "http://jelix.org/ns/", CONST_CS | CONST_PERSISTENT); 
    93     REGISTER_LONG_CONSTANT("JPDO_FETCH_OBJ", 5, CONST_CS | CONST_PERSISTENT); 
    94     REGISTER_LONG_CONSTANT("JPDO_FETCH_ORI_NEXT", 0, CONST_CS | CONST_PERSISTENT); 
    95     REGISTER_LONG_CONSTANT("JPDO_FETCH_ORI_FIRST", 2, CONST_CS | CONST_PERSISTENT); 
    96     REGISTER_LONG_CONSTANT("JPDO_FETCH_COLUMN", 7, CONST_CS | CONST_PERSISTENT); 
    97     REGISTER_LONG_CONSTANT("JPDO_FETCH_CLASS", 8, CONST_CS | CONST_PERSISTENT); 
    98     REGISTER_LONG_CONSTANT("JPDO_ATTR_STATEMENT_CLASS", 13, CONST_CS | CONST_PERSISTENT); 
    99     REGISTER_LONG_CONSTANT("JPDO_ATTR_AUTOCOMMIT", 0, CONST_CS | CONST_PERSISTENT); 
    100     REGISTER_LONG_CONSTANT("JPDO_ATTR_CURSOR", 10, CONST_CS | CONST_PERSISTENT); 
    101     REGISTER_LONG_CONSTANT("JPDO_CURSOR_SCROLL", 1, CONST_CS | CONST_PERSISTENT); 
    102     REGISTER_LONG_CONSTANT("JPDO_ATTR_ERRMODE", 3, CONST_CS | CONST_PERSISTENT); 
    103     REGISTER_LONG_CONSTANT("JPDO_ERRMODE_EXCEPTION", 2, CONST_CS | CONST_PERSISTENT); 
    104     REGISTER_LONG_CONSTANT("JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY", 1000, CONST_CS | CONST_PERSISTENT); 
    10593 
    10694        return SUCCESS; 

  • trunk/ext/jelix/jelix.c

    r649 r669  
    9191 
    9292    REGISTER_STRING_CONSTANT("JELIX_NAMESPACE_BASE", "http://jelix.org/ns/", CONST_CS | CONST_PERSISTENT); 
    93     REGISTER_LONG_CONSTANT("JPDO_FETCH_OBJ", 5, CONST_CS | CONST_PERSISTENT); 
    94     REGISTER_LONG_CONSTANT("JPDO_FETCH_ORI_NEXT", 0, CONST_CS | CONST_PERSISTENT); 
    95     REGISTER_LONG_CONSTANT("JPDO_FETCH_ORI_FIRST", 2, CONST_CS | CONST_PERSISTENT); 
    96     REGISTER_LONG_CONSTANT("JPDO_FETCH_COLUMN", 7, CONST_CS | CONST_PERSISTENT); 
    97     REGISTER_LONG_CONSTANT("JPDO_FETCH_CLASS", 8, CONST_CS | CONST_PERSISTENT); 
    98     REGISTER_LONG_CONSTANT("JPDO_ATTR_STATEMENT_CLASS", 13, CONST_CS | CONST_PERSISTENT); 
    99     REGISTER_LONG_CONSTANT("JPDO_ATTR_AUTOCOMMIT", 0, CONST_CS | CONST_PERSISTENT); 
    100     REGISTER_LONG_CONSTANT("JPDO_ATTR_CURSOR", 10, CONST_CS | CONST_PERSISTENT); 
    101     REGISTER_LONG_CONSTANT("JPDO_CURSOR_SCROLL", 1, CONST_CS | CONST_PERSISTENT); 
    102     REGISTER_LONG_CONSTANT("JPDO_ATTR_ERRMODE", 3, CONST_CS | CONST_PERSISTENT); 
    103     REGISTER_LONG_CONSTANT("JPDO_ERRMODE_EXCEPTION", 2, CONST_CS | CONST_PERSISTENT); 
    104     REGISTER_LONG_CONSTANT("JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY", 1000, CONST_CS | CONST_PERSISTENT); 
    10593 
    10694        return SUCCESS; 

  • trunk/ext/jelix/tests/jelix_const_001.phpt

    r387 r669  
    66<?php  
    77echo  JELIX_NAMESPACE_BASE,"\n"; 
    8 echo  JPDO_FETCH_OBJ,"\n"; 
    9 echo  JPDO_FETCH_ORI_NEXT,"\n"; 
    10 echo  JPDO_FETCH_ORI_FIRST,"\n"; 
    11 echo  JPDO_FETCH_COLUMN,"\n"; 
    12 echo  JPDO_FETCH_CLASS,"\n"; 
    13 echo  JPDO_ATTR_STATEMENT_CLASS,"\n"; 
    14 echo  JPDO_ATTR_AUTOCOMMIT,"\n"; 
    15 echo  JPDO_ATTR_CURSOR,"\n"; 
    16 echo  JPDO_CURSOR_SCROLL,"\n"; 
    17 echo  JPDO_ATTR_ERRMODE,"\n"; 
    18 echo  JPDO_ERRMODE_EXCEPTION,"\n"; 
    19 echo  JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY,"\n"; 
    20  
    218?> 
    229--EXPECT-- 
    2310http://jelix.org/ns/ 
    24 5 
    25 0 
    26 2 
    27 7 
    28 8 
    29 13 
    30 0 
    31 10 
    32 1 
    33 3 
    34 2 
    35 1000 

  • trunk/ext/jelix/tests/jelix_const_001.phpt

    r387 r669  
    66<?php  
    77echo  JELIX_NAMESPACE_BASE,"\n"; 
    8 echo  JPDO_FETCH_OBJ,"\n"; 
    9 echo  JPDO_FETCH_ORI_NEXT,"\n"; 
    10 echo  JPDO_FETCH_ORI_FIRST,"\n"; 
    11 echo  JPDO_FETCH_COLUMN,"\n"; 
    12 echo  JPDO_FETCH_CLASS,"\n"; 
    13 echo  JPDO_ATTR_STATEMENT_CLASS,"\n"; 
    14 echo  JPDO_ATTR_AUTOCOMMIT,"\n"; 
    15 echo  JPDO_ATTR_CURSOR,"\n"; 
    16 echo  JPDO_CURSOR_SCROLL,"\n"; 
    17 echo  JPDO_ATTR_ERRMODE,"\n"; 
    18 echo  JPDO_ERRMODE_EXCEPTION,"\n"; 
    19 echo  JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY,"\n"; 
    20  
    218?> 
    229--EXPECT-- 
    2310http://jelix.org/ns/ 
    24 5 
    25 0 
    26 2 
    27 7 
    28 8 
    29 13 
    30 0 
    31 10 
    32 1 
    33 3 
    34 2 
    35 1000 

  • trunk/lib/jelix/core/jConfig.class.php

    r386 r669  
    9494        } 
    9595        if($compil){ 
    96             require_once(JELIX_LIB_CORE_PATH.'jConfigCompiler.class.php'); 
     96            require(JELIX_LIB_CORE_PATH.'jConfigCompiler.class.php'); 
    9797            return jConfigCompiler::read($configFile); 
    9898        }else 

  • trunk/lib/jelix/core/jConfig.class.php

    r386 r669  
    9494        } 
    9595        if($compil){ 
    96             require_once(JELIX_LIB_CORE_PATH.'jConfigCompiler.class.php'); 
     96            require(JELIX_LIB_CORE_PATH.'jConfigCompiler.class.php'); 
    9797            return jConfigCompiler::read($configFile); 
    9898        }else 

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

    r559 r669  
    4040                die("Syntax error in the Jelix config file $configFile !"); 
    4141        } 
    42         $config->isWindows = (substr(PHP_OS,0,3) == 'WIN'); 
     42        $config->isWindows = (DIRECTORY_SEPARATOR == '\\'); 
    4343        if(trim( $config->startAction) == '') 
    4444             $config->startAction = '_'; 
    …… 
    9090            self::_mergeConfig($config, $userConfig); 
    9191        } 
    92         $config['isWindows'] = (substr(PHP_OS,0,3) == 'WIN'); 
     92        $config['isWindows'] = (DIRECTORY_SEPARATOR == '\\'); 
    9393        if(trim( $config['startAction']) == '') 
    9494             $config['startAction'] = '_'; 

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

    r559 r669  
    4040                die("Syntax error in the Jelix config file $configFile !"); 
    4141        } 
    42         $config->isWindows = (substr(PHP_OS,0,3) == 'WIN'); 
     42        $config->isWindows = (DIRECTORY_SEPARATOR == '\\'); 
    4343        if(trim( $config->startAction) == '') 
    4444             $config->startAction = '_'; 
    …… 
    9090            self::_mergeConfig($config, $userConfig); 
    9191        } 
    92         $config['isWindows'] = (substr(PHP_OS,0,3) == 'WIN'); 
     92        $config['isWindows'] = (DIRECTORY_SEPARATOR == '\\'); 
    9393        if(trim( $config['startAction']) == '') 
    9494             $config['startAction'] = '_'; 

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

    r668 r669  
    256256            throw new jException('jelix~errors.ad.controller.file.unknow',array($this->actionName,$ctrlpath)); 
    257257        } 
    258         require_once($ctrlpath); 
     258        require($ctrlpath); 
    259259        $class = $selector->getClass(); 
    260260        if(!class_exists($class,false)){ 

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

    r668 r669  
    256256            throw new jException('jelix~errors.ad.controller.file.unknow',array($this->actionName,$ctrlpath)); 
    257257        } 
    258         require_once($ctrlpath); 
     258        require($ctrlpath); 
    259259        $class = $selector->getClass(); 
    260260        if(!class_exists($class,false)){ 

  • trunk/lib/jelix/core/request/jJsonRpcRequest.class.php

    r586 r669  
    1313 * the jJsonRpcRequest require jJsonRpc class 
    1414 */ 
    15 require_once (JELIX_LIB_UTILS_PATH . 'jJsonRpc.class.php'); 
     15require(JELIX_LIB_UTILS_PATH.'jJsonRpc.class.php'); 
    1616 
    1717/** 

  • trunk/lib/jelix/core/request/jJsonRpcRequest.class.php

    r586 r669  
    1313 * the jJsonRpcRequest require jJsonRpc class 
    1414 */ 
    15 require_once (JELIX_LIB_UTILS_PATH . 'jJsonRpc.class.php'); 
     15require(JELIX_LIB_UTILS_PATH.'jJsonRpc.class.php'); 
    1616 
    1717/** 

  • trunk/lib/jelix/core/request/jXmlRpcRequest.class.php

    r586 r669  
    1414* 
    1515*/ 
    16 require_once (JELIX_LIB_UTILS_PATH    . 'jXmlRpc.class.php'); 
     16require(JELIX_LIB_UTILS_PATH. 'jXmlRpc.class.php'); 
    1717 
    1818 

  • trunk/lib/jelix/core/request/jXmlRpcRequest.class.php

    r586 r669  
    1414* 
    1515*/ 
    16 require_once (JELIX_LIB_UTILS_PATH    . 'jXmlRpc.class.php'); 
     16require(JELIX_LIB_UTILS_PATH. 'jXmlRpc.class.php'); 
    1717 
    1818 

  • trunk/lib/jelix/core/response/jResponseLatexToPdf.class.php

    r559 r669  
    99* @licence     GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 
    1010*/ 
    11  
    12 define ('PDF_LATEX_RESPONSE_CACHE', JELIX_APP_TEMP_PATH.'responseLatexToPdf/'); 
    1311 
    1412/** 
    …… 
    5755    public $pdflatexPath='pdflatex'; 
    5856 
     57    public $cachePath= ''; 
     58 
    5959    /** 
    6060     * constructor; 
    …… 
    6262     */ 
    6363    function __construct (){ 
     64        $this->cachePath = JELIX_APP_TEMP_PATH.'responseLatexToPdf/'; 
    6465        $this->body = new jTpl(); 
    6566        parent::__construct(); 
    …… 
    118119        $fbase='cache-'.md5($data); 
    119120         
    120         $texFile=PDF_LATEX_RESPONSE_CACHE.$fbase.'.tex'; 
    121         $pdfFile=PDF_LATEX_RESPONSE_CACHE.$fbase.'.pdf'; 
     121        $texFile=$this->cachePath.$fbase.'.tex'; 
     122        $pdfFile=$this->cachePath.$fbase.'.pdf'; 
    122123 
    123124        if (! file_exists($pdfFile)){ 
    …… 
    129130            $retVal=1;   
    130131                exec(' 
    131             TEXMFOUTPUT='.PDF_LATEX_RESPONSE_CACHE.' && export TEXMFOUTPUT && TEXINPUTS=:'.PDF_LATEX_RESPONSE_CACHE.' && export TEXINPUTS && 
     132            TEXMFOUTPUT='.$this->cachePath.' && export TEXMFOUTPUT && TEXINPUTS=:'.$this->cachePath.' && export TEXINPUTS && 
    132133            '.$this->pdflatexPath.' --interaction=batchmode '.$texFile, $output, $retVal); 
    133134            if ($retVal==0){ 
    …… 
    159160     */ 
    160161    public function clearCache(){ 
    161         jFile::removeDir(PDF_LATEX_RESPONSE_CACHE, false); 
     162        jFile::removeDir($this->cachePath, false); 
    162163    } 
    163164 

  • trunk/lib/jelix/core/response/jResponseLatexToPdf.class.php

    r559 r669  
    99* @licence     GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 
    1010*/ 
    11  
    12 define ('PDF_LATEX_RESPONSE_CACHE', JELIX_APP_TEMP_PATH.'responseLatexToPdf/'); 
    1311 
    1412/** 
    …… 
    5755    public $pdflatexPath='pdflatex'; 
    5856 
     57    public $cachePath= ''; 
     58 
    5959    /** 
    6060     * constructor; 
    …… 
    6262     */ 
    6363    function __construct (){ 
     64        $this->cachePath = JELIX_APP_TEMP_PATH.'responseLatexToPdf/'; 
    6465        $this->body = new jTpl(); 
    6566        parent::__construct(); 
    …… 
    118119        $fbase='cache-'.md5($data); 
    119120         
    120         $texFile=PDF_LATEX_RESPONSE_CACHE.$fbase.'.tex'; 
    121         $pdfFile=PDF_LATEX_RESPONSE_CACHE.$fbase.'.pdf'; 
     121        $texFile=$this->cachePath.$fbase.'.tex'; 
     122        $pdfFile=$this->cachePath.$fbase.'.pdf'; 
    122123 
    123124        if (! file_exists($pdfFile)){ 
    …… 
    129130            $retVal=1;   
    130131                exec(' 
    131             TEXMFOUTPUT='.PDF_LATEX_RESPONSE_CACHE.' && export TEXMFOUTPUT && TEXINPUTS=:'.PDF_LATEX_RESPONSE_CACHE.' && export TEXINPUTS && 
     132            TEXMFOUTPUT='.$this->cachePath.' && export TEXMFOUTPUT && TEXINPUTS=:'.$this->cachePath.' && export TEXINPUTS && 
    132133            '.$this->pdflatexPath.' --interaction=batchmode '.$texFile, $output, $retVal); 
    133134            if ($retVal==0){ 
    …… 
    159160     */ 
    160161    public function clearCache(){ 
    161         jFile::removeDir(PDF_LATEX_RESPONSE_CACHE, false); 
     162        jFile::removeDir($this->cachePath, false); 
    162163    } 
    163164 

  • trunk/lib/jelix/dao/jDaoCompiler.class.php

    r660 r669  
    3737 * 
    3838 */ 
    39 require_once (JELIX_LIB_DAO_PATH.'jDaoParser.class.php'); 
    40 require_once (JELIX_LIB_DAO_PATH.'jDaoProperty.class.php'); 
    41 require_once (JELIX_LIB_DAO_PATH.'jDaoMethod.class.php'); 
    42 require_once (JELIX_LIB_DAO_PATH.'jDaoGenerator.class.php'); 
     39require(JELIX_LIB_DAO_PATH.'jDaoParser.class.php'); 
     40require(JELIX_LIB_DAO_PATH.'jDaoProperty.class.php'); 
     41require(JELIX_LIB_DAO_PATH.'jDaoMethod.class.php'); 
     42require(JELIX_LIB_DAO_PATH.'jDaoGenerator.class.php'); 
    4343#endif 
    4444 

  • trunk/lib/jelix/dao/jDaoCompiler.class.php

    r660 r669  
    3737 * 
    3838 */ 
    39 require_once (JELIX_LIB_DAO_PATH.'jDaoParser.class.php'); 
    40 require_once (JELIX_LIB_DAO_PATH.'jDaoProperty.class.php'); 
    41 require_once (JELIX_LIB_DAO_PATH.'jDaoMethod.class.php'); 
    42 require_once (JELIX_LIB_DAO_PATH.'jDaoGenerator.class.php'); 
     39require(JELIX_LIB_DAO_PATH.'jDaoParser.class.php'); 
     40require(JELIX_LIB_DAO_PATH.'jDaoProperty.class.php'); 
     41require(JELIX_LIB_DAO_PATH.'jDaoMethod.class.php'); 
     42require(JELIX_LIB_DAO_PATH.'jDaoGenerator.class.php'); 
    4343#endif 
    4444 

  • trunk/lib/jelix/db/jDb.class.php

    r639 r669  
    3636 * 
    3737 */ 
    38 require_once(JELIX_LIB_DB_PATH.'jDbConnection.class.php'); 
    39 require_once(JELIX_LIB_DB_PATH.'jDbResultSet.class.php'); 
     38require(JELIX_LIB_DB_PATH.'jDbConnection.class.php'); 
     39require(JELIX_LIB_DB_PATH.'jDbResultSet.class.php'); 
    4040#endif 
    4141 

  • trunk/lib/jelix/db/jDb.class.php

    r639 r669  
    3636 * 
    3737 */ 
    38 require_once(JELIX_LIB_DB_PATH.'jDbConnection.class.php'); 
    39 require_once(JELIX_LIB_DB_PATH.'jDbResultSet.class.php'); 
     38require(JELIX_LIB_DB_PATH.'jDbConnection.class.php'); 
     39require(JELIX_LIB_DB_PATH.'jDbResultSet.class.php'); 
    4040#endif 
    4141 

  • trunk/lib/jelix/db/jDbPDOConnection.class.php

    r655 r669  
    99* @licence  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file 
    1010*/ 
    11 #ifnot ENABLE_PHP_JELIX 
    12 /** 
    13  * PDO constant name have been change between php 5.0 and 5.1. So we use our own constant. 
    14  * @link http://lxr.php.net/source/php-src/ext/pdo/php_pdo_driver.h 
    15  */ 
    16 define('JPDO_FETCH_OBJ',5); // PDO::FETCH_OBJ 
    17 define('JPDO_FETCH_ORI_NEXT',0); // PDO::FETCH_ORI_NEXT 
    18 define('JPDO_FETCH_ORI_FIRST',2); 
    19 define('JPDO_FETCH_COLUMN',7); // PDO::FETCH_COLUMN 
    20 define('JPDO_FETCH_CLASS',8); // PDO::FETCH_CLASS 
    21 define('JPDO_ATTR_STATEMENT_CLASS',13); //PDO::ATTR_STATEMENT_CLASS 
    22 define('JPDO_ATTR_AUTOCOMMIT',0); //PDO::ATTR_AUTOCOMMIT 
    23 define('JPDO_ATTR_CURSOR',10); // PDO::ATTR_CURSOR 
    24 define('JPDO_CURSOR_SCROLL',1); //PDO::CURSOR_SCROLL 
    25 define('JPDO_ATTR_ERRMODE',3); // PDO::ATTR_ERRMODE 
    26 define('JPDO_ERRMODE_EXCEPTION',2); // PDO::ERRMODE_EXCEPTION 
    27 define('JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY',1000); // PDO::MYSQL_ATTR_USE_BUFFERED_QUERY 
    28 #endif 
     11 
    2912/** 
    3013 * a resultset based on PDOStatement 
    …… 
    4629     * @return array list of object which contain all rows 
    4730     */ 
    48     public function fetchAll ( $fetch_style = JPDO_FETCH_OBJ, $column_index=0 ){ 
     31    public function fetchAll ( $fetch_style = jDbPDOConnection::JPDO_FETCH_OBJ, $column_index=0 ){ 
    4932        if($this->_fetchMode){ 
    50             if( $this->_fetchMode != JPDO_FETCH_COLUMN) 
     33            if( $this->_fetchMode != jDbPDOConnection::JPDO_FETCH_COLUMN) 
    5134                return parent::fetchAll($this->_fetchMode); 
    5235            else 
    5336                return parent::fetchAll($this->_fetchMode, $column_index); 
    5437        }else{ 
    55             return parent::fetchAll( JPDO_FETCH_OBJ); 
     38            return parent::fetchAll( jDbPDOConnection::JPDO_FETCH_OBJ); 
    5639        } 
    5740    } 
    …… 
    7356 */ 
    7457class jDbPDOConnection extends PDO { 
     58 
     59    /** 
     60    * PDO constant name have been change between php 5.0 and 5.1. So we use our own constant. 
     61    * @link http://lxr.php.net/source/php-src/ext/pdo/php_pdo_driver.h 
     62    */ 
     63    const JPDO_FETCH_OBJ = 5; // PDO::FETCH_OBJ 
     64    const JPDO_FETCH_ORI_NEXT = 0; // PDO::FETCH_ORI_NEXT 
     65    const JPDO_FETCH_ORI_FIRST = 2; 
     66    const JPDO_FETCH_COLUMN = 7; // PDO::FETCH_COLUMN 
     67    const JPDO_FETCH_CLASS = 8; // PDO::FETCH_CLASS 
     68    const JPDO_ATTR_STATEMENT_CLASS = 13; //PDO::ATTR_STATEMENT_CLASS 
     69    const JPDO_ATTR_AUTOCOMMIT = 0; //PDO::ATTR_AUTOCOMMIT 
     70    const JPDO_ATTR_CURSOR = 10; // PDO::ATTR_CURSOR 
     71    const JPDO_CURSOR_SCROLL = 1; //PDO::CURSOR_SCROLL 
     72    const JPDO_ATTR_ERRMODE = 3; // PDO::ATTR_ERRMODE 
     73    const JPDO_ERRMODE_EXCEPTION = 2; // PDO::ERRMODE_EXCEPTION 
     74    const JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY = 1000; // PDO::MYSQL_ATTR_USE_BUFFERED_QUERY 
    7575 
    7676    private $_mysqlCharsets =array( 'UTF-8'=>'utf8', 'ISO-8859-1'=>'latin1'); 
    …… 
    107107        unset($prof['driver']); 
    108108        parent::__construct($profil['dsn'], $user, $password, $prof); 
    109         $this->setAttribute(JPDO_ATTR_STATEMENT_CLASS, array('jDbPDOResultSet')); 
    110         $this->setAttribute(JPDO_ATTR_ERRMODE, JPDO_ERRMODE_EXCEPTION); 
     109        $this->setAttribute(self::JPDO_ATTR_STATEMENT_CLASS, array('jDbPDOResultSet')); 
     110        $this->setAttribute(self::JPDO_ATTR_ERRMODE, self::JPDO_ERRMODE_EXCEPTION); 
    111111        // on ne peut pas lancer deux query en même temps avec PDO ! sauf si on utilise mysql 
    112112        // et que l'on utilise cet attribut... 
    113113        if($this->dbms == 'mysql') 
    114             $this->setAttribute(JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY, true); 
     114            $this->setAttribute(self::JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY, true); 
    115115     
    116116        if(isset($prof['force_encoding']) && $prof['force_encoding']==true){ 
    …… 
    132132        case 1: 
    133133            $rs = parent::query($args[0]); 
    134             $rs->setFetchMode(JPDO_FETCH_OBJ); 
     134            $rs->setFetchMode(self::JPDO_FETCH_OBJ); 
    135135            return $rs; 
    136136            break; 
    …… 
    165165    */ 
    166166    public function setAutoCommit($state=true){ 
    167         $this->setAttribute(JPDO_ATTR_AUTOCOMMIT,$state); 
     167        $this->setAttribute(self::JPDO_ATTR_AUTOCOMMIT,$state); 
    168168    } 
    169169 

  • trunk/lib/jelix/db/jDbPDOConnection.class.php

    r655 r669  
    99* @licence  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file 
    1010*/ 
    11 #ifnot ENABLE_PHP_JELIX 
    12 /** 
    13  * PDO constant name have been change between php 5.0 and 5.1. So we use our own constant. 
    14  * @link http://lxr.php.net/source/php-src/ext/pdo/php_pdo_driver.h 
    15  */ 
    16 define('JPDO_FETCH_OBJ',5); // PDO::FETCH_OBJ 
    17 define('JPDO_FETCH_ORI_NEXT',0); // PDO::FETCH_ORI_NEXT 
    18 define('JPDO_FETCH_ORI_FIRST',2); 
    19 define('JPDO_FETCH_COLUMN',7); // PDO::FETCH_COLUMN 
    20 define('JPDO_FETCH_CLASS',8); // PDO::FETCH_CLASS 
    21 define('JPDO_ATTR_STATEMENT_CLASS',13); //PDO::ATTR_STATEMENT_CLASS 
    22 define('JPDO_ATTR_AUTOCOMMIT',0); //PDO::ATTR_AUTOCOMMIT 
    23 define('JPDO_ATTR_CURSOR',10); // PDO::ATTR_CURSOR 
    24 define('JPDO_CURSOR_SCROLL',1); //PDO::CURSOR_SCROLL 
    25 define('JPDO_ATTR_ERRMODE',3); // PDO::ATTR_ERRMODE 
    26 define('JPDO_ERRMODE_EXCEPTION',2); // PDO::ERRMODE_EXCEPTION 
    27 define('JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY',1000); // PDO::MYSQL_ATTR_USE_BUFFERED_QUERY 
    28 #endif 
     11 
    2912/** 
    3013 * a resultset based on PDOStatement 
    …… 
    4629     * @return array list of object which contain all rows 
    4730     */ 
    48     public function fetchAll ( $fetch_style = JPDO_FETCH_OBJ, $column_index=0 ){ 
     31    public function fetchAll ( $fetch_style = jDbPDOConnection::JPDO_FETCH_OBJ, $column_index=0 ){ 
    4932        if($this->_fetchMode){ 
    50             if( $this->_fetchMode != JPDO_FETCH_COLUMN) 
     33            if( $this->_fetchMode != jDbPDOConnection::JPDO_FETCH_COLUMN) 
    5134                return parent::fetchAll($this->_fetchMode); 
    5235            else 
    5336                return parent::fetchAll($this->_fetchMode, $column_index); 
    5437        }else{ 
    55             return parent::fetchAll( JPDO_FETCH_OBJ); 
     38            return parent::fetchAll( jDbPDOConnection::JPDO_FETCH_OBJ); 
    5639        } 
    5740    } 
    …… 
    7356 */ 
    7457class jDbPDOConnection extends PDO { 
     58 
     59    /** 
     60    * PDO constant name have been change between php 5.0 and 5.1. So we use our own constant. 
     61    * @link http://lxr.php.net/source/php-src/ext/pdo/php_pdo_driver.h 
     62    */ 
     63    const JPDO_FETCH_OBJ = 5; // PDO::FETCH_OBJ 
     64    const JPDO_FETCH_ORI_NEXT = 0; // PDO::FETCH_ORI_NEXT 
     65    const JPDO_FETCH_ORI_FIRST = 2; 
     66    const JPDO_FETCH_COLUMN = 7; // PDO::FETCH_COLUMN 
     67    const JPDO_FETCH_CLASS = 8; // PDO::FETCH_CLASS 
     68    const JPDO_ATTR_STATEMENT_CLASS = 13; //PDO::ATTR_STATEMENT_CLASS 
     69    const JPDO_ATTR_AUTOCOMMIT = 0; //PDO::ATTR_AUTOCOMMIT 
     70    const JPDO_ATTR_CURSOR = 10; // PDO::ATTR_CURSOR 
     71    const JPDO_CURSOR_SCROLL = 1; //PDO::CURSOR_SCROLL 
     72    const JPDO_ATTR_ERRMODE = 3; // PDO::ATTR_ERRMODE 
     73    const JPDO_ERRMODE_EXCEPTION = 2; // PDO::ERRMODE_EXCEPTION 
     74    const JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY = 1000; // PDO::MYSQL_ATTR_USE_BUFFERED_QUERY 
    7575 
    7676    private $_mysqlCharsets =array( 'UTF-8'=>'utf8', 'ISO-8859-1'=>'latin1'); 
    …… 
    107107        unset($prof['driver']); 
    108108        parent::__construct($profil['dsn'], $user, $password, $prof); 
    109         $this->setAttribute(JPDO_ATTR_STATEMENT_CLASS, array('jDbPDOResultSet')); 
    110         $this->setAttribute(JPDO_ATTR_ERRMODE, JPDO_ERRMODE_EXCEPTION); 
     109        $this->setAttribute(self::JPDO_ATTR_STATEMENT_CLASS, array('jDbPDOResultSet')); 
     110        $this->setAttribute(self::JPDO_ATTR_ERRMODE, self::JPDO_ERRMODE_EXCEPTION); 
    111111        // on ne peut pas lancer deux query en même temps avec PDO ! sauf si on utilise mysql 
    112112        // et que l'on utilise cet attribut... 
    113113        if($this->dbms == 'mysql') 
    114             $this->setAttribute(JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY, true); 
     114            $this->setAttribute(self::JPDO_MYSQL_ATTR_USE_BUFFERED_QUERY, true); 
    115115     
    116116        if(isset($prof['force_encoding']) && $prof['force_encoding']==true){ 
    …… 
    132132        case 1: 
    133133            $rs = parent::query($args[0]); 
    134             $rs->setFetchMode(JPDO_FETCH_OBJ); 
     134            $rs->setFetchMode(self::JPDO_FETCH_OBJ); 
    135135            return $rs; 
    136136            break; 
    …… 
    165165    */ 
    166166    public function setAutoCommit($state=true){ 
    167         $this->setAttribute(JPDO_ATTR_AUTOCOMMIT,$state); 
     167        $this->setAttribute(self::JPDO_ATTR_AUTOCOMMIT,$state); 
    168168    } 
    169169 

  • trunk/lib/jelix/events/jEvent.class.php

    r636 r669  
    2222 * 
    2323 */ 
    24 require_once (JELIX_LIB_EVENTS_PATH . 'jEventListener.class.php'); 
     24require(JELIX_LIB_EVENTS_PATH . 'jEventListener.class.php'); 
    2525#endif 
    2626 

  • trunk/lib/jelix/events/jEvent.class.php

    r636 r669  
    2222 * 
    2323 */ 
    24 require_once (JELIX_LIB_EVENTS_PATH . 'jEventListener.class.php'); 
     24require(JELIX_LIB_EVENTS_PATH . 'jEventListener.class.php'); 
    2525#endif 
    2626 

  • trunk/lib/jelix/forms/jForms.class.php

    r629 r669  
    1010*/ 
    1111 
    12 /** 
    13  * 
    14  */ 
    15 define('JFORMS_ID_PARAM','__forms_id__'); 
    16 define('JFORMS_DEFAULT_ID',0); 
    17  
    1812require_once(JELIX_LIB_FORMS_PATH.'jFormsBase.class.php'); 
    19 require_once(JELIX_LIB_FORMS_PATH.'jFormsControl.class.php'); 
    20 require_once(JELIX_LIB_FORMS_PATH.'jFormsDatasource.class.php'); 
    21 require_once(JELIX_LIB_UTILS_PATH.'jDatatype.class.php'); 
    2213 
    2314/** 
    …… 
    3021 */ 
    3122class jForms { 
     23 
     24    const ID_PARAM = '__forms_id__'; 
     25 
     26    const DEFAULT_ID = 0; 
     27 
     28    const ERRDATA_INVALID = 1; 
     29    const ERRDATA_REQUIRED = 2; 
    3230 
    3331    private function __construct(){ } 
    …… 
    4442     * @return jFormBase the object representing the form 
    4543     */ 
    46     public static function create($formSel , $formId=JFORMS_DEFAULT_ID){ 
     44    public static function create($formSel , $formId=null){ 
    4745        $sel = new jSelectorForm($formSel); 
    4846        jIncluder::inc($sel); 
    4947        $c = $sel->getClass(); 
    50         if($formId === null) $formId=JFORMS_DEFAULT_ID; 
     48        if($formId === null) 
     49            $formId = self::DEFAULT_ID; 
    5150        $fid = is_array($formId) ? serialize($formId) : $formId; 
    5251        if(!isset($_SESSION['JFORMS'][$formSel][$fid])){ 
    …… 
    6665     * @return jFormBase the object representing the form. Return null if there isn't an existing form 
    6766     */ 
    68     static public function get($formSel,$formId=JFORMS_DEFAULT_ID){ 
     67    static public function get($formSel,$formId=null){ 
    6968        global $gJCoord; 
    70         if($formId === null) $formId=JFORMS_DEFAULT_ID; 
     69        if($formId === null) 
     70            $formId= self::DEFAULT_ID; 
    7171        $fid = is_array($formId) ? serialize($formId) : $formId; 
    7272 
    …… 
    9292     * @return jFormBase the object representing the form. Return null if there isn't an existing form 
    9393     */ 
    94     static public function fill($formSel,$formId=JFORMS_DEFAULT_ID){ 
     94    static public function fill($formSel,$formId=null){ 
    9595        $form = self::get($formSel,$formId); 
    9696        if($form) 
    …… 
    107107     * @param string $formId  the id of the form (if you use multiple instance of a form) 
    108108     */ 
    109    static public function destroy($formSel,$formId=JFORMS_DEFAULT_ID){ 
    110       global $gJCoord; 
    111       if($formId === null) $formId=JFORMS_DEFAULT_ID; 
    112       if(is_array($formId)) $formId = serialize($formId); 
    113       if(isset($_SESSION['JFORMS'][$formSel][$formId])){ 
    114           unset($_SESSION['JFORMS'][$formSel][$formId]); 
    115       } 
     109   static public function destroy($formSel,$formId=null){ 
     110        global $gJCoord; 
     111        if($formId === null)  $formId = self::DEFAULT_ID; 
     112        if(is_array($formId)) $formId = serialize($formId); 
     113        if(isset($_SESSION['JFORMS'][$formSel][$formId])){ 
     114            unset($_SESSION['JFORMS'][$formSel][$formId]); 
     115        } 
    116116   } 
    117117} 

  • trunk/lib/jelix/forms/jForms.class.php

    r629 r669  
    1010*/ 
    1111 
    12 /** 
    13  * 
    14  */ 
    15 define('JFORMS_ID_PARAM','__forms_id__'); 
    16 define('JFORMS_DEFAULT_ID',0); 
    17  
    1812require_once(JELIX_LIB_FORMS_PATH.'jFormsBase.class.php'); 
    19 require_once(JELIX_LIB_FORMS_PATH.'jFormsControl.class.php'); 
    20 require_once(JELIX_LIB_FORMS_PATH.'jFormsDatasource.class.php'); 
    21 require_once(JELIX_LIB_UTILS_PATH.'jDatatype.class.php'); 
    2213 
    2314/** 
    …… 
    3021 */ 
    3122class jForms { 
     23 
     24    const ID_PARAM = '__forms_id__'; 
     25 
     26    const DEFAULT_ID = 0; 
     27 
     28    const ERRDATA_INVALID = 1; 
     29    const ERRDATA_REQUIRED = 2; 
    3230 
    3331    private function __construct(){ } 
    …… 
    4442     * @return jFormBase the object representing the form 
    4543     */ 
    46     public static function create($formSel , $formId=JFORMS_DEFAULT_ID){ 
     44    public static function create($formSel , $formId=null){ 
    4745        $sel = new jSelectorForm($formSel); 
    4846        jIncluder::inc($sel); 
    4947        $c = $sel->getClass(); 
    50         if($formId === null) $formId=JFORMS_DEFAULT_ID; 
     48        if($formId === null) 
     49            $formId = self::DEFAULT_ID; 
    5150        $fid = is_array($formId) ? serialize($formId) : $formId; 
    5251        if(!isset($_SESSION['JFORMS'][$formSel][$fid])){ 
    …… 
    6665     * @return jFormBase the object representing the form. Return null if there isn't an existing form 
    6766     */ 
    68     static public function get($formSel,$formId=JFORMS_DEFAULT_ID){ 
     67    static public function get($formSel,$formId=null){ 
    6968        global $gJCoord; 
    70         if($formId === null) $formId=JFORMS_DEFAULT_ID; 
     69        if($formId === null) 
     70            $formId= self::DEFAULT_ID; 
    7171        $fid = is_array($formId) ? serialize($formId) : $formId; 
    7272 
    …… 
    9292     * @return jFormBase the object representing the form. Return null if there isn't an existing form 
    9393     */ 
    94     static public function fill($formSel,$formId=JFORMS_DEFAULT_ID){ 
     94    static public function fill($formSel,$formId=null){ 
    9595        $form = self::get($formSel,$formId); 
    9696        if($form) 
    …… 
    107107     * @param string $formId  the id of the form (if you use multiple instance of a form) 
    108108     */ 
    109    static public function destroy($formSel,$formId=JFORMS_DEFAULT_ID){ 
    110       global $gJCoord; 
    111       if($formId === null) $formId=JFORMS_DEFAULT_ID; 
    112       if(is_array($formId)) $formId = serialize($formId); 
    113       if(isset($_SESSION['JFORMS'][$formSel][$formId])){ 
    114           unset($_SESSION['JFORMS'][$formSel][$formId]); 
    115       } 
     109   static public function destroy($formSel,$formId=null){ 
     110        global $gJCoord; 
     111        if($formId === null)  $formId = self::DEFAULT_ID; 
     112        if(is_array($formId)) $formId = serialize($formId); 
     113        if(isset($_SESSION['JFORMS'][$formSel][$formId])){ 
     114            unset($_SESSION['JFORMS'][$formSel][$formId]); 
     115        } 
    116116   } 
    117117} 

  • trunk/lib/jelix/forms/jFormsBase.class.php

    r661 r669  
    1010*/ 
    1111 
     12require(JELIX_LIB_FORMS_PATH.'jFormsControl.class.php'); 
     13require(JELIX_LIB_FORMS_PATH.'jFormsDatasource.class.php'); 
     14require(JELIX_LIB_UTILS_PATH.'jDatatype.class.php'); 
    1215 
    1316/** 

  • trunk/lib/jelix/forms/jFormsBase.class.php

    r661 r669  
    1010*/ 
    1111 
     12require(JELIX_LIB_FORMS_PATH.'jFormsControl.class.php'); 
     13require(JELIX_LIB_FORMS_PATH.'jFormsDatasource.class.php'); 
     14require(JELIX_LIB_UTILS_PATH.'jDatatype.class.php'); 
    1215 
    1316/** 

  • trunk/lib/jelix/forms/jFormsBuilderBase.class.php

    r642 r669  
    134134            $errRequired=''; 
    135135            foreach($errors as $cname => $err){ 
    136                 if($err == JFORM_ERRDATA_REQUIRED) { 
     136                if($err == jForms::ERRDATA_REQUIRED) { 
    137137                    if($ctrls[$cname]->alertRequired){ 
    138138                        echo '<li>', $ctrls[$cname]->alertRequired,'</li>'; 
    …… 
    140140                        echo '<li>', jLocale::get('jelix~formserr.js.err.required', $ctrls[$cname]->label),'</li>'; 
    141141                    } 
    142                 }elseif ($err != '' && $err != JFORM_ERRDATA_INVALID) { 
     142                }elseif ($err != '' && $err != jForms::ERRDATA_INVALID) { 
    143143                    echo '<li>', $err,'</li>'; 
    144144                }else{ 

  • trunk/lib/jelix/forms/jFormsBuilderBase.class.php

    r642 r669  
    134134            $errRequired=''; 
    135135            foreach($errors as $cname => $err){ 
    136                 if($err == JFORM_ERRDATA_REQUIRED) { 
     136                if($err == jForms::ERRDATA_REQUIRED) { 
    137137                    if($ctrls[$cname]->alertRequired){ 
    138138                        echo '<li>', $ctrls[$cname]->alertRequired,'</li>'; 
    …… 
    140140                        echo '<li>', jLocale::get('jelix~formserr.js.err.required', $ctrls[$cname]->label),'</li>'; 
    141141                    } 
    142                 }elseif ($err != '' && $err != JFORM_ERRDATA_INVALID) { 
     142                }elseif ($err != '' && $err != jForms::ERRDATA_INVALID) {