Ignore:
Timestamp:
04/12/10 16:21:32 (14 years ago)
Author:
pedroerp
Message:

Ticket #993 - Trocando acessos à GLOBALS por acessos à Settings.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sandbox/workflow/branches/993/inc/class.run_activity.inc.php

    r2372 r2492  
    293293                        //set some global variables needed 
    294294                        $GLOBALS['workflow']['__leave_activity']=false; 
    295                         $GLOBALS['user'] = $GLOBALS['phpgw_info']['user']['account_id']; 
     295                        $GLOBALS['user'] = Settings::get('expresso', 'user', 'account_id'); 
    296296 
    297297                        //load role names, just an information 
    … …  
    319319                        $GLOBALS['workflow']['wf_user_id']                                      =& $GLOBALS['user']; 
    320320                        $GLOBALS['workflow']['wf_view_activity']                        =& $this->view_activity; 
    321                         $GLOBALS['workflow']['wf_webserver_url']                        = $GLOBALS['phpgw_info']['server']['webserver_url']; 
    322                         $GLOBALS['workflow']['wf_workflow_path']                        = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'; 
    323                         $GLOBALS['workflow']['wf_resources_path']                       = $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'workflow/redirect.php?pid=' . $this->process_id . '&file='; 
     321                        $GLOBALS['workflow']['wf_webserver_url']                        = EGW_BASE_URL; 
     322                        $GLOBALS['workflow']['wf_workflow_path']                        = WF_BASE_URL; 
     323                        $GLOBALS['workflow']['wf_resources_path']                       = WF_BASE_URL . SEP . 'redirect.php?pid=' . $this->process_id . '&file='; 
    324324                        $GLOBALS['workflow']['wf_default_resources_path']       = Factory::getInstance('TemplateServer')->generateLink('processes'); 
    325325                        $GLOBALS['workflow']['wf_workflow_resources_path']      = Factory::getInstance('TemplateServer')->generateLink(''); 
    326                         $GLOBALS['workflow']['wf_activity_url']                         = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'index.php?menuaction=workflow.'.get_class($this).'.go&activity_id='.$activity_id; 
     326                        $GLOBALS['workflow']['wf_activity_url']                         = EGW_BASE_URL . SEP . 'index.php?menuaction=workflow.'.get_class($this).'.go&activity_id='.$activity_id; 
    327327                        $GLOBALS['workflow']['wf_user_cnname']                          = Factory::getInstance('WorkflowLDAP')->getName($GLOBALS['user']); 
    328                         $GLOBALS['workflow']['wf_back_link']                            = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'.SEP.'index.php?start_tab=1'; 
    329                         $GLOBALS['workflow']['wf_js_path']                                      = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'.SEP.'js'.SEP.'jscode'; 
     328                        $GLOBALS['workflow']['wf_back_link']                            = WF_BASE_URL . SEP . 'index.php?start_tab=1'; 
     329                        $GLOBALS['workflow']['wf_js_path']                                      = WF_BASE_URL . SEP . 'js' . SEP . 'jscode'; 
    330330                        $GLOBALS['workflow']['wf_user_activities']                      = $this->GUI->gui_list_user_activities($GLOBALS['user'], '0', '-1', 'ga.wf_name__ASC', '', '', false, true, true, true, ''); 
    331331                        if ($iid) 
    332                                 $GLOBALS['workflow']['wf_instance_url'] = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'index.php?menuaction=workflow.'.get_class($this).'.go&activity_id='.$activity_id."&iid=".$iid; 
     332                                $GLOBALS['workflow']['wf_instance_url'] = EGW_BASE_URL . SEP . 'index.php?menuaction=workflow.'.get_class($this).'.go&activity_id='.$activity_id."&iid=".$iid; 
    333333                        else 
    334334                                unset($GLOBALS['workflow']['wf_instance_url']); 
    … …  
    375375                                $_SESSION['phpgw_info']['workflow']['user_groups'] = galaxia_retrieve_user_groups($newUser); 
    376376                                $_SESSION['phpgw_info']['workflow']['account_id'] = $newUser; 
    377                                 $GLOBALS['phpgw_info']['user']['account_id'] = $newUser; 
     377 
     378                                Settings::set('expresso', 'user', 'account_id', $newUser); 
     379 
    378380                                $GLOBALS['workflow']['wf_user_id'] = $newUser; 
    379381                                $GLOBALS['user'] = $newUser; 
    … …  
    384386                                        $_SESSION['phpgw_info']['workflow']['user_groups'] = $actualUserGroups; 
    385387                                        $_SESSION['phpgw_info']['workflow']['account_id'] = $actualUser; 
    386                                         $GLOBALS['phpgw_info']['user']['account_id'] = $actualUser; 
     388 
     389                                        Settings::set('expresso', 'user', 'account_id', $actualUser); 
     390 
    387391                                        $GLOBALS['workflow']['wf_user_id'] = $actualUser; 
    388392                                        $GLOBALS['user'] = $actualUser; 
    … …  
    503507                                $_SESSION['phpgw_info']['workflow']['user_groups'] = $actualUserGroups; 
    504508                                $_SESSION['phpgw_info']['workflow']['account_id'] = $actualUser; 
    505                                 $GLOBALS['phpgw_info']['user']['account_id'] = $actualUser; 
     509                                Settings::set('expresso', 'user', 'account_id', $actualUser); 
    506510                                $GLOBALS['workflow']['wf_user_id'] = $actualUser; 
    507511                                $GLOBALS['user'] = $actualUser; 
    … …  
    549553                                                $this->assignCommonVariables(); 
    550554                                                // and display completed template 
    551                                                 if ($GLOBALS['phpgw_info']['user']['preferences']['workflow']['show_activity_complete_page'] === '0') 
     555                                                if (Settings::get('workflow', 'preferences', 'show_activity_complete_page') === '0') 
    552556                                                        header('Location: workflow/index.php'); 
    553557                                                else 
    … …  
    648652 
    649653                        //set some global variables needed 
    650                         $GLOBALS['user'] = $GLOBALS['phpgw_info']['user']['account_id']; 
     654                        $GLOBALS['user'] = Settings::get('expresso', 'user', 'account_id'); 
    651655 
    652656                        //load role names, just an information 
    … …  
    674678                        $GLOBALS['workflow']['wf_user_id']                                      =& $GLOBALS['user']; 
    675679                        $GLOBALS['workflow']['wf_view_activity']                        =& $this->view_activity; 
    676                         $GLOBALS['workflow']['wf_workflow_path']                        = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'; 
    677                         $GLOBALS['workflow']['wf_resources_path']                       = $GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'workflow/redirect.php?pid=' . $this->process_id . '&file='; 
     680                        $GLOBALS['workflow']['wf_workflow_path']                        = WF_BASE_URL; 
     681                        $GLOBALS['workflow']['wf_resources_path']                       = WF_BASE_URL . SEP . 'redirect.php?pid=' . $this->process_id . '&file='; 
    678682                        $GLOBALS['workflow']['wf_default_resources_path']       = Factory::getInstance('TemplateServer')->generateLink('processes'); 
    679683                        $GLOBALS['workflow']['wf_workflow_resources_path']      = Factory::getInstance('TemplateServer')->generateLink(''); 
    680                         $GLOBALS['workflow']['wf_activity_url']                         = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'index.php?menuaction=workflow.'.get_class($this).'.go&activity_id='.$activity_id; 
     684                        $GLOBALS['workflow']['wf_activity_url']                         = EGW_BASE_URL . SEP . 'index.php?menuaction=workflow.'.get_class($this).'.go&activity_id='.$activity_id; 
    681685                        $GLOBALS['workflow']['wf_user_cnname']                          = Factory::getInstance('WorkflowLDAP')->getName($GLOBALS['user']); 
    682                         $GLOBALS['workflow']['wf_back_link']                            = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'.SEP.'index.php?start_tab=1'; 
    683                         $GLOBALS['workflow']['wf_js_path']                                      = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'workflow'.SEP.'js'.SEP.'jscode'; 
     686                        $GLOBALS['workflow']['wf_back_link']                            = WF_BASE_URL . SEP . 'index.php?start_tab=1'; 
     687                        $GLOBALS['workflow']['wf_js_path']                                      = WF_BASE_URL . SEP . 'js' . SEP . 'jscode'; 
    684688                        $GLOBALS['workflow']['wf_user_activities']                      = $this->GUI->gui_list_user_activities($GLOBALS['user'], '0', '-1', 'ga.wf_name__ASC', '', '', false, true, true, true, ''); 
    685689                        if ($iid) 
    686                                 $GLOBALS['workflow']['wf_instance_url'] = $GLOBALS['phpgw_info']['server']['webserver_url'].SEP.'index.php?menuaction=workflow.'.get_class($this).'.go&activity_id='.$activity_id."&iid=".$iid; 
     690                                $GLOBALS['workflow']['wf_instance_url'] = EGW_BASE_URL . SEP . 'index.php?menuaction=workflow.'.get_class($this).'.go&activity_id='.$activity_id."&iid=".$iid; 
    687691                        else 
    688692                                unset($GLOBALS['workflow']['wf_instance_url']); 
    … …  
    824828                        $this->workflowSmarty->assign('activityName', $this->activity_name); 
    825829                        $this->workflowSmarty->assign('activityCompleteMessage', $this->activityCompleteMessage); 
    826                         $this->workflowSmarty->assign('activityBaseURL', $GLOBALS['phpgw_info']['server']['webserver_url']); 
     830                        $this->workflowSmarty->assign('activityBaseURL', EGW_BASE_URL); 
    827831                        $this->workflowSmarty->assign('activityList', $activityList); 
    828832 
Note: See TracChangeset for help on using the changeset viewer.