Commit a5045c7f authored by Ana's avatar Ana

resolviendo conflictos

parent f4565104
<?php <?php
namespace AppBundle\Model; namespace AppBundle\Model;
use AppBundle\Model\om\BaseSms; use AppBundle\Model\om\BaseSms;
use Monolog\Logger; use Monolog\Logger;
use Symfony\Component\DependencyInjection\Container; use Symfony\Component\DependencyInjection\Container;
...@@ -52,7 +51,7 @@ class Sms extends BaseSms ...@@ -52,7 +51,7 @@ class Sms extends BaseSms
//$urlDescarga = Sms::acortarUrl($url); //$urlDescarga = Sms::acortarUrl($url);
$urlDescarga = $url; //$urlDescarga = $url;
$mensaje=$mensaje . $urlDescarga; $mensaje=$mensaje . $urlDescarga;
...@@ -64,7 +63,7 @@ class Sms extends BaseSms ...@@ -64,7 +63,7 @@ class Sms extends BaseSms
$mensaje=$mensaje . $urlDescarga; $mensaje=$mensaje . $urlDescarga;
/* $post['to'] = array($movil); $post['to'] = array($movil);
$post['text'] = $mensaje; $post['text'] = $mensaje;
$post['from'] = 'McAfee'; $post['from'] = 'McAfee';
$user ='GearLabs'; $user ='GearLabs';
...@@ -85,12 +84,12 @@ class Sms extends BaseSms ...@@ -85,12 +84,12 @@ class Sms extends BaseSms
print_r($result); print_r($result);
//print_r($result['error']['code']); //print_r($result['error']['code']);
$log->debug($tag.'enviando mensaje...'. $urlDescarga);*/ $log->debug($tag.'enviando mensaje...'. $urlDescarga);
/***************************************/ /***************************************/
$request = '{ /* $request = '{
"api_key":"9df2cfda7cc871680ede6ec24b4a479d", "api_key":"9df2cfda7cc871680ede6ec24b4a479d",
"report_url":"http://servidoctor.com/callback/script", "report_url":"http://servidoctor.com/callback/script",
"concat":1, "concat":1,
...@@ -119,7 +118,7 @@ class Sms extends BaseSms ...@@ -119,7 +118,7 @@ class Sms extends BaseSms
if (curl_errno($ch) != 0 ){ if (curl_errno($ch) != 0 ){
die("curl error: ".curl_errno($ch)); die("curl error: ".curl_errno($ch));
} } */
/***************************************/ /***************************************/
if($result['error']['code']==0){ if($result['error']['code']==0){
......
...@@ -36,8 +36,8 @@ class McafeeEnviarSmsCommand extends ContainerAwareCommand ...@@ -36,8 +36,8 @@ class McafeeEnviarSmsCommand extends ContainerAwareCommand
$log->debug('************************Iniciando McafeeEnviarSmsCommand ************************'); $log->debug('************************Iniciando McafeeEnviarSmsCommand ************************');
$tt = new TiempoTranscurrido(); $tt = new TiempoTranscurrido();
//$fp = fopen("/opt/sdp/intelsecuritymovistar/etc/sms/3_36460.csv", "r"); $fp = fopen("/opt/sdp/intelsecuritymovistar/etc/sms/3_36460.csv", "r");
$fp = fopen("C:\ana3\movistarChile\prueba.csv", "r"); //$fp = fopen("C:\ana3\movistarChile\prueba.csv", "r");
if (!$fp) { if (!$fp) {
$log->warning('Error al intentar abrir el archivo'); $log->warning('Error al intentar abrir el archivo');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment