Changeset 329

Show
Ignore:
Timestamp:
12/15/06 00:11:12 (2 years ago)
Author:
laurentj
Message:

fix coquilles ticket #66 (patch de dmp); nouvelle reponse jResponseJson;

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/manifests/jelix-lib.mn

    r323 r329  
    4545  jResponseHtml.class.php 
    4646  jResponseJsonrpc.class.php 
     47* jResponseJson.class.php 
    4748  jResponseRedirect.class.php 
    4849  jResponseRedirectUrl.class.php 

  • trunk/lib/diff/diffhtml.php

    r278 r329  
    124124class HtmlUnifiedDiffFormatter extends UnifiedDiffFormatter 
    125125{ 
    126     var $result; 
     126    public $result; 
    127127 
    128128    function __construct($context_lines = 4) { 

  • trunk/lib/diff/difflib.php

    r278 r329  
    704704 
    705705        $xi = $yi = 1; 
     706        $x0 = $y0 = 0; 
    706707        $block = false; 
    707708        $context = array(); 

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

    r153 r329  
    116116                     $primarykeys.=$fieldname; 
    117117               } 
    118                if($prop->not_null) 
     118               if($prop->not_null && $type != 'autoincrement') 
    119119                  $properties.=' required="yes"'; 
    120120               $properties.='/>'; 

  • trunk/lib/jelix-scripts/scripts.conf.php

    r277 r329  
    3535*/ 
    3636 
    37 define('JELIXS_APP_CONFIG_FILE'    , 'index/config.ini.php'); 
     37define('JELIXS_APP_CONFIG_FILE'    , 'defaultconfig.ini.php'); 
    3838define('DO_CHMOD',false); // indique si lors de la cr�ion des fichiers, il faut faire un chmod 
    3939define('CHMOD_FILE_VALUE',0644); 

  • trunk/lib/jelix/core/defaultconfig.ini.php

    r321 r329  
    3434text = jResponseText 
    3535jsonrpc = jResponseJsonrpc 
     36json = jResponseJson 
    3637xmlrpc = jResponseXmlrpc 
    3738xul = jResponseXul 
    …… 
    5354text = jResponseText 
    5455jsonrpc = jResponseJsonrpc 
     56json = jResponseJson 
    5557xmlrpc = jResponseXmlrpc 
    5658xul = jResponseXul 

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

    r311 r329  
    2424*/ 
    2525class jBundle { 
    26     var $fic; 
    27     var $locale; 
     26    public $fic; 
     27    public $locale; 
    2828 
    2929    private $_loadedCharset = array (); 
    …… 
    114114            $multiline=false; 
    115115            $linenumber=0; 
     116            $key=''; 
    116117            while (!feof($f)) { 
    117118                if($line=fgets($f)){ 

  • trunk/lib/jelix/tpl/plugins/common/block.ifnotacl.php

    r312 r329  
    2525            $content = ' if(!jAcl::check('.$params[0].','.$params[1].')){'; 
    2626        }elseif(count($params) == 3){ 
    27             $content = ' if(!jAcl::check('.$param[0].','.$params[1].','.$params[2].')){'; 
     27            $content = ' if(!jAcl::check('.$params[0].','.$params[1].','.$params[2].')){'; 
    2828        }else{ 
    2929            $content=''; 

  • trunk/lib/jelix/tpl/plugins/common/block.ifuserconnected.php

    r248 r329  
    2222{ 
    2323    if($begin){ 
    24         if(count($param)){ 
     24        if(count($params)){ 
    2525            $content=''; 
    2626            $compiler->doError1('errors.tplplugin.block.too.many.arguments','ifuserconnected'); 

  • trunk/lib/jelix/tpl/plugins/common/block.ifusernotconnected.php

    r248 r329  
    2222{ 
    2323    if($begin){ 
    24         if(count($param)){ 
     24        if(count($params)){ 
    2525            $content=''; 
    2626            $compiler->doError1('errors.tplplugin.block.too.many.arguments','ifuserconnected'); 

  • trunk/lib/jelix/utils/jWiki.class.php

    r279 r329  
    33* @package    jelix 
    44* @subpackage utils 
    5 * @version    $Id$ 
    65* @author     Jouanneau Laurent 
    76* @contributor 
    …… 
    2322    // Profitons surtout de l'autoload :-) 
    2423 
    25  
    26     static function getConfig($name){ 
    27         $f = WIKIRENDERER_PATH.'rules/'.basename($config).'.php'; 
    28         if(file_exists($f)){ 
    29             require_once($f); 
    30             return new $config(); 
    31         }else 
    32             throw new Exception('Wikirenderer : bad config name'); 
    33     } 
    34  
    3524} 
    3625?> 

  • trunk/lib/wikirenderer/rules/classicwr_to_text.php

    r279 r329  
    9090 
    9191class cwrtext_acronym extends WikiTag { 
    92     var $name='acronym'; 
    9392    public $beginTag='??'; 
    9493    public $endTag='??'; 
    …… 
    131130 
    132131class cwrtext_image extends WikiTag { 
    133     protected $name='image'; 
    134132    public $beginTag='(('; 
    135133    public $endTag='))'; 

  • trunk/lib/wikirenderer/rules/classicwr_to_wr3.php

    r279 r329  
    137137 
    138138class cwrwr3_image extends WikiTag { 
    139     protected $name='image'; 
    140139    public $beginTag='(('; 
    141140    public $endTag='))'; 

  • trunk/lib/wikirenderer/rules/classicwr_to_xhtml.php

    r279 r329  
    8181 
    8282class cwrxhtml_acronym extends WikiTagXhtml { 
    83     var $name='acronym'; 
     83    protected $name='acronym'; 
    8484    public $beginTag='??'; 
    8585    public $endTag='??'; 

  • trunk/lib/wikirenderer/rules/wr3_to_text.php

    r279 r329  
    9191 
    9292class wr3text_acronym extends WikiTag { 
    93     var $name='acronym'; 
    9493    public $beginTag='??'; 
    9594    public $endTag='??'; 

  • trunk/lib/wikirenderer/rules/wr3_to_xhtml.php

    r279 r329  
    109109 
    110110class wr3xhtml_acronym extends WikiTagXhtml { 
    111     var $name='acronym'; 
     111    protected $name='acronym'; 
    112112    public $beginTag='??'; 
    113113    public $endTag='??'; 
Download in other formats: Unified Diff Zip Archive