From abee8040ee848fcd4a8ec8c345186784a40770ec Mon Sep 17 00:00:00 2001 From: mattf Date: Thu, 16 Jul 2009 01:26:36 +0000 Subject: [PATCH] Added patch for Vtiger 5.1.0 RC release: Vtiger510_vicidial_001_noclose.patch git-svn-id: svn://192.168.202.10@1185 3d104415-ff17-0410-8863-d5cf3c621b8a --- docs/VTIGER.txt | 4 + extras/Vtiger510_vicidial_001_noclose.patch | 311 ++++++++++++++++++++ 2 files changed, 315 insertions(+) create mode 100644 extras/Vtiger510_vicidial_001_noclose.patch diff --git a/docs/VTIGER.txt b/docs/VTIGER.txt index c8904dd1..adda5b95 100644 --- a/docs/VTIGER.txt +++ b/docs/VTIGER.txt @@ -104,6 +104,10 @@ ls -l cp /usr/src/astguiclient/trunk/extras/Vtiger504_vicidial_005.patch ./ patch -p1 < ./Vtiger504_vicidial_005.patch +NOTE: There is also now a patch for the 5.1.0 RC version of Vtiger that is +included with ViciDial: Vtiger510_vicidial_001_noclose.patch + cp /usr/src/astguiclient/trunk/extras/Vtiger510_vicidial_001_noclose.patch ./ + patch -p1 < ./Vtiger510_vicidial_001_noclose.patch diff --git a/extras/Vtiger510_vicidial_001_noclose.patch b/extras/Vtiger510_vicidial_001_noclose.patch new file mode 100644 index 00000000..ec76fc66 --- /dev/null +++ b/extras/Vtiger510_vicidial_001_noclose.patch @@ -0,0 +1,311 @@ +--- ./Smarty/templates/DetailViewFields.tpl 2009-07-15 19:35:09.000000000 -0400 ++++ ./Smarty/templates/DetailViewFields.tpl 2009-07-15 21:14:56.000000000 -0400 +@@ -13,7 +13,7 @@ + -->*} + + +- {if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '255'} ++ {if $keyid eq '1' || $keyid eq '2' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '255'} +   + {if $keyid eq '55' || $keyid eq '255'} + {if $keyaccess eq $APP.LBL_NOT_ACCESSIBLE} +@@ -71,6 +71,12 @@ + {/if} + + ++ {elseif $keyid eq '11'} ++ ++ ++ VCcall: {$keyval} ++ ++ + {elseif $keyid eq '15' || $keyid eq '16'} +   + {foreach item=arr from=$keyoptions} +--- ./Smarty/templates/DetailViewUI.tpl 2009-07-15 19:35:09.000000000 -0400 ++++ ./Smarty/templates/DetailViewUI.tpl 2009-07-15 21:12:50.000000000 -0400 +@@ -13,7 +13,7 @@ + -->*} + + +- {if $keyid eq '1' || $keyid eq 2 || $keyid eq '11' || $keyid eq '7' || $keyid eq '9' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '103' || $keyid eq '255'} ++ {if $keyid eq '1' || $keyid eq '2' || $keyid eq '7' || $keyid eq '9' || $keyid eq '11' || $keyid eq '55' || $keyid eq '71' || $keyid eq '72' || $keyid eq '103' || $keyid eq '255'} + + {if $keyid eq '55' || $keyid eq '255'} + {if $keyaccess eq $APP.LBL_NOT_ACCESSIBLE} +@@ -23,11 +23,13 @@ + {/if} + {/if} + +- {if $keyid eq 11} ++ {if $keyid eq '11'} + {if $USE_ASTERISK eq 'true'} +   {$keyval} + {else} +-   {$keyval} ++ VCcall: ++ {$keyval} ++ + {/if} + {else} +   {$keyval} +--- ./include/js/dtlviewajax.js 2009-07-15 19:35:09.000000000 -0400 ++++ ./include/js/dtlviewajax.js 2009-07-15 20:07:20.000000000 -0400 +@@ -293,7 +293,7 @@ + if(typeof(use_asterisk) != 'undefined' && use_asterisk == true){ + getObj(dtlView).innerHTML = ""+tagValue+""; + }else{ +- getObj(dtlView).innerHTML = tagValue; ++ getObj(dtlView).innerHTML = ""+tagValue+" "; + } + }else if(uitype == '17') + { +--- ./include/utils/ListViewUtils.php 2009-07-15 19:35:09.000000000 -0400 ++++ ./include/utils/ListViewUtils.php 2009-07-15 20:09:25.000000000 -0400 +@@ -1861,7 +1861,7 @@ + } + //added for asterisk integration + elseif($uitype == 11){ +- $value = "".$temp_val.""; ++ $value = "VCcall: user_name');\">$temp_val"; + } + //asterisk changes end here + //Added for email status tracking +@@ -4596,4 +4596,4 @@ + return $recordListRangeMsg; + } + +-?> +\ No newline at end of file ++?> +--- ./include/utils/UserInfoUtil.php 2009-07-15 19:35:09.000000000 -0400 ++++ ./include/utils/UserInfoUtil.php 2009-07-15 20:11:37.000000000 -0400 +@@ -748,6 +748,18 @@ + global $adb; + global $current_user; + global $seclog; ++ if (!file_exists('user_privileges/user_privileges_'.$current_user->id.'.php')) ++ { ++ # create User Priviledges file ++ require('modules/Users/CreateUserPrivilegeFile.php'); ++ createUserPrivilegesfile($current_user->id); ++ } ++ if (!file_exists('user_privileges/sharing_privileges_'.$current_user->id.'.php')) ++ { ++ # create Sharing Priviledges file ++ require('modules/Users/CreateUserPrivilegeFile.php'); ++ createUserSharingPrivilegesfile($current_user->id); ++ } + require('user_privileges/user_privileges_'.$current_user->id.'.php'); + require('user_privileges/sharing_privileges_'.$current_user->id.'.php'); + $permission = "no"; +@@ -4403,4 +4415,4 @@ + return ($fieldid !== false); + } + +-?> +\ No newline at end of file ++?> +--- ./Smarty/templates/DetailView.tpl 2009-07-15 19:35:09.000000000 -0400 ++++ ./Smarty/templates/DetailView.tpl 2009-07-15 20:50:19.000000000 -0400 +@@ -444,7 +444,11 @@ + + {/if} + {/if} +- ++ {if $MODULE eq 'Accounts'} ++ VC fax log     ++ VC email log ++ {/if} ++ + {if $MODULE eq 'Contacts' || $EVENT_PERMISSION eq 'true'} + + +@@ -717,4 +721,4 @@ + + {if $MODULE eq 'Leads' or $MODULE eq 'Contacts' or $MODULE eq 'Accounts' or $MODULE eq 'Campaigns' or $MODULE eq 'Vendors'} +
+-{/if} +\ No newline at end of file ++{/if} +--- ./include/js/general.js 2009-07-15 19:35:09.000000000 -0400 ++++ ./include/js/general.js 2009-07-15 20:28:37.000000000 -0400 +@@ -1849,6 +1849,74 @@ + openPopUp('xComposeEmail',this,url,'createemailWin',830,662,opts); + } + ++function VICIDIALcall(record_id,field_name,phone,user_name) { ++//alert(record_id + "|" + field_name + "|" + phone + "|" user_name); ++var xmlhttp=false; ++/*@cc_on @*/ ++/*@if (@_jscript_version >= 5) ++// JScript gives us Conditional compilation, we can cope with old IE versions. ++// and security blocked creation of the objects. ++ try { ++ xmlhttp = new ActiveXObject("Msxml2.XMLHTTP"); ++ } catch (e) { ++ try { ++ xmlhttp = new ActiveXObject("Microsoft.XMLHTTP"); ++ } catch (E) { ++ xmlhttp = false; ++ } ++ } ++@end @*/ ++if (!xmlhttp && typeof XMLHttpRequest!='undefined') ++ { ++ xmlhttp = new XMLHttpRequest(); ++ } ++if (xmlhttp) ++ { ++ var callback_flag=''; ++ if (field_name=='CallBack') ++ { ++ var log_call = record_id + ''; ++ while (log_call.length < 10) ++ {log_call = "0" + log_call;} ++ phone = "99" + log_call; ++ callback_flag = '&callback=1'; ++ } ++ if (field_name=='fax') ++ { ++ var log_call = record_id + ''; ++ while (log_call.length < 8) ++ {log_call = "0" + log_call;} ++ phone = "18" + log_call; ++ } ++ if (field_name=='email') ++ { ++ var log_call = record_id + ''; ++ while (log_call.length < 8) ++ {log_call = "0" + log_call;} ++ phone = "19" + log_call; ++ } ++ var VCcallQuery = "VCcall=1&phone=" + phone + "&vendor_id=" + record_id + '' + callback_flag; ++ xmlhttp.open('POST', 'vtigerservice.php'); ++ xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8'); ++ xmlhttp.send(VCcallQuery); ++ xmlhttp.onreadystatechange = function() ++ { ++ if (xmlhttp.readyState == 4 && xmlhttp.status == 200) ++ { ++ // alert(xmlhttp.responseText); ++ var Xoutput = null; ++ Xoutput = xmlhttp.responseText; ++ var regXFerr = new RegExp("ERROR","g"); ++ if (Xoutput.match(regXFerr)) ++ { ++ alert(xmlhttp.responseText); ++ } ++ } ++ } ++ delete xmlhttp; ++ } ++} ++ + function fnHide_Event(obj){ + document.getElementById(obj).style.visibility = 'hidden'; + } +--- ./vtigerservice.php 2009-07-15 19:35:09.000000000 -0400 ++++ ./vtigerservice.php 2009-07-15 20:31:05.000000000 -0400 +@@ -41,13 +41,70 @@ + } + else + { +- echo "

vtigerCRM Soap Services

"; ++ if(isset($_REQUEST['VCcall'])) ++ { ++ $CL=':'; ++ $server_name = getenv("SERVER_NAME"); ++ $server_port = getenv("SERVER_PORT"); ++ if (eregi("443",$server_port)) {$HTTPprotocol = 'https://';} ++ else {$HTTPprotocol = 'http://';} ++ if (($server_port == '80') or ($server_port == '443') ) {$server_port='';} ++ else {$server_port = "$CL$server_port";} ++ $URLbase = "$HTTPprotocol$server_name$server_port"; ++ ++ $callback_flag=''; ++ if(isset($_REQUEST['callback'])) ++ { ++ $callback_flag = '&vtiger_callback=YES'; ++ } ++ global $entityDel; ++ global $display; ++ global $category; ++ header('Content-Type: text/html; charset='. $charset); ++ session_start(); ++ require_once('include/utils/utils.php'); ++ require_once('config.inc.php'); ++ $default_config_values = Array( "allow_exports"=>"all","upload_maxsize"=>"3000000", "listview_max_textlength" => "40" ); ++ set_default_config($default_config_values); ++ require_once('include/logging.php'); ++ require_once('modules/Users/Users.php'); ++ global $currentModule; ++ $current_user = new Users(); ++ ++ $log =& LoggerManager::getLogger('index'); ++ global $seclog; ++ $seclog =& LoggerManager::getLogger('SECURITY'); ++ $log->debug($_REQUEST); ++ ++ // Check to see if there is an authenticated user in the session. ++ if(isset($_SESSION["authenticated_user_id"]) && (isset($_SESSION["app_unique_key"]) && $_SESSION["app_unique_key"] == $application_unique_key)) ++ { ++ $log->debug("We have an authenticated user id: ".$_SESSION["authenticated_user_id"]); ++ $result = $current_user->retrieveCurrentUserInfoFromFile($_SESSION['authenticated_user_id']); ++ $log->debug('Current user is: '.$current_user->user_name); ++ } ++ ++ $phone = $_REQUEST['phone']; $vendor_id = $_REQUEST['vendor_id']; ++ $user = $current_user->user_name; ++ ++ $VCapiURL = "/agc/api.php"; ++ $VCpauseQuery = "?source=vtiger&user=1000&pass=1234&agent_user=$user&function=external_pause&value=PAUSE"; ++ $VCcallQuery = "?source=vtiger&user=1000&pass=1234&agent_user=$user&function=external_dial&value=$phone&phone_code=1&search=YES&preview=NO&focus=YES&vendor_id=$vendor_id$callback_flag"; ++ $replyP = file("$URLbase$VCapiURL$VCpauseQuery"); ++// sleep(1); ++ $replyC = file("$URLbase$VCapiURL$VCcallQuery"); ++ echo "$replyP[0]|$replyC[0]\n"; ++// echo "$URLbase$VCapiURL$VCcallQuery\n"; ++ } ++ else ++ { echo "

vtigerCRM Soap Services

"; + echo "
  • vtigerCRM Outlook Plugin EndPoint URL -- Click here
    • "; + echo "
  • vtigerCRM Word Plugin EndPoint URL -- Click here
    • "; + echo "
  • vtigerCRM ThunderBird Extenstion EndPoint URL -- Click here
    • "; + echo "
  • vtigerCRM Customer Portal EndPoint URL -- Click here
    • "; + echo "
  • vtigerCRM WebForm EndPoint URL -- Click here
    • "; + echo "
  • vtigerCRM FireFox Extension EndPoint URL -- Click here
    • "; ++ } + } + + +--- ./modules/Users/Authenticate.php 2009-07-15 19:35:09.000000000 -0400 ++++ ./modules/Users/Authenticate.php 2009-07-15 20:45:50.000000000 -0400 +@@ -64,7 +64,19 @@ + //Security related entries start + require_once('include/utils/UserInfoUtil.php'); + +- createUserPrivilegesfile($focus->id); ++ if (file_exists('user_privileges/user_privileges_'.$focus->id.'.php')) ++ { ++ # delete User Priviledges file ++ unlink('user_privileges/user_privileges_'.$focus->id.'.php'); ++ } ++ if (file_exists('user_privileges/sharing_privileges_'.$focus->id.'.php')) ++ { ++ # delete Sharing Priviledges file ++ unlink('user_privileges/sharing_privileges_'.$focus->id.'.php'); ++ } ++ # create User Sharing Priviledges files ++ createUserPrivilegesfile($focus->id); ++ createUserSharingPrivilegesfile($focus->id); + + //Security related entries end + session_unregister('login_password'); +@@ -142,4 +154,4 @@ + header("Location: index.php"); + } + +-?> +\ No newline at end of file ++?>