Changeset 3729

Timestamp:

02/02/11 15:28:29 (13 years ago)

Author:

asaikawa

Message:

Ticket #1524 - Adicionado o parametro useCCParams nos componentes, indicando que serao usados os parametros do CC

Location:

branches/2.2/workflow

Files:

• inc/class.WorkflowLDAP.inc.php (modified) (1 diff)
• inc/class.WorkflowObjects.inc.php (modified) (2 diffs)
• inc/class.bo_participants.inc.php (modified) (1 diff)
• inc/class.ui_participants.inc.php (modified) (1 diff)
• inc/smarty/wf_plugins/function.wf_select_user.php (modified) (2 diffs)
• inc/smarty/wf_plugins/function.wf_select_users.php (modified) (2 diffs)
• js/jscode/participants.js (modified) (3 diffs)
• templates/default/participants.tpl (modified) (1 diff)

branches/2.2/workflow/inc/class.WorkflowLDAP.inc.php

@@ -48 +48 @@
          * @access public
          */
-        function WorkflowLDAP()
-        {
-                $this->dataSource =& Factory::getInstance('WorkflowObjects')->getLDAP();
+        function WorkflowLDAP($useCCParams = false)
+        {
+                $this->dataSource =& Factory::getInstance('WorkflowObjects')->getLDAP($useCCParams);
 
                 /* get the required parameters */

branches/2.2/workflow/inc/class.WorkflowObjects.inc.php

@@ -197 +197 @@
         /**
          * Retorna um recurso de LDAP
+         * @param bool $useCCParams Indica se deve usar os parâmetros do Contact Center
          * @return resource O recurso LDAP
          * @access public
          */
-        function &getLDAP()
+        function &getLDAP($useCCParams = false)
         {
                 if (!isset($this->cache['ldap']))
@@ -207 +208 @@
                         $this->assureEnvironment();
 
-                        /* check where the connection parameters are */
-                        $connectionInfo = (isset($GLOBALS['phpgw_info']['server']['ldap_host'])) ?
-                                $GLOBALS['phpgw_info']['server'] :
-                                $_SESSION['phpgw_info']['workflow']['server'];
-
-                        /* load required information */
-                        $ldapConfigValues = galaxia_get_config_values(array('ldap_host' => '', 'ldap_user' => '', 'ldap_password'=> '', 'ldap_follow_referrals' => ''));
-                        if (empty($ldapConfigValues['ldap_host']))
-                                $ldapConfigValues['ldap_host'] = $connectionInfo['ldap_host'];
+                        if($useCCParams)
+                        {
+                                /* get the contact center's connection parameters */
+                                $ajaxConfig = &Factory::newInstance('ajax_config', 'contactcenter');
+                                $config = $ajaxConfig->read_repository();
+
+                                $ldapConfigValues['ldap_host'] = $config['cc_ldap_host0'];
+                                $ldapConfigValues['ldap_user'] = $config['cc_ldap_browse_dn0'];
+                                $ldapConfigValues['ldap_password'] = $config['cc_ldap_pw0'];
+                                $ldapConfigValues['ldap_follow_referrals'] = 1;
+                        }
+                        else
+                        {
+                                /* check where the connection parameters are */
+                                $connectionInfo = (isset($GLOBALS['phpgw_info']['server']['ldap_host'])) ?
+                                        $GLOBALS['phpgw_info']['server'] :
+                                        $_SESSION['phpgw_info']['workflow']['server'];
+
+                                /* load required information */
+                                $ldapConfigValues = galaxia_get_config_values(array('ldap_host' => '', 'ldap_user' => '', 'ldap_password'=> '', 'ldap_follow_referrals' => ''));
+                                if (empty($ldapConfigValues['ldap_host']))
+                                        $ldapConfigValues['ldap_host'] = $connectionInfo['ldap_host'];
+                        }
 
                         /* connect to the LDAP server */

branches/2.2/workflow/inc/class.bo_participants.inc.php

@@ -34 +34 @@
         function bo_participants()
         {
-                $this->ldap = &Factory::getInstance('WorkflowLDAP');
+                $useCCParams = (isset($_REQUEST['useCCParams']) && $_REQUEST['useCCParams'] !== 'false') ? (bool)$_REQUEST['useCCParams'] : false;
+
+                $this->ldap = &Factory::getInstance('WorkflowLDAP', $useCCParams);
         }
 

branches/2.2/workflow/inc/class.ui_participants.inc.php

@@ -136 +136 @@
                 $smarty->assign('target', $_REQUEST['target_element']);
                 $smarty->assign('usePreffix', $usePreffix);
+                $smarty->assign('useCCParams', $_REQUEST['useCCParams']);
                 $smarty->assign('hideOrganizations', $hideOrganizations);
                 $smarty->assign('hideSectors', $hideSectors);

branches/2.2/workflow/inc/smarty/wf_plugins/function.wf_select_user.php

@@ -38 +38 @@
                 'onlyVisibleAccounts' => true,
                 'useGlobalSearch' => false,
+                'useCCParams' => false,
                 'rows'=> 2);
         $extractParams = array(
@@ -106 +107 @@
         else
                 $extraParams .= "&useGlobalSearch=true";
+        if (!empty($params['useCCParams']) && $params['useCCParams'] !== 'false')
+                $extraParams .= "&useCCParams=true";
 
         $image = Factory::getInstance('TemplateServer')->generateImageLink('add_user.png');

branches/2.2/workflow/inc/smarty/wf_plugins/function.wf_select_users.php

@@ -28 +28 @@
                 'onlyVisibleAccounts' => true,
                 'useGlobalSearch' => false,
+                'useCCParams' => false,
                 'get_email' => false,
                 'value' => array());
@@ -72 +73 @@
         else
                 $extraParams .= "&useGlobalSearch=true";
+        if (!empty($params['useCCParams']) && $params['useCCParams'] !== 'false')
+                $extraParams .= "&useCCParams=true";
 
         $output = '<table border="0"><tr><td>';

branches/2.2/workflow/js/jscode/participants.js

@@ -27 +27 @@
                 entities: $F('entities'),
                 id: $F('id'),
-                usePreffix: $F('usePreffix')
+                usePreffix: $F('usePreffix'),
+                useCCParams: $F('useCCParams')
         };
         callAjax('bo_participants', 'getSectors', resultGetSectors, params);
@@ -39 +40 @@
                 entities: $F('entities'),
                 id: $F('id'),
-                usePreffix: $F('usePreffix')
+                usePreffix: $F('usePreffix'),
+                useCCParams: $F('useCCParams')
         };
         callAjax('bo_participants', 'getEntities', resultGetParticipants, params);
@@ -356 +358 @@
                 entities: $F('entities'),
                 id: $F('id'),
-                usePreffix: $F('usePreffix')
+                usePreffix: $F('usePreffix'),
+                useCCParams: $F('useCCParams')
         };
         callAjax('bo_participants', 'globalSearch', resultPerformGlobalSearch, params);

branches/2.2/workflow/templates/default/participants.tpl

@@ -14 +14 @@
 <input type="hidden" id="target" value="{$target}"/>
 <input type="hidden" id="usePreffix" value="{$usePreffix}"/>
+<input type="hidden" id="useCCParams" value="{$useCCParams}"/>
 <table border="0" width="400">
 {if !($hideOrganizations && $hideSectors)}