Ignore:
Timestamp:
04/15/10 16:40:45 (14 years ago)
Author:
pedroerp
Message:

Ticket #993 - Migrando mais parâmetros para a classe Settings.

Location:
sandbox/workflow/branches/993
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • sandbox/workflow/branches/993/inc/class.WorkflowMacro.inc.php

    r2544 r2552  
    4444                $_SESSION['phpgw_info']['workflow']['phpgw_api_inc'] = PHPGW_API_INC; 
    4545                $_SESSION['phpgw_info']['workflow']['account_id'] = Settings::get('expresso', 'user', 'account_id'); 
    46                 $_SESSION['phpgw_info']['workflow']['server']['webserver_url'] = $GLOBALS['phpgw_info']['server']['webserver_url']; 
     46                $_SESSION['phpgw_info']['workflow']['server']['webserver_url'] = EGW_SERVER_URL; 
    4747 
    4848                require_once PHPGW_API_INC . '/functions.inc.php'; 
  • sandbox/workflow/branches/993/inc/class.external_bridge.inc.php

    r2492 r2552  
    114114        function render() 
    115115        { 
    116                 if (($GLOBALS['phpgw_info']['server']['use_https'] > 0) && ($_SERVER['HTTPS'] != 'on')) 
     116                if ((Settings::get('expresso', 'use_https') > 0) && ($_SERVER['HTTPS'] != 'on')) 
    117117                { 
    118118                        header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); 
  • sandbox/workflow/branches/993/inc/class.run_activity.inc.php

    r2533 r2552  
    350350                        if ($this->conf['execute_activities_using_secure_connection']) 
    351351                        { 
    352                                 if (($GLOBALS['phpgw_info']['server']['use_https'] > 0) && ($_SERVER['HTTPS'] != 'on') && (!isset($GLOBALS['workflow']['job']['processID']))) 
     352                                if ((Settings::get('expresso', 'use_https') > 0) && ($_SERVER['HTTPS'] != 'on') && (!isset($GLOBALS['workflow']['job']['processID']))) 
    353353                                { 
    354354                                        header("Location: https://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"); 
  • sandbox/workflow/branches/993/inc/local/classes/class.wf_mail.php

    r2492 r2552  
    5151 
    5252                /* configura os parâmetros para envio de e-mail */ 
    53                 $userLang = Settings('expresso', 'preferences', 'lang'); 
     53                $userLang = Settings::get('expresso', 'preferences', 'lang'); 
    5454                /* FIXME: hardcoded 'br' because phpmailer don't use pt-br */ 
    5555                if ($userLang == 'pt-br') 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_ajax_init.php

    r795 r2552  
    2020                $wf_ajax_init = true; 
    2121 
    22                 $serverPath = $GLOBALS['phpgw_info']['server']['webserver_url']; 
     22                $serverPath = EGW_BASE_URL; 
    2323                $localPath = PHPGW_SERVER_ROOT; 
    2424 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_autocomplete_input_init.php

    r1428 r2552  
    1111function smarty_function_wf_autocomplete_input_init($params, &$smarty) 
    1212{ 
    13         $jsEffects              = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/scriptaculous/effects.js'; 
    14         $jsControls             = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/scriptaculous/controls.js'; 
    15         $jsJson                 = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/nano/JSON.js'; 
    16         $jsSha1                 = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/jscode/sha1.js'; 
    17         $jsAutocomplete = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/jscode/wf_autocomplete_input.js'; 
     13        $jsEffects              = WF_BASE_URL . SEP . 'js' . SEP . 'scriptaculous' . SEP . 'effects.js'; 
     14        $jsControls             = WF_BASE_URL . SEP . 'js' . SEP . 'scriptaculous' . SEP . 'controls.js'; 
     15        $jsJson                 = WF_BASE_URL . SEP . 'js' . SEP . 'nano' . SEP . 'JSON.js'; 
     16        $jsSha1                 = WF_BASE_URL . SEP . 'js' . SEP . 'jscode' . SEP . 'sha1.js'; 
     17        $jsAutocomplete = WF_BASE_URL . SEP . 'js' . SEP . 'jscode' . SEP . 'wf_autocomplete_input.js'; 
    1818        $output = <<<EOF 
    1919        <script type="text/javascript" src="$jsEffects"></script> 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_calendar_init.php

    r795 r2552  
    2121                $path = $params['path'] . "/"; 
    2222        else 
    23                 $path = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/jscalendar/'; 
     23                $path = WF_SERVER_URL . SEP . 'js' . SEP . 'jscalendar' . SEP; 
    2424        $defaults = array( 
    2525                'css' => $path . 'calendar-blue.css', 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_fckeditor.php

    r795 r2552  
    5858 
    5959        // BasePath must be specified once. 
    60     $base_arguments['BasePath'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'workflow' . SEP . 'js' . SEP . 'fckeditor' . SEP; 
     60    $base_arguments['BasePath'] = WF_BASE_URL . SEP . 'js' . SEP . 'fckeditor' . SEP; 
    6161 
    6262        $base_arguments['InstanceName'] = $params['InstanceName']; 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_file_upload_init.php

    r795 r2552  
    1111function smarty_function_wf_file_upload_init($params, &$smarty) 
    1212{ 
    13         $jsFile = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/jscode/wf_file_upload.js'; 
     13        $jsFile = WF_BASE_URL . SEP . 'js' . SEP . 'jscode' . SEP . 'wf_file_upload.js'; 
    1414$output = <<<EOF 
    1515        <script language="javascript1.2" src="$jsFile"></script> 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_generic_select_init.php

    r795 r2552  
    1111function smarty_function_wf_generic_select_init($params, &$smarty) 
    1212{ 
    13         $jsFile = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/jscode/generic_select.js'; 
     13        $jsFile = WF_BASE_URL . SEP . 'js' . SEP . 'jscode' . SEP . 'generic_select.js'; 
    1414$output = <<<EOF 
    1515        <script language="javascript1.2" src="$jsFile"></script> 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_make_link.php

    r795 r2552  
    4343                $back_url = $url; 
    4444        } else { 
    45                 $back_url = '';  
    46                 $back_url = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/index.php?start_tab=' . $tab; 
     45                $back_url = ''; 
     46                $back_url = WF_BASE_URL . SEP . 'index.php?start_tab=' . $tab; 
    4747        } 
    4848         
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_redir_menu.php

    r2492 r2552  
    3030                $$extract = $params[$extract]; 
    3131 
    32     $base_url = $GLOBALS['phpgw_info']['server']['webserver_url']; 
     32    $base_url = EGW_BASAE_URL; 
    3333        $user_activities = $GLOBALS['workflow']['wf_user_activities']['data']; 
    3434        $pid = $GLOBALS['workflow']['wf_process_id']; 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_rtf_init.php

    r795 r2552  
    1111function smarty_function_wf_rtf_init($params, &$smarty) 
    1212{ 
    13         $jsFile = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/jscode/rtf.js'; 
     13        $jsFile = WF_BASE_URL . SEP  .'js' . SEP . 'jscode' . SEP . 'rtf.js'; 
    1414$output = <<<EOF 
    1515<script language="javascript1.2" src="$jsFile"></script> 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_select_city_init.php

    r795 r2552  
    1111function smarty_function_wf_select_city_init($params, &$smarty) 
    1212{ 
    13         $webServer = $GLOBALS['phpgw_info']['server']['webserver_url']; 
    14         $jsFilePath = $webServer . '/workflow/js'; 
     13        $webServer = EGW_BASE_URL; 
     14        $jsFilePath = WF_BASE_URL . SEP . 'js'; 
    1515        $localFile = PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'js' . SEP . 'jscode' . SEP . 'connector.js'; 
    1616        $size = 0; 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_select_duplex_init.php

    r795 r2552  
    1111function smarty_function_wf_select_duplex_init($params, &$smarty) 
    1212{ 
    13         $jsFile = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/jscode/wf_select_duplex.js'; 
     13        $jsFile = WF_BASE_URL . SEP . 'js' . SEP . 'jscode' . SEP . 'wf_select_duplex.js'; 
    1414        $output = <<<EOF 
    1515        <script language="javascript1.2" src="$jsFile"></script> 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_select_ldap_users_init.php

    r795 r2552  
    1111function smarty_function_wf_select_ldap_users_init($params, &$smarty) 
    1212{ 
    13         $webServer = $GLOBALS['phpgw_info']['server']['webserver_url']; 
    14         $jsFilePath = $webServer . '/workflow/js'; 
    15         $localFile = PHPGW_SERVER_ROOT . SEP . 'workflow' . SEP . 'js' . SEP . 'jscode' . SEP . 'connector.js'; 
     13        $webServer = EGW_BASE_URL; 
     14        $jsFilePath = WF_BASE_URL . SEP . 'js'; 
     15        $localFile = WF_SERVER_ROOT . SEP . 'js' . SEP . 'jscode' . SEP . 'connector.js'; 
    1616        $size = 0; 
    1717        if (@file_exists($localFile)) 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_select_option_multiple_init.php

    r795 r2552  
    1111function smarty_function_wf_select_option_multiple_init($params, &$smarty) 
    1212{ 
    13         $jsFile = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/jscode/wf_select_option_multiple.js'; 
     13        $jsFile = WF_BASE_URL . SEP . 'js' . SEP . 'jscode' . SEP . 'wf_select_option_multiple.js'; 
    1414        $output = <<<EOF 
    1515        <script language="javascript1.2" src="$jsFile"></script> 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_select_user_init.php

    r795 r2552  
    1111function smarty_function_wf_select_user_init($params, &$smarty) 
    1212{ 
    13         $jsFile = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/jscode/participants.js'; 
     13        $jsFile = WF_BASE_URL . SEP . 'js' . SEP . 'jscode' . SEP . 'participants.js'; 
    1414$output = <<<EOF 
    1515        <script language="javascript1.2" src="$jsFile"></script> 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_select_users_init.php

    r795 r2552  
    1111function smarty_function_wf_select_users_init($params, &$smarty) 
    1212{ 
    13         $jsFile = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/workflow/js/jscode/userControl.js'; 
     13        $jsFile = WF_BASE_URL . SEP . 'js' . SEP .'jscode' . SEP . 'userControl.js'; 
    1414$output = <<<EOF 
    1515        <script language="javascript1.2" src="$jsFile"></script> 
  • sandbox/workflow/branches/993/lib/settings/Settings.php

    r2544 r2552  
    9090                                'lang' => '' 
    9191                        ), 
    92                         'webserver_url' => '' 
     92                        'webserver_url' => '', 
     93                        'use_https' => '' 
    9394                ) 
    9495        ); 
     
    261262 
    262263                self::$_configs['expresso']['webserver_url'] = $GLOBALS['phpgw_info']['server']['webserver_url']; 
     264                self::$_configs['expresso']['use_https'] = $GLOBALS['phpgw_info']['server']['use_https']; 
    263265 
    264266                /* loading database settings */ 
Note: See TracChangeset for help on using the changeset viewer.