Changeset 459

Show
Ignore:
Timestamp:
06/15/07 17:45:13 (1 year ago)
Author:
laurentj
Message:

applied trunk improvements to the jforms branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/experimental/jforms/build/manifests/jelix-lib.mn

    r452 r459  
    129129  function.zone.php 
    130130  modifier.cat.php 
     131  modifier.count_array.php 
    131132  modifier.count_characters.php 
    132133  modifier.count_paragraphs.php 

  • branches/experimental/jforms/build/manifests/jelix-lib.mn

    r452 r459  
    129129  function.zone.php 
    130130  modifier.cat.php 
     131  modifier.count_array.php 
    131132  modifier.count_characters.php 
    132133  modifier.count_paragraphs.php 

  • branches/experimental/jforms/build/manifests/jtpl-standalone.mn

    r298 r459  
    1212  function.include.php 
    1313  modifier.cat.php 
     14  modifier.count_array.php 
    1415  modifier.count_characters.php 
    1516  modifier.count_paragraphs.php 

  • branches/experimental/jforms/build/manifests/jtpl-standalone.mn

    r298 r459  
    1212  function.include.php 
    1313  modifier.cat.php 
     14  modifier.count_array.php 
    1415  modifier.count_characters.php 
    1516  modifier.count_paragraphs.php 

  • branches/experimental/jforms/build/manifests/testapp.mn

    r437 r459  
    7575  utselectormod.class.php 
    7676  utsimpletest.class.php 
     77  utjdb.class.php 
     78  utjdb_pdo.class.php 
     79  utjdb_profile.class.php 
    7780  utdao.class.php 
    78   utdao2.class.php 
     81  utdaopdo.class.php 
     82  utdao_parser.class.php 
     83  utdao_parser2.class.php 
    7984  utdao_conditions.class.php 
    8085  utfilter.class.php 
    …… 
    111116  acl.classic.php 
    112117  jforms.classic.php 
     118  db.classic.php 
     119cd testapp/modules/unittest/daos 
     120  products.dao.xml 
    113121 
    114122cd testapp/var 

  • branches/experimental/jforms/build/manifests/testapp.mn

    r437 r459  
    7575  utselectormod.class.php 
    7676  utsimpletest.class.php 
     77  utjdb.class.php 
     78  utjdb_pdo.class.php 
     79  utjdb_profile.class.php 
    7780  utdao.class.php 
    78   utdao2.class.php 
     81  utdaopdo.class.php 
     82  utdao_parser.class.php 
     83  utdao_parser2.class.php 
    7984  utdao_conditions.class.php 
    8085  utfilter.class.php 
    …… 
    111116  acl.classic.php 
    112117  jforms.classic.php 
     118  db.classic.php 
     119cd testapp/modules/unittest/daos 
     120  products.dao.xml 
    113121 
    114122cd testapp/var 

  • branches/experimental/jforms/demoxul/var/config/defaultconfig.ini.php.dist

    r436 r459  
    4949 
    5050[urlengine] 
    51 ; nom du moteur d'url :  simple ou significant 
     51; name of url engine :  "simple" or "significant" 
    5252engine        = simple 
    5353 
    54 ; active l'analyse d'url (mettre à off si vous utilisez le mod_rewrite d'apache) 
     54; enable the parsing of the url. Set it to off if the url is already parsed by another program 
     55; (like mod_rewrite in apache), if the rewrite of the url corresponds to a simple url, and if 
     56; you use the significant engine. If you use the simple url engine, you can set to off. 
    5557enableParser = on 
    5658 
    5759multiview = off 
    5860 
    59 ; chemin url jusqu'au repertoire www (celui que vous tapez dans le navigateur pour accéder à index.php etc.) 
    60 ; peut être égale à "/" si vous spécifiez www comme étant le documentRoot de votre site au niveau du serveur 
    61 basePath = "/" 
     61; basePath corresponds to the path to the base directory of your application. 
     62; so if the url to access to your application is http://foo.com/aaa/bbb/www/index.php, you should 
     63; set basePath = "/aaa/bbb/www/".  
     64; if it is http://foo.com/index.php, set basePath="/" 
     65; Jelix can guess the basePath, so you can keep basePath empty. But in the case where there are some 
     66; entry points which are not in the same directory (ex: you have two entry point : http://foo.com/aaa/index.php  
     67; and http://foo.com/aaa/bbb/other.php ), you MUST set the basePath (ex here, the higher entry point is index.php so 
     68; : basePath="/aaa/" ) 
     69basePath = "" 
     70 
    6271 
    6372defaultEntrypoint= index 

  • branches/experimental/jforms/demoxul/var/config/defaultconfig.ini.php.dist

    r436 r459  
    4949 
    5050[urlengine] 
    51 ; nom du moteur d'url :  simple ou significant 
     51; name of url engine :  "simple" or "significant" 
    5252engine        = simple 
    5353 
    54 ; active l'analyse d'url (mettre à off si vous utilisez le mod_rewrite d'apache) 
     54; enable the parsing of the url. Set it to off if the url is already parsed by another program 
     55; (like mod_rewrite in apache), if the rewrite of the url corresponds to a simple url, and if 
     56; you use the significant engine. If you use the simple url engine, you can set to off. 
    5557enableParser = on 
    5658 
    5759multiview = off 
    5860 
    59 ; chemin url jusqu'au repertoire www (celui que vous tapez dans le navigateur pour accéder à index.php etc.) 
    60 ; peut être égale à "/" si vous spécifiez www comme étant le documentRoot de votre site au niveau du serveur 
    61 basePath = "/" 
     61; basePath corresponds to the path to the base directory of your application. 
     62; so if the url to access to your application is http://foo.com/aaa/bbb/www/index.php, you should 
     63; set basePath = "/aaa/bbb/www/".  
     64; if it is http://foo.com/index.php, set basePath="/" 
     65; Jelix can guess the basePath, so you can keep basePath empty. But in the case where there are some 
     66; entry points which are not in the same directory (ex: you have two entry point : http://foo.com/aaa/index.php  
     67; and http://foo.com/aaa/bbb/other.php ), you MUST set the basePath (ex here, the higher entry point is index.php so 
     68; : basePath="/aaa/" ) 
     69basePath = "" 
     70 
    6271 
    6372defaultEntrypoint= index 

  • branches/experimental/jforms/lib/jelix-modules/jauth/daos/jelixuser.dao.xml

    r436 r459  
    1212 
    1313      <property name="password" fieldname="usr_password" datatype="string" 
    14                 maxlength="50" selectmotif="%s" updatemotif="" insertmotif="%s" /> 
     14                maxlength="50" selectpattern="%s" updatepattern="" insertpattern="%s" /> 
    1515   </record> 
    1616   <factory> 

  • branches/experimental/jforms/lib/jelix-modules/jauth/daos/jelixuser.dao.xml

    r436 r459  
    1212 
    1313      <property name="password" fieldname="usr_password" datatype="string" 
    14                 maxlength="50" selectmotif="%s" updatemotif="" insertmotif="%s" /> 
     14                maxlength="50" selectpattern="%s" updatepattern="" insertpattern="%s" /> 
    1515   </record> 
    1616   <factory> 

  • branches/experimental/jforms/lib/jelix-modules/jelix/daos/jaclrightvaluesgroup.dao.xml

    r436 r459  
    1010      <property name="type" fieldname="type_aclvalgrp" datatype="int"/> 
    1111    </record> 
    12     <!--<factory> 
    13         <method name="findByStage" type="select/selectfirst/delete/update/php"> 
    14             <parameter name="" /> 
    15             <values> 
    16                 <value property="" value="" /> 
    17             </values> 
    18             <conditions logic="and/or"> 
    19                 <eq property="" value="" /> 
    20             </conditions> 
    21             <order> 
    22                 <orderitem property="" way="asc/desc" /> 
    23             </order> 
    24             <limit offset="" count=""/> 
    25             <body><![CDATA[ 
    26             ]]></body> 
    27         </method> 
    28     </factory>--> 
    2912</dao> 

  • branches/experimental/jforms/lib/jelix-modules/jelix/daos/jaclrightvaluesgroup.dao.xml

    r436 r459  
    1010      <property name="type" fieldname="type_aclvalgrp" datatype="int"/> 
    1111    </record> 
    12     <!--<factory> 
    13         <method name="findByStage" type="select/selectfirst/delete/update/php"> 
    14             <parameter name="" /> 
    15             <values> 
    16                 <value property="" value="" /> 
    17             </values> 
    18             <conditions logic="and/or"> 
    19                 <eq property="" value="" /> 
    20             </conditions> 
    21             <order> 
    22                 <orderitem property="" way="asc/desc" /> 
    23             </order> 
    24             <limit offset="" count=""/> 
    25             <body><![CDATA[ 
    26             ]]></body> 
    27         </method> 
    28     </factory>--> 
    2912</dao> 

  • branches/experimental/jforms/lib/jelix-modules/jelix/daos/jaclsubject.dao.xml

    r436 r459  
    99      <property name="label_key" fieldname="label_key" datatype="string"/> 
    1010    </record> 
    11     <!--<factory> 
    12         <method name="findByStage" type="select/selectfirst/delete/update/php"> 
    13             <parameter name="" /> 
    14             <values> 
    15                 <value property="" value="" /> 
    16             </values> 
    17             <conditions logic="and/or"> 
    18                 <eq property="" value="" /> 
    19             </conditions> 
    20             <order> 
    21                 <orderitem property="" way="asc/desc" /> 
    22             </order> 
    23             <limit offset="" count=""/> 
    24             <body><![CDATA[ 
    25             ]]></body> 
    26         </method> 
    27     </factory>--> 
    2811</dao> 

  • branches/experimental/jforms/lib/jelix-modules/jelix/daos/jaclsubject.dao.xml

    r436 r459  
    99      <property name="label_key" fieldname="label_key" datatype="string"/> 
    1010    </record> 
    11     <!--<factory> 
    12         <method name="findByStage" type="select/selectfirst/delete/update/php"> 
    13             <parameter name="" /> 
    14             <values> 
    15                 <value property="" value="" /> 
    16             </values> 
    17             <conditions logic="and/or"> 
    18                 <eq property="" value="" /> 
    19             </conditions> 
    20             <order> 
    21                 <orderitem property="" way="asc/desc" /> 
    22             </order> 
    23             <limit offset="" count=""/> 
    24             <body><![CDATA[ 
    25             ]]></body> 
    26         </method> 
    27     </factory>--> 
    2811</dao> 

  • branches/experimental/jforms/lib/jelix-modules/jelix/locales/en_EN/daoxml.ISO-8859-1.properties

    r436 r459  
    2626method.body.missing= (542)DAO %1$s, method PHP body $3$s is missing (file %2$s) 
    2727method.values.undefine= (543)DAO %1$s, method %3$s of "update" type should contains "value" tag (file %2$s) 
    28 method.limit.forbidden = (544)DAO %1$s, method %$3$s, limit tag are  allowed only on select/selectfirst methods (file %2$s) 
     28method.limit.forbidden = (544)DAO %1$s, method %3$s, limit tag is allowed only on select method (file %2$s) 
    2929method.duplicate= (545)DAO %1$s, method %3$s is already defined (file %2$s) 
    3030 

  • branches/experimental/jforms/lib/jelix-modules/jelix/locales/en_EN/daoxml.ISO-8859-1.properties

    r436 r459  
    2626method.body.missing= (542)DAO %1$s, method PHP body $3$s is missing (file %2$s) 
    2727method.values.undefine= (543)DAO %1$s, method %3$s of "update" type should contains "value" tag (file %2$s) 
    28 method.limit.forbidden = (544)DAO %1$s, method %$3$s, limit tag are  allowed only on select/selectfirst methods (file %2$s) 
     28method.limit.forbidden = (544)DAO %1$s, method %3$s, limit tag is allowed only on select method (file %2$s) 
    2929method.duplicate= (545)DAO %1$s, method %3$s is already defined (file %2$s) 
    3030 

  • branches/experimental/jforms/lib/jelix-modules/jelix/locales/en_EN/daoxml.UTF-8.properties

    r436 r459  
    2626method.body.missing= (542)DAO %1$s, method PHP body $3$s is missing (file %2$s) 
    2727method.values.undefine= (543)DAO %1$s, method %3$s of "update" type should contains "value" tag (file %2$s) 
    28 method.limit.forbidden = (544)DAO %1$s, method %$3$s, limit tag are  allowed only on select/selectfirst methods (file %2$s) 
     28method.limit.forbidden = (544)DAO %1$s, method %3$s, limit tag is allowed only on select method (file %2$s) 
    2929method.duplicate= (545)DAO %1$s, method %3$s is already defined (file %2$s) 
    3030 

  • branches/experimental/jforms/lib/jelix-modules/jelix/locales/en_EN/daoxml.UTF-8.properties

    r436 r459  
    2626method.body.missing= (542)DAO %1$s, method PHP body $3$s is missing (file %2$s) 
    2727method.values.undefine= (543)DAO %1$s, method %3$s of "update" type should contains "value" tag (file %2$s) 
    28 method.limit.forbidden = (544)DAO %1$s, method %$3$s, limit tag are  allowed only on select/selectfirst methods (file %2$s) 
     28method.limit.forbidden = (544)DAO %1$s, method %3$s, limit tag is allowed only on select method (file %2$s) 
    2929method.duplicate= (545)DAO %1$s, method %3$s is already defined (file %2$s) 
    3030 

  • branches/experimental/jforms/lib/jelix-modules/jelix/locales/en_EN/errors.ISO-8859-1.properties

    r436 r459  
    2424#---- includer 
    2525includer.source.missing=(140)Includer : the selector "%s" doesn't point to a source file 
     26 
     27#---- responses 
     28repxml.no.content=(150) Undefined content for xml response 
     29repxml.invalid.content=(151) Invalid xml content for xml response 
     30repbin.unknow.file=(152) unknow file for binary response (%s) 
    2631 
    2732#---- locales 

  • branches/experimental/jforms/lib/jelix-modules/jelix/locales/en_EN/errors.ISO-8859-1.properties

    r436 r459  
    2424#---- includer 
    2525includer.source.missing=(140)Includer : the selector "%s" doesn't point to a source file 
     26 
     27#---- responses 
     28repxml.no.content=(150) Undefined content for xml response 
     29repxml.invalid.content=(151) Invalid xml content for xml response 
     30repbin.unknow.file=(152) unknow file for binary response (%s) 
    2631 
    2732#---- locales 

  • branches/experimental/jforms/lib/jelix-modules/jelix/locales/en_EN/errors.UTF-8.properties

    r436 r459  
    2424#---- includer 
    2525includer.source.missing=(140)Includer : the selector "%s" doesn't point to a source file 
     26 
     27#---- responses 
     28repxml.no.content=(150) Undefined content for xml response 
     29repxml.invalid.content=(151) Invalid xml content for xml response 
     30repbin.unknow.file=(152) unknow file for binary response (%s) 
    2631 
    2732#---- locales 

  • branches/experimental/jforms/lib/jelix-modules/jelix/locales/en_EN/errors.UTF-8.properties

    r436 r459  
    2424#---- includer 
    2525includer.source.missing=(140)Includer : the selector "%s" doesn't point to a source file 
     26 
     27#---- responses 
     28repxml.no.content=(150) Undefined content for xml response 
     29repxml.invalid.content=(151) Invalid xml content for xml response 
     30repbin.unknow.file=(152) unknow file for binary response (%s) 
    2631 
    2732#---- locales 

  • branches/experimental/jforms/lib/jelix-modules/jelix/locales/en_US/daoxml.ISO-8859-1.properties

    r436 r459  
    2626method.body.missing= (542)DAO %1$s, method PHP body $3$s is missing (file %2$s) 
    2727method.values.undefine= (543)DAO %1$s, method %3$s of "update" type should contains "value" tag (file %2$s) 
    28 method.limit.forbidden = (544)DAO %1$s, method %$3$s, limit tag are  allowed only on select/selectfirst methods (file %2$s) 
     28method.limit.forbidden = (544)DAO %1$s, method %3$s, limit tag is allowed only on select method (file %2$s) 
    2929method.duplicate= (545)DAO %1$s, method %3$s is already defined (file %2$s) 
    3030