Changeset 12904

Show
Ignore:
Timestamp:
06/30/09 06:53:30 (7 months ago)
Author:
asha
Message:

PBXManager Changes - Vikas
=============================

1. Added two missing files for asterisk.
2. When an activity is added to contact the related to field was empty which is fixed.
3. When we receive an incoming call the query for searching phone number is changed.
4. Added AsteriskUtils?.php and increased pool time from 3s to 5s for checking incoming call.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • vtigercrm/branches/5.1/include/js/asterisk.js

    r12794 r12904  
    88function _defAsteriskTimer(){ 
    99        var asteriskTimer = null; 
    10         var ASTERISK_POLLTIME = 3000; //vtigercrm polls the asterisk server for incoming calls after every 3 seconds for now 
     10        var ASTERISK_POLLTIME = 5000; //vtigercrm polls the asterisk server for incoming calls after every 3 seconds for now 
    1111        var ASTERISK_INCOMING_DIV_TIMEOUT = 15; //the incoming call div is present for this number of seconds 
    1212        function AsteriskCallback() { 

  • vtigercrm/branches/5.1/include/utils/utils.php

    r12890 r12904  
    41644164 
    41654165        //information found 
    4166         $callerInfo = getCallerInfo(getStrippedNumber($from)); 
     4166        $callerInfo = getCallerInfo($from); 
    41674167 
    41684168        if($callerInfo != false){ 
    4169                 $callerName = $callerInfo[name]; 
    4170                 $module = $callerInfo[module]; 
     4169                $callerName = decode_html($callerInfo['name']); 
     4170                $module = $callerInfo['module']; 
    41714171                $callerModule = " (<a href='index.php?module=$module&action=index'>$module</a>)"; 
    41724172                $callerID = $callerInfo[id]; 
    …… 
    41964196        } 
    41974197        $caller = "Unknown Number (Unknown)"; //declare caller as unknown in beginning 
    4198          
    4199         $name['Contacts'] = array('name'=>"concat(firstname,' ',lastname)", 'table'=>'vtiger_contactdetails', 'field'=>"phone,mobile,fax", 'id'=>'contactid'); 
    4200         $name['Accounts'] = array('name'=>"accountname", 'table'=>"vtiger_account", 'field'=>"phone, otherphone, fax", 'id'=>'accountid'); 
    4201         $name['Leads'] = array('name'=>"concat(firstname,' ',lastname)", 'table'=>"vtiger_leaddetails inner join vtiger_leadaddress on vtiger_leaddetails.leadid = vtiger_leadaddress.leadaddressid", 'field'=>"phone,mobile,fax", 'id'=>'leadid');  
    4202          
    4203         foreach ($name as $module => $info) { 
    4204                 $phones = explode(",",$info[field]); 
    4205                  
    4206                 $sql = "select *,".$info[name]." as name from ".$info[table]." inner join vtiger_crmentity on ".$info['id']."=crmid where deleted=0"; 
    4207                 $result = $adb->query($sql); 
    4208                  
    4209                 $id = searchPhoneNumber($number, $phones, $result, 1); 
    4210  
    4211                 if($id !== false){ 
    4212                         $callerName = $adb->query_result($result, $id, "name"); 
    4213                         $callerID = $adb->query_result($result,$id,$info['id']); 
     4198        $name['Contacts'] = "select contactid as id,concat(firstname,' ',lastname) as name from vtiger_contactdetails inner join vtiger_crmentity on crmid=contactid where deleted=0 and (phone = ? or mobile = ? or fax = ?)";//array('name'=>"concat(firstname,' ',lastname)", 'table'=>'vtiger_contactdetails', 'field'=>"phone,mobile,fax", 'id'=>'contactid'); 
     4199        $name['Accounts'] = "select accountid as id, accountname as name from vtiger_account inner join vtiger_crmentity on crmid=accountid where deleted =0 and (phone = ? or otherphone = ? or fax = ?)";//array('name'=>"accountname", 'table'=>"vtiger_account", 'field'=>"phone, otherphone, fax", 'id'=>'accountid'); 
     4200        $name['Leads'] = "select leadid as id,concat(firstname,' ',lastname) as name from vtiger_leaddetails inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_leaddetails.leadid inner join vtiger_leadaddress on vtiger_leaddetails.leadid = vtiger_leadaddress.leadaddressid where vtiger_crmentity.deleted =0 and (vtiger_leadaddress.phone = ? or vtiger_leadaddress.mobile = ? or vtiger_leadaddress.fax = ?)";//array('name'=>"concat(firstname,' ',lastname)", 'table'=>"vtiger_leaddetails inner join vtiger_leadaddress on vtiger_leaddetails.leadid = vtiger_leadaddress.leadaddressid", 'field'=>"phone,mobile,fax", 'id'=>'leadid'); 
     4201        foreach ($name as $module => $query) { 
     4202                $result = $adb->pquery($query,array($number,$number,$number)); 
     4203                if($adb->num_rows($result) > 0 ){ 
     4204                        $callerName = $adb->query_result($result, 0, "name"); 
     4205                        $callerID = $adb->query_result($result,0,'id'); 
    42144206                        $data = array("name"=>$callerName, "module"=>$module, "id"=>$callerID); 
    42154207                        return $data;                    
    …… 
    43604352                        $callerName = "Unknown"; 
    43614353                }else{ 
    4362                         $callerName = "<a href='index.php?module=".$callerName[module]."&action=DetailView&record=".$callerName[id]."'>".$callerName[name]."</a>"; 
     4354                        $callerName = "<a href='index.php?module=".$callerName[module]."&action=DetailView&record=".$callerName[id]."'>".decode_html($callerName[name])."</a>"; 
    43634355                } 
    43644356        } 

  • vtigercrm/branches/5.1/pkg/vtiger/modules/PBXManager/cron/AsteriskClient.php

    r12877 r12904  
    5959        while (true) { 
    6060                //check for incoming calls and insert in the database 
    61                 sleep(1); 
     61                sleep(2); 
    6262                $incoming = handleIncomingCalls($asterisk, $adb, $version); 
    6363        } 
    …… 
    120120                                        $adb->pquery($sql, $params); 
    121121                                         
    122                                         addToCallHistory($extension, $callerNumber, $extension, "incoming", $adb); 
     122                                        addToCallHistory($extension, $callerType.":".$callerNumber, $extension, "incoming", $adb); 
    123123                                        break;  //break the while loop 
    124124                                } 

  • vtigercrm/branches/5.1/pkg/vtiger/modules/PBXManager/manifest.xml

    r12794 r12904  
    246246<status>enabled</status> 
    247247</action> 
    248 <action> 
    249 <name><![CDATA[index]]></name> 
    250 <status>enabled</status> 
    251 </action> 
    252 <action> 
    253 <name><![CDATA[Popup]]></name> 
    254 <status>enabled</status> 
    255 </action> 
    256248</actions> 
    257249</module> 

  • vtigercrm/branches/5.1/pkg/vtiger/modules/PBXManager/modules/PBXManager/ListView.php

    r12877 r12904  
    130130// Navigation 
    131131$start = $_SESSION['lvs'][$currentModule]['start']; 
    132 $navigation_array = getNavigationValues($start, $recordCount, $list_max_entries_per_page); 
    133132$navigationOutput = getTableHeaderSimpleNavigation($navigation_array, $url_string, $currentModule, 'index', $viewid); 
    134133$smarty->assign("NAVIGATION", $navigationOutput);