Changeset 2012


Ignore:
Timestamp:
02/12/10 16:27:59 (14 years ago)
Author:
amuller
Message:

Ticket #490 - unificação do connector

Location:
trunk
Files:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/controller.php

    r1738 r2012  
    11<?php 
    2 if(!isset($GLOBALS['phpgw_info'])){ 
    3         $GLOBALS['phpgw_info']['flags'] = array( 
    4                 'currentapp' => 'expressoMail1_2', 
    5                 'nonavbar'   => true, 
    6                 'noheader'   => true 
    7         ); 
    8 } 
    9 require_once '../header.session.inc.php'; 
     2        if(!isset($GLOBALS['phpgw_info'])){ 
     3                $GLOBALS['phpgw_info']['flags'] = array( 
     4                        'nonavbar'   => true, 
     5                        'currentapp' => $_SESSION['phpgw_info']['expresso']['currentapp'], 
     6                        'noheader'   => true 
     7                ); 
     8        } 
     9        require_once './header.session.inc.php'; 
    1010 
    1111        //      Explode action from cExecuteForm function 
     
    3333        // Load dinamically class file. 
    3434        if($app == '$this') 
    35                 $filename = 'inc/class.'.$class.'.inc.php'; 
    36         else 
    37                 $filename = '../'.$app.'/inc/class.'.$class.'.inc.php'; 
    38                  
    39         include_once($filename);         
     35                $app = $_SESSION['phpgw_info']['expresso']['currentapp']; 
    4036         
     37        $filename = $app.'/inc/class.'.$class.'.inc.php'; 
     38 
     39        include_once($filename); 
     40 
    4141        // Create new Object  (class loaded).    
    4242        $obj = new $class; 
  • trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

    r1991 r2012  
    11<?php 
    2 define('PHPGW_INCLUDE_ROOT','../'); 
    3 define('PHPGW_API_INC','../phpgwapi/inc');       
     2define('PHPGW_INCLUDE_ROOT','./'); 
     3define('PHPGW_API_INC','./phpgwapi/inc');        
    44include_once(PHPGW_API_INC.'/class.common.inc.php'); 
    55include_once('class.functions.inc.php'); 
  • trunk/expressoMail1_2/inc/class.db_functions.inc.php

    r1992 r2012  
    11<?php 
    2 define('PHPGW_INCLUDE_ROOT','../');      
    3 define('PHPGW_API_INC','../phpgwapi/inc');       
     2define('PHPGW_INCLUDE_ROOT','./');       
     3define('PHPGW_API_INC','./phpgwapi/inc');        
    44include_once(PHPGW_API_INC.'/class.db.inc.php'); 
    55include_once('class.dynamic_contacts.inc.php'); 
  • trunk/phpgwapi/js/expressoAjax/expressoAjax.js

    r2011 r2012  
    466466//------------------------------------  END: Functions for Progress Bar  -------------------------------------------------// 
    467467        // Default Controller File 
    468         var DEFAULT_URL = 'controller.php?action='; 
     468        var URL_DEFAULT = '/controller.php?action='; 
    469469        // connector object 
    470470        var _onmouseup = document.onmouseup; 
     
    553553                        return; 
    554554                } 
    555  
    556                 url = DEFAULT_URL + url; 
     555                url = URL_DEFAULT + url; 
    557556 
    558557                if (expresso.connector.queryConnectorCache(params?url+"&"+params:url,handler)) 
Note: See TracChangeset for help on using the changeset viewer.