Changeset 2544


Ignore:
Timestamp:
04/15/10 10:07:48 (14 years ago)
Author:
pedroerp
Message:

Ticket #993 - Inserindo parâmetros 'app name' e 'app version' na Settings.

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

Legend:

Unmodified
Added
Removed

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

    r2533 r2544  
    3939                require_once dirname(__FILE__) . '/../../header.inc.php'; 
    4040                require dirname(__FILE__) . '/../setup/setup.inc.php'; /* DO NOT USE require_once */ 
    41                 $GLOBALS['phpgw_info']['apps']['workflow'] = $setup_info['workflow']; 
     41                Settings::set('workflow', 'app', 'workflow', $setup_info['workflow']); 
    4242                $row = Factory::getInstance('WorkflowObjects')->getDBExpresso()->Link_ID->query('SELECT config_value FROM phpgw_config WHERE config_app = ? AND config_name = ?', array('phpgwapi', 'files_dir'))->fetchRow(); 
    4343                $_SESSION['phpgw_info']['workflow']['vfs_basedir'] = ($row !== false) ? $row['config_value'] : '/home/expressolivre'; 

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

    r2372 r2544  
    9393                { 
    9494                        // check version 
    95                         if (alessthanb($GLOBALS['phpgw_info']['apps']['workflow']['version'], '1.2.01.006')) 
     95                        $version = Settings::get('workflow', 'app', 'version'); 
     96                        if (alessthanb($version, '1.2.01.006')) 
    9697                        { 
    9798                                $GLOBALS['phpgw']->common->phpgw_header(); 

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

    r2492 r2544  
    112112                        $title[1] = ucfirst($title[1]); 
    113113                        $title = implode(' ', $title); 
    114                         $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang($title); 
     114                        $GLOBALS['phpgw_info']['flags']['app_header'] = Settings::get('workflow', 'app', 'title') . ' - ' . lang($title); 
    115115                        $GLOBALS['phpgw']->common->phpgw_header(); 
    116116                        echo parse_navbar(); 

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

    r2492 r2544  
    6161        function form() 
    6262        { 
    63                 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('Access Control List'); 
     63                $GLOBALS['phpgw_info']['flags']['app_header'] = Settings::get('workflow', 'app', 'title') . ' - ' . lang('Access Control List'); 
    6464                $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow'); 
    6565                $smarty = Factory::getInstance('workflow_smarty'); 

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

    r2492 r2544  
    119119        function form() 
    120120        { 
    121                 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('Admin Process Activities'); 
     121                $GLOBALS['phpgw_info']['flags']['app_header'] = Settings::get('workflow', 'app', 'title') . ' - ' . lang('Admin Process Activities'); 
    122122                $GLOBALS['phpgw']->common->phpgw_header(); 
    123123                echo parse_navbar(); 

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

    r2372 r2544  
    3939                        'nonavbar' => false, 
    4040                        'currentapp' => 'workflow', 
    41                         'app_header' => $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('Jobs') 
     41                        'app_header' => Settings::get('workflow', 'app', 'title') . ' - ' . lang('Jobs') 
    4242                ); 
    4343                $smarty = &Factory::getInstance('workflow_smarty'); 

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

    r2533 r2544  
    9898        function form() 
    9999        { 
    100                 //$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('Admin Processes'); 
     100                //$GLOBALS['phpgw_info']['flags']['app_header'] = Settings::get('workflow', 'app', 'title') . ' - ' . lang('Admin Processes'); 
    101101                //$GLOBALS['phpgw']->common->phpgw_header(); 
    102102                //echo parse_navbar(); 

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

    r2492 r2544  
    8484        function form() 
    8585        { 
    86                 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('Admin Process Roles'); 
     86                $GLOBALS['phpgw_info']['flags']['app_header'] = Settings::get('workflow', 'app', 'title') . ' - ' . lang('Admin Process Roles'); 
    8787                $GLOBALS['phpgw']->common->phpgw_header(); 
    8888                echo parse_navbar(); 

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

    r2372 r2544  
    7878        { 
    7979                $smarty = Factory::getInstance('workflow_smarty', false); 
    80                 $smarty->setHeader(workflow_smarty::SHOW_HEADER | workflow_smarty::SHOW_NAVIGATION_BAR | workflow_smarty::SHOW_FOOTER, $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('Admin Processes Sources')); 
     80                $smarty->setHeader(workflow_smarty::SHOW_HEADER | workflow_smarty::SHOW_NAVIGATION_BAR | workflow_smarty::SHOW_FOOTER, Settings::get('workflow', 'app', 'title') . ' - ' . lang('Admin Processes Sources')); 
    8181 
    8282                $javaScripts = $this->get_common_js(); 

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

    r2492 r2544  
    5959                } 
    6060 
    61                 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title']; 
     61                $GLOBALS['phpgw_info']['flags']['app_header'] = Settings::get('workflow', 'app', 'title'); 
    6262                $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow'); 
    6363                $smarty = Factory::getInstance('workflow_smarty'); 

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

    r2372 r2544  
    5555        function form() 
    5656        { 
    57                 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title'] . ' - ' . lang('%1 monitoring'); 
     57                $GLOBALS['phpgw_info']['flags']['app_header'] = Settings::get('workflow', 'app', 'title') . ' - ' . lang('%1 monitoring'); 
    5858                $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow'); 
    5959                $smarty = Factory::getInstance('workflow_smarty'); 

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

    r2372 r2544  
    4343        function draw($tabIndex = null) 
    4444        { 
    45                 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['workflow']['title']; 
     45                $GLOBALS['phpgw_info']['flags']['app_header'] = Settings::get('workflow', 'app', 'title'); 
    4646                $GLOBALS['phpgw_info']['flags'] = array('noheader' => false, 'nonavbar' => false, 'currentapp' => 'workflow'); 
    4747                $smarty = Factory::getInstance('workflow_smarty'); 

  • sandbox/workflow/branches/993/lib/settings/Settings.php

    r2518 r2544  
    5858                                'show_activity_complete_page' => '' 
    5959                        ), 
     60                        'app' => array( 
     61                                'title' => '', 
     62                                'version' => '' 
     63                        ), 
    6064                        'intranet_subnetworks' => '', 
    6165                        'user_can_clean_instances' => '' 
    … …  
    250254                self::$_configs['workflow']['preferences']['show_activity_complete_page'] = $GLOBALS['phpgw_info']['user']['preferences']['workflow']['show_activity_complete_page']; 
    251255 
    252                 /*expresso preferences */ 
     256                self::$_configs['workflow']['app']['title'] = $GLOBALS['phpgw_info']['apps']['workflow']['title']; 
     257                self::$_configs['workflow']['app']['version'] = $GLOBALS['phpgw_info']['apps']['workflow']['version']; 
     258 
     259                /* expresso preferences */ 
    253260                self::$_configs['expresso']['preferences']['lang'] = $GLOBALS['phpgw_info']['user']['preferences']['common']['lang']; 
    254261 
Note: See TracChangeset for help on using the changeset viewer.