Changeset 363

Show
Ignore:
Timestamp:
01/27/07 23:51:03 (2 years ago)
Author:
laurentj
Message:

fix bug Ticket #83 : directory not created in the createapp command with withcmdline switch (patch=giviz)
fix bug ticket #103 : api documentation of autolocale plugin is not correct
fix bug Ticket #104 : bad context change when a plugin redirect to a new action

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/jelix-plugins/autolocale/autolocale.plugin.php

    r351 r363  
    44* @subpackage plugins 
    55* @author   Jouanneau Laurent 
    6 * @copyright 2006 Laurent Jouanneau 
     6* @copyright 2006-2007 Laurent Jouanneau 
    77* @licence  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public Licence, see LICENCE file 
    88*/ 
    …… 
    2323 
    2424    /** 
    25      * @param    jAction  $action  action that will be executed 
     25     * @param    array  $params   plugin parameters for the current action 
     26     * @return null or jSelectorAct  if action should change 
    2627     */ 
    27     public function beforeAction($action){ 
     28    public function beforeAction($params){ 
    2829 
    2930        global $gJCoord, $gJConfig; 
    …… 
    7576            $gJConfig->defaultLocale = $lang; 
    7677        } 
     78        return null; 
    7779    } 
    7880 

  • trunk/lib/jelix-plugins/magicquotes/magicquotes.plugin.php

    r257 r363  
    33* @package    jelix 
    44* @subpackage plugins 
    5 * @version    $Id$ 
    65* @author     Gerald Croes, Jouanneau Laurent 
    76* @contributor 
    8 * @copyright  2001-2005 CopixTeam, 2005-2006 Jouanneau laurent 
    9 * @link        http://www.jelix.org 
    10 * @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 
    11 * 
     7* @copyright  2001-2005 CopixTeam, 2005-2007 Jouanneau laurent 
    128* Some parts of this file are took from Copix Framework v2.3dev20050901, magicquotes.plugin.php, 
    139* copyrighted by CopixTeam and released under GNU Lesser General Public Licence 
    1410* author : Gerald Croes, Laurent Jouanneau 
    1511* http://www.copix.org 
     12* @link        http://www.jelix.org 
     13* @licence    GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html 
     14* 
    1615*/ 
    1716 

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

    r359 r363  
    55* @author      Jouanneau Laurent 
    66* @contributor Loic Mathaud 
    7 * @copyright   2005-2006 Jouanneau laurent 
     7* @contributor Gildas Givaja (bug #83) 
     8* @copyright   2005-2007 Jouanneau laurent, 2006 Loic Mathaud, 2007 Gildas Givaja 
    89* @link        http://www.jelix.org 
    910* @licence     GNU General Public Licence see LICENCE file or http://www.gnu.org/licenses/gpl.html 
    …… 
    5859       $param = array('appname'=>$GLOBALS['APPNAME']); 
    5960 
    60  
    6161       $this->createFile(JELIX_APP_PATH.'project.xml','project.xml.tpl',$param); 
    6262       $this->createFile(JELIX_APP_CONFIG_PATH.'defaultconfig.ini.php','var/config/defaultconfig.ini.php.tpl',$param); 
    …… 
    7575       $this->createFile(JELIX_APP_PATH.'application.init.php','application.init.php.tpl',$param); 
    7676 
    77  
    7877       $param = array('appname'=>$GLOBALS['APPNAME']); 
    7978       $param['rp_jelix']=jxs_getRelativePath(JELIX_APP_WWW_PATH, JELIX_LIB_PATH ,true); 
    …… 
    8382       $this->createFile(JELIX_APP_WWW_PATH.'jsonrpc.php','www/jsonrpc.php.tpl',$param); 
    8483       $this->createFile(JELIX_APP_WWW_PATH.'xmlrpc.php','www/xmlrpc.php.tpl',$param); 
    85  
    8684 
    8785       if($this->getOption('-withdefaultmodule')){ 
    …… 
    9391       if ($this->getOption('-withcmdline')) { 
    9492            $this->createDir(JELIX_APP_CMD_PATH); 
     93            $this->createDir(JELIX_APP_CONFIG_PATH.'cmdline'); 
    9594            $this->createFile(JELIX_APP_CONFIG_PATH.'cmdline/config.ini.php','var/config/cmdline/config.ini.php.tpl',$param); 
    9695            $param['rp_cmd'] =jxs_getRelativePath(JELIX_APP_PATH, JELIX_APP_CMD_PATH,true); 
    9796            $this->createFile(JELIX_APP_CMD_PATH.'cmdline.php','scripts/cmdline.php.tpl',$param); 
    9897       } 
    99  
    10098    } 
    10199} 
    102100 
    103  
    104  
    105101?> 

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

    r334 r363  
    193193            if($result){ 
    194194               $this->action = $result; 
     195               jContext::pop(); 
     196               jContext::push($result->module); 
     197               $this->moduleName = $result->module; 
     198               $this->actionName = $result->ressource; 
    195199               $ctrl = $this->getController($this->action); 
    196200               break; 
Download in other formats: Unified Diff Zip Archive