--- /tmp/dsg/dolibarr/htdocs/asterisk/github_cidlookup.php +++ /tmp/dsg/dolibarr/htdocs/asterisk/client_cidlookup.php @@ -35,8 +35,8 @@ // Security check if (empty($conf->clicktodial->enabled)) { - print "Error: Module Click to dial is not enabled.\n"; - exit; + print "Error: Module Click to dial is not enabled.\n"; + exit; } // Check parameters @@ -67,7 +67,9 @@ $found = $notfound; } $db->free($resql); -} else { +} +else +{ dol_print_error($db, 'Error'); $found = 'Error'; } --- /tmp/dsg/dolibarr/htdocs/asterisk/github_wrapper.php +++ /tmp/dsg/dolibarr/htdocs/asterisk/client_wrapper.php @@ -44,10 +44,10 @@ */ function llxHeader() { - print ''."\n"; - print ''."\n"; - print 'Asterisk redirection from Dolibarr...'."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; + print 'Asterisk redirection from Dolibarr...'."\n"; + print ''."\n"; } /** @@ -58,7 +58,7 @@ */ function llxFooter() { - print "\n".''."\n"; + print "\n".''."\n"; } require_once '../main.inc.php'; @@ -69,8 +69,8 @@ // Security check if (empty($conf->clicktodial->enabled)) { - accessforbidden(); - exit; + accessforbidden(); + exit; } @@ -137,7 +137,9 @@ $found = $notfound; } $db->free($resql); -} else { +} +else +{ dol_print_error($db, 'Error'); $found = 'Error'; } @@ -146,46 +148,49 @@ $pos = strpos($number, "local"); if (!empty($number)) { - if ($pos === false) - { - $errno = 0; - $errstr = 0; - $strCallerId = "Dolibarr call $found <".strtolower($number).">"; - $oSocket = @fsockopen($strHost, $port, $errno, $errstr, 10); - if (!$oSocket) - { - print ''."\n"; - $txt = "Failed to execute fsockopen($strHost, $port, \$errno, \$errstr, 10)
\n"; - print $txt; - dol_syslog($txt, LOG_ERR); - $txt = $errstr." (".$errno.")
\n"; - print $txt; - dol_syslog($txt, LOG_ERR); - print ''."\n"; - } else { - $txt = "Call Asterisk dialer for caller: ".$caller.", called: ".$called." clicktodiallogin: ".$login; - dol_syslog($txt); - print ''."\n"; - print ''; - fputs($oSocket, "Action: login\r\n"); - fputs($oSocket, "Events: off\r\n"); - fputs($oSocket, "Username: $login\r\n"); - fputs($oSocket, "Secret: $password\r\n\r\n"); - fputs($oSocket, "Action: originate\r\n"); - fputs($oSocket, "Channel: ".$channel.$caller."\r\n"); - fputs($oSocket, "WaitTime: $strWaitTime\r\n"); - fputs($oSocket, "CallerId: $strCallerId\r\n"); - fputs($oSocket, "Exten: ".$prefix.$number."\r\n"); - fputs($oSocket, "Context: $strContext\r\n"); - fputs($oSocket, "Priority: $strPriority\r\n\r\n"); - fputs($oSocket, "Action: Logoff\r\n\r\n"); - sleep(2); - fclose($oSocket); - print ''."\n"; - } - } -} else { - print 'Bad parameters in URL. Must be '.$_SERVER['PHP_SELF'].'?caller=99999&called=99999&login=xxxxx&password=xxxxx'; + if ($pos === false) + { + $errno = 0; + $errstr = 0; + $strCallerId = "Dolibarr call $found <".strtolower($number).">"; + $oSocket = @fsockopen($strHost, $port, $errno, $errstr, 10); + if (!$oSocket) + { + print ''."\n"; + $txt = "Failed to execute fsockopen($strHost, $port, \$errno, \$errstr, 10)
\n"; + print $txt; + dol_syslog($txt, LOG_ERR); + $txt = $errstr." (".$errno.")
\n"; + print $txt; + dol_syslog($txt, LOG_ERR); + print ''."\n"; + } + else + { + $txt = "Call Asterisk dialer for caller: ".$caller.", called: ".$called." clicktodiallogin: ".$login; + dol_syslog($txt); + print ''."\n"; + print ''; + fputs($oSocket, "Action: login\r\n"); + fputs($oSocket, "Events: off\r\n"); + fputs($oSocket, "Username: $login\r\n"); + fputs($oSocket, "Secret: $password\r\n\r\n"); + fputs($oSocket, "Action: originate\r\n"); + fputs($oSocket, "Channel: ".$channel.$caller."\r\n"); + fputs($oSocket, "WaitTime: $strWaitTime\r\n"); + fputs($oSocket, "CallerId: $strCallerId\r\n"); + fputs($oSocket, "Exten: ".$prefix.$number."\r\n"); + fputs($oSocket, "Context: $strContext\r\n"); + fputs($oSocket, "Priority: $strPriority\r\n\r\n"); + fputs($oSocket, "Action: Logoff\r\n\r\n"); + sleep(2); + fclose($oSocket); + print ''."\n"; + } + } +} +else { + print 'Bad parameters in URL. Must be '.$_SERVER['PHP_SELF'].'?caller=99999&called=99999&login=xxxxx&password=xxxxx'; } // End of page