Changeset 3172


Ignore:
Timestamp:
08/18/10 09:36:16 (10 years ago)
Author:
asaikawa
Message:

Ticket #993 - Corrigida a utilizacao de algumas constantes e substituidas outras pela settings

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

Legend:

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

    r2372 r3172  
    5151        function processes() 
    5252        { 
    53                 $account_id = $_SESSION['phpgw_info']['workflow']['account_id']; 
     53                $account_id = Settings::get('expresso', 'user', 'account_id'); 
    5454                $result = $GLOBALS['ajax']->gui->gui_list_user_activities($account_id, '0', '-1', "wf_menu_path__ASC, ga.wf_name__ASC", '', '', '', true, true, true, ''); 
    5555 
     
    139139        function inbox($params) 
    140140        { 
    141                 $preferences = $_SESSION['phpgw_info']['workflow']['user']['preferences']; 
     141                $preferences = Settings::get('workflow', 'preferences'); 
    142142 
    143143                /* initialize Paging Class */ 
     
    170170                $pid = (int) $params['pid']; 
    171171                $search_term = $params['search_term']; 
    172                 $account_id = $_SESSION['phpgw_info']['workflow']['account_id']; 
     172                $account_id = Settings::get('expresso', 'user', 'account_id'); 
    173173                $result = $GLOBALS['ajax']->gui->gui_list_user_instances($account_id, 0, -1, $sort, $search_term, "ga.wf_is_interactive = 'y'", false, $pid, true, false, true, false, false, false); 
    174174 
     
    328328        function inbox_group() 
    329329        { 
    330                 $account_id = $_SESSION['phpgw_info']['workflow']['account_id']; 
     330                $account_id = Settings::get('expresso', 'user', 'account_id'); 
    331331                $result = $GLOBALS['ajax']->gui->gui_list_user_instances($account_id, 0, -1, 'wf_procname__ASC,wf_name__ASC', '', "ga.wf_is_interactive = 'y'", false, 0, true, false, true, false, false, false); 
    332332 
     
    545545        $show_properties = false; 
    546546 
    547                 $current_user_id = $_SESSION['phpgw_info']['workflow']['account_id']; 
     547                $current_user_id = Settings::get('expresso', 'user', 'account_id'); 
    548548 
    549549                /* check if the current user is a process admin */ 
     
    609609        function instances($params) 
    610610        { 
    611                 $preferences = $_SESSION['phpgw_info']['workflow']['user']['preferences']; 
     611                $preferences = Settings::get('workflow', 'preferences'); 
    612612 
    613613                $lightVersion = ((isset($preferences['use_light_interface']) ? $preferences['use_light_interface'] : 0) == 1); 
    614614 
    615615                /* get some parameters */ 
    616                 $userID = $_SESSION['phpgw_info']['workflow']['account_id']; 
     616                $userID = Settings::get('expresso', 'user', 'account_id'); 
    617617                $pid = (int) $params['pid']; 
    618618                $active = ($params['active'] == 1); 
     
    721721                { 
    722722                        /* paginate the result */ 
    723                         $itemsPerPage = isset($_SESSION['phpgw_info']['workflow']['user']['preferences']['ui_items_per_page']) ? $_SESSION['phpgw_info']['workflow']['user']['preferences']['ui_items_per_page'] : 15; 
     723                        $itemsPerPage = isset($preferences['ui_items_per_page']) ? $preferences['ui_items_per_page'] : 15; 
    724724                        $paging = Factory::newInstance('Paging', $itemsPerPage, $_POST); 
    725725                        $output['instances'] = $paging->restrictItems($output['instances']); 
     
    774774        private function checkOrgchartAccess() 
    775775        { 
    776                 $this->organizationInfo = $this->so->getUserOrganization($_SESSION['phpgw_info']['workflow']['account_id']); 
     776                $this->organizationInfo = $this->so->getUserOrganization(Settings::get('expresso', 'user', 'account_id')); 
    777777                if ($this->organizationInfo === false) 
    778778                        return array('warning' => 'Você não está cadastrado em nenhuma organização'); 
     
    10691069                $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_LDAP); 
    10701070 
    1071                 $entry = $cachedLDAP->getEntryByID( $_SESSION['phpgw_info']['workflow']['account_id'] ); 
     1071                $entry = $cachedLDAP->getEntryByID(Settings::get('expresso', 'user', 'account_id')); 
    10721072                if ( $entry && ! is_null($entry['telephonenumber']) ) 
    10731073                        $fromNumber = $entry['telephonenumber']; 
  • sandbox/workflow/branches/993/inc/smarty/wf_plugins/function.wf_calendar_init.php

    r2552 r3172  
    2121                $path = $params['path'] . "/"; 
    2222        else 
    23                 $path = WF_SERVER_URL . SEP . 'js' . SEP . 'jscalendar' . SEP; 
     23                $path = WF_BASE_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_redir_menu.php

    r2552 r3172  
    3030                $$extract = $params[$extract]; 
    3131 
    32     $base_url = EGW_BASAE_URL; 
     32    $base_url = EGW_BASE_URL; 
    3333        $user_activities = $GLOBALS['workflow']['wf_user_activities']['data']; 
    3434        $pid = $GLOBALS['workflow']['wf_process_id']; 
  • sandbox/workflow/branches/993/lib/settings/Settings.php

    r2552 r3172  
    254254                self::$_configs['workflow']['preferences']['ui_items_per_page'] = $GLOBALS['phpgw_info']['user']['preferences']['workflow']['ui_items_per_page']; 
    255255                self::$_configs['workflow']['preferences']['show_activity_complete_page'] = $GLOBALS['phpgw_info']['user']['preferences']['workflow']['show_activity_complete_page']; 
     256                self::$_configs['workflow']['preferences']['common']['template_set'] = $GLOBALS['phpgw_info']['server']['template_set']; 
    256257 
    257258                self::$_configs['workflow']['app']['title'] = $GLOBALS['phpgw_info']['apps']['workflow']['title']; 
Note: See TracChangeset for help on using the changeset viewer.