Ignore:
Timestamp:
03/29/10 14:46:01 (14 years ago)
Author:
pedroerp
Message:

Ticket #609 - Merged 2197:2356 /sandbox/workflow/branches/609/ em /sandbox/workflow/trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sandbox/workflow/trunk/inc/class.so_userinterface.inc.php

    r2094 r2372  
    11<?php 
    2 require_once($_SESSION['phpgw_info']['workflow']['phpgw_api_inc'] . '/class.config.inc.php'); 
    32 
    43/** 
    … …  
    2221        function so_userinterface() 
    2322        { 
    24                 $this->db = &$GLOBALS['workflow']['workflowObjects']->getDBWorkflow()->Link_ID; 
     23                $this->db =& Factory::getInstance('WorkflowObjects')->getDBWorkflow()->Link_ID; 
    2524                $this->db->SetFetchMode(ADODB_FETCH_ASSOC); 
    2625        } 
    … …  
    6160                $oldDB = $GLOBALS['phpgw']->db; 
    6261                $GLOBALS['phpgw']->db = $GLOBALS['ajax']->db; 
    63                 $config = new config('workflow'); 
     62                $config = &Factory::getInstance('config', 'workflow'); 
    6463                $configValues = $config->read_repository(); 
    6564                $submasksString = $configValues['intranet_subnetworks']; 
    … …  
    9392                if (!empty($externalApplicationsID)) 
    9493                { 
    95                         $result = $GLOBALS['workflow']['workflowObjects']->getDBGalaxia()->Link_ID->query("SELECT DISTINCT external_application_id, name, address, image, authentication, intranet_only FROM egw_wf_external_application WHERE (external_application_id IN (" . implode(', ', $externalApplicationsID)  . ")) ORDER BY name"); 
     94                        $result = Factory::getInstance('WorkflowObjects')->getDBGalaxia()->Link_ID->query("SELECT DISTINCT external_application_id, name, address, image, authentication, intranet_only FROM egw_wf_external_application WHERE (external_application_id IN (" . implode(', ', $externalApplicationsID)  . ")) ORDER BY name"); 
    9695                        $preOutput = $result->GetArray(-1); 
    9796 
    … …  
    245244 
    246245                $employees = $result->GetArray(-1); 
    247                 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP'); 
     246                $cachedLDAP = Factory::newInstance('CachedLDAP'); 
    248247                $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_NORMAL); 
    249248                $categoriesCount = array(); 
    … …  
    318317 
    319318                $employees = $result->GetArray(-1); 
    320                 $cachedLDAP = $GLOBALS['workflow']['factory']->newInstance('CachedLDAP'); 
     319                $cachedLDAP = Factory::newInstance('CachedLDAP'); 
    321320                $cachedLDAP->setOperationMode($cachedLDAP->OPERATION_MODE_NORMAL); 
    322321                for ($i = 0; $i < count($employees); $i++) 
    … …  
    370369 
    371370                /* searching employees by name in the ldap server */ 
    372                 $list = @ldap_search($ldap, $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getLDAPContext(), ('(&(cn=*' . $searchTerm . '*)(phpgwaccounttype=u))'), array('uidNumber', 'cn', 'telephoneNumber')); 
     371                $list = @ldap_search($ldap, Factory::getInstance('WorkflowLDAP')->getLDAPContext(), ('(&(cn=*' . $searchTerm . '*)(phpgwaccounttype=u))'), array('uidNumber', 'cn', 'telephoneNumber')); 
    373372                if ($list === false) 
    374373                        return false; 
    … …  
    466465 
    467466                /* executing it */ 
    468                 $list = @ldap_search($ldap, $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getLDAPContext(), $ldap_query, array('uidNumber', 'cn', 'telephoneNumber')); 
     467                $list = @ldap_search($ldap, Factory::getInstance('WorkflowLDAP')->getLDAPContext(), $ldap_query, array('uidNumber', 'cn', 'telephoneNumber')); 
    469468                $entries = ldap_get_entries($ldap, $list); 
    470469 
    … …  
    475474 
    476475                /* we will need to search into database 'cache' for users deleted in ldap */ 
    477                 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] -> newInstance( 'CachedLDAP' ); 
     476                $cachedLDAP = Factory::newInstance( 'CachedLDAP' ); 
    478477                $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_DATABASE ); 
    479478 
    … …  
    531530 
    532531                /* searching employees by telephoneNumber in the ldap server */ 
    533                 $list = @ldap_search($ldap, $GLOBALS['workflow']['factory']->getInstance('WorkflowLDAP')->getLDAPContext(), ('(&(telephoneNumber=*' . $searchTerm . '*)(phpgwaccounttype=u))'), array('uidNumber', 'cn', 'telephoneNumber')); 
     532                $list = @ldap_search($ldap, Factory::getInstance('WorkflowLDAP')->getLDAPContext(), ('(&(telephoneNumber=*' . $searchTerm . '*)(phpgwaccounttype=u))'), array('uidNumber', 'cn', 'telephoneNumber')); 
    534533 
    535534                if (!$list) return false; 
    … …  
    594593        function getEmployeeInfo($employeeID, $organizationID) 
    595594        { 
    596                 require_once dirname(__FILE__) . '/class.so_orgchart.inc.php'; 
    597  
    598                 $SOOrgchart = new so_orgchart(); 
     595                $SOOrgchart = &Factory::getInstance('so_orgchart'); 
    599596                $SOOrgchart->setExternalCalls(true); 
    600597                $output = $SOOrgchart->getEmployeeInfo($employeeID, $organizationID); 
    … …  
    614611        function getAreaInfo($areaID, $organizationID) 
    615612        { 
    616                 require_once dirname(__FILE__) . '/class.so_orgchart.inc.php'; 
    617  
    618                 $SOOrgchart = new so_orgchart(); 
     613                $SOOrgchart = &Factory::getInstance('so_orgchart'); 
    619614                $SOOrgchart->setExternalCalls(true); 
    620615                $output = $SOOrgchart->getAreaInfo($areaID, $organizationID); 
    … …  
    652647                $result = $this -> db -> query( "SELECT a.sigla as area, a.titular_funcionario_id as titular, s.funcionario_id as substituto, s.data_inicio, s.data_fim FROM area a INNER JOIN substituicao s ON ((a.area_id = s.area_id) AND (CURRENT_DATE BETWEEN s.data_inicio AND s.data_fim)) WHERE (organizacao_id = ?) ORDER BY area", array( $organizationID ) ); 
    653648 
    654                 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] -> newInstance( 'CachedLDAP' ); 
     649                $cachedLDAP = Factory::newInstance( 'CachedLDAP' ); 
    655650                $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_LDAP_DATABASE ); 
    656651 
    … …  
    719714 
    720715                $employees = $result -> GetArray( -1 ); 
    721                 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] -> newInstance( 'CachedLDAP' ); 
     716                $cachedLDAP = Factory::newInstance( 'CachedLDAP' ); 
    722717                $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_NORMAL ); 
    723718 
    … …  
    791786                $employees = $result -> GetArray( -1 ); 
    792787 
    793                 $cachedLDAP = $GLOBALS[ 'workflow' ][ 'factory' ] -> newInstance( 'CachedLDAP' ); 
     788                $cachedLDAP = Factory::newInstance( 'CachedLDAP' ); 
    794789                $cachedLDAP -> setOperationMode( $cachedLDAP -> OPERATION_MODE_NORMAL ); 
    795790 
    … …  
    817812                usort( $employees, create_function( '$a,$b', 'return strcasecmp($a[\'cn\'],$b[\'cn\']);' ) ); 
    818813 
    819                 $paging = $GLOBALS['workflow']['factory']->newInstance('Paging', 50, $_POST); 
     814                $paging = Factory::newInstance('Paging', 50, $_POST); 
    820815                $employees = $paging->restrictItems( $employees ); 
    821816 
Note: See TracChangeset for help on using the changeset viewer.