Merge remote-tracking branch 'origin/master'

Bruno Noronha
2 parents b68a0652 b742aa8a
Showing 3 changed files with 65 additions and 40 deletions Show diff stats
composer.lock
src/Cacic/WSBundle/Controller/DefaultController.php
src/Cacic/WSBundle/Resources/views/Default/testUpdate.xml.twig
@@ -314,9 +314,9 @@
                     "email": "kontakt@beberlei.de"
                 },
                 {
-                    "name": "Johannes Schmitt",
+                    "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -362,7 +362,7 @@
             ],
             "authors": [
                 {
-                    "name": "Jonathan H. Wage",
+                    "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com",
                     "homepage": "http://www.jwage.com/",
                     "role": "Creator"
@@ -381,7 +381,7 @@
                     "email": "kontakt@beberlei.de"
                 },
                 {
-                    "name": "Johannes Schmitt",
+                    "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
                     "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
@@ -837,7 +837,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -889,9 +889,9 @@
                     "email": "roman@code-factory.org"
                 },
                 {
-                    "name": "Johannes Schmitt",
+                    "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -1041,12 +1041,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
-                "reference": "5e91023b941cb11d8ac09c46405a4aa1920ca217"
+                "reference": "22d6b2a401b66fb4f18840efc27826de441d902c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/5e91023b941cb11d8ac09c46405a4aa1920ca217",
-                "reference": "5e91023b941cb11d8ac09c46405a4aa1920ca217",
+                "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/22d6b2a401b66fb4f18840efc27826de441d902c",
+                "reference": "22d6b2a401b66fb4f18840efc27826de441d902c",
                 "shasum": ""
             },
             "require": {
@@ -1062,7 +1062,7 @@
                 "jms/serializer-bundle": "<0.11"
             },
             "require-dev": {
-                "jms/serializer-bundle": "0.12.*",
+                "jms/serializer-bundle": "~0.12",
                 "sensio/framework-extra-bundle": "~2.2",
                 "symfony/form": "~2.2",
                 "symfony/security": "~2.2",
@@ -1071,7 +1071,7 @@
                 "symfony/yaml": "~2.2"
             },
             "suggest": {
-                "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires 0.12.*",
+                "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ~0.12",
                 "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener",
                 "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.2",
                 "symfony/validator": "Add support for validation capabilities in the ParamFetcher, requires ~2.2"
@@ -1110,7 +1110,7 @@
             "keywords": [
                 "rest"
             ],
-            "time": "2014-08-02 13:36:07"
+            "time": "2014-08-11 13:50:52"
         },
         {
             "name": "helios-ag/fm-elfinder-bundle",
@@ -1195,7 +1195,7 @@
             ],
             "authors": [
                 {
-                    "name": "Al Ganiev",
+                    "name": "Albert Ganiev",
                     "email": "helios.ag@gmail.com"
                 },
                 {
@@ -1752,12 +1752,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/JMSSerializerBundle.git",
-                "reference": "55bb8fc449c626ab8d47d58fa13fd37f84376dfc"
+                "reference": "3a980e5409aa3d143534e68a72895e7e33b64c75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/55bb8fc449c626ab8d47d58fa13fd37f84376dfc",
-                "reference": "55bb8fc449c626ab8d47d58fa13fd37f84376dfc",
+                "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/3a980e5409aa3d143534e68a72895e7e33b64c75",
+                "reference": "3a980e5409aa3d143534e68a72895e7e33b64c75",
                 "shasum": ""
             },
             "require": {
@@ -1799,9 +1799,7 @@
             "authors": [
                 {
                     "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
-                    "role": "Developer of wrapped JMSSerializerBundle"
+                    "email": "schmittjoh@gmail.com"
                 }
             ],
             "description": "Allows you to easily serialize, and deserialize data of any complexity",
@@ -1813,7 +1811,7 @@
                 "serialization",
                 "xml"
             ],
-            "time": "2014-07-08 16:41:25"
+            "time": "2014-08-07 13:20:59"
         },
         {
             "name": "jms/translation-bundle",
@@ -2105,7 +2103,7 @@
                     "email": "stof@notk.org"
                 },
                 {
-                    "name": "Knplabs",
+                    "name": "KnpLabs",
                     "homepage": "http://knplabs.com"
                 },
                 {
@@ -2297,12 +2295,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/lightbase/cocar.git",
-                "reference": "c9cabf7119e18a49956edae87996dded77e213d2"
+                "reference": "720c610b5ca409c385902cadb68d8443f0fe9ae3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lightbase/cocar/zipball/c9cabf7119e18a49956edae87996dded77e213d2",
-                "reference": "c9cabf7119e18a49956edae87996dded77e213d2",
+                "url": "https://api.github.com/repos/lightbase/cocar/zipball/720c610b5ca409c385902cadb68d8443f0fe9ae3",
+                "reference": "720c610b5ca409c385902cadb68d8443f0fe9ae3",
                 "shasum": ""
             },
             "require": {
@@ -2333,7 +2331,7 @@
             "support": {
                 "source": "https://github.com/lightbase/cocar/tree/master"
             },
-            "time": "2014-08-01 13:34:45"
+            "time": "2014-09-19 21:37:41"
         },
         {
             "name": "monolog/monolog",
@@ -2483,7 +2481,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -2533,7 +2531,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "http://jmsyst.com",
+                    "homepage": "https://github.com/schmittjoh",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -3356,7 +3354,7 @@
             ],
             "authors": [
                 {
-                    "name": "William DURAND",
+                    "name": "William Durand",
                     "email": "william.durand1@gmail.com",
                     "homepage": "http://www.willdurand.fr"
                 }
@@ -78,24 +78,22 @@ class DefaultController extends Controller
         $strComputerSystem  			 = OldCacicHelper::deCrypt( $request, $request->get('ComputerSystem') );
         $strOperatingSystem  			 = OldCacicHelper::deCrypt( $request, $request->request->get('OperatingSystem') );
-        $teste = $strNetworkAdapterConfiguration;
-        #$logger->debug("00000000000000000000000000000000000000000000 ".print_r($teste, true));
         $te_node_address = TagValueHelper::getValueFromTags( 'MACAddress', $strNetworkAdapterConfiguration );
         $netmask = TagValueHelper::getValueFromTags( 'IPSubnet', $strNetworkAdapterConfiguration );
         $te_so = $request->get( 'te_so' );
         $ultimo_login = TagValueHelper::getValueFromTags( 'UserName'  , $strComputerSystem);
         $ip_computador = $request->get('te_ip_computador');
-        #$logger->debug("11111111111111111111111111111111111: $ip_computador");
+
         if ( empty($ip_computador) ){
             $ip_computador = TagValueHelper::getValueFromTags( 'IPAddress', $strNetworkAdapterConfiguration );
-            #$logger->debug("555555555555555555555555555555555555555555: $ip_computador");
+
         }
-        #$logger->debug("22222222222222222222222222222222222: $ip_computador");
+
         if (empty($ip_computador)) {
             $ip_computador = $request->getClientIp();
         }
-        #$logger->debug("333333333333333333333333333333333333: $ip_computador");
+
         $logger->debug("Teste de Conexão GET-TEST! Ip do computador: $ip_computador Máscara da rede: $netmask");
         // Caso não tenha encontrado, tenta pegar a variável da requisição
@@ -110,6 +108,25 @@ class DefaultController extends Controller
         //vefifica se existe SO coletado se não, insere novo SO
         $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->createIfNotExist( $te_so );
         $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $ip_computador, $netmask );
+
+        if (empty($te_node_address) || empty($so)) {
+            $this->get('logger')->error("Erro na operação de getTest. IP = $ip_computador Máscara = $netmask. MAC = $te_node_address. SO = $te_so");
+
+            $response = new Response();
+            $response->headers->set('Content-Type', 'xml');
+            $cacic_helper = new OldCacicHelper($this->get('kernel'));
+
+            return  $this->render('CacicWSBundle:Default:testUpdate.xml.twig', array(
+                'configs'=> $cacic_helper->getTest( $request ),
+                //'computador' => $computador,
+                'rede' => $rede,
+                //'debugging' => $debugging,
+                'ws_folder' => OldCacicHelper::CACIC_WEB_SERVICES_FOLDER_NAME,
+                'cs_cipher' => $request->get('cs_cipher'),
+                'cs_compress' => $request->get('cs_compress')
+            ), $response);
+        }
+
         #$logger->debug("444444444444444444444444444444444444: $netmask | ".$rede->getNmRede());
         $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $te_so, $te_node_address, $rede, $so, $ip_computador );
         //$local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() ));
@@ -185,7 +202,6 @@ class DefaultController extends Controller
         $ip_computador = $request->get('te_ip_computador');
         if ( empty($ip_computador) ){
             $ip_computador = TagValueHelper::getValueFromTags( 'IPAddress', $strNetworkAdapterConfiguration );
-            #$logger->debug("555555555555555555555555555555555555555555: $ip_computador");
         }
         if (empty($ip_computador)) {
             $ip_computador = $request->getClientIp();
@@ -202,16 +218,17 @@ class DefaultController extends Controller
             $netmask = $request->get('netmask');
         }
+        $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->findOneBy( array('teSo'=>$request->get( 'te_so' )));
+
         /**
          * Se a máscara de subrede ou o mac address estiver vazio, força o redirecionamento para provável atualização
          */
-        if (empty($netmask) || (empty($te_node_address))) {
-
-        return $this->forward('CacicWSBundle:Default:update', $this->getRequest()->request->all());
+        if (empty($te_node_address) || empty($so)) {
+            $this->get('logger')->error("Erro na operação de getConfig. IP = $ip_computador Máscara = $netmask. MAC = $te_node_address. SO =" . $request->get( 'te_so' ));
+            return $this->forward('CacicWSBundle:Default:update', $this->getRequest()->request->all());
         }
-        $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->findOneBy( array('teSo'=>$request->get( 'te_so' )));
         $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $ip_computador, $netmask );
         $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $request->get( 'te_so' ),$te_node_address, $rede, $so, $ip_computador );
         //$local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() ));
@@ -0,0 +1,10 @@
+{% extends 'CacicWSBundle::common.xml.twig' %}
+{%  block bodyXML %}
+    <WebManagerAddress>{{ rede.getTeServCacic() }}</WebManagerAddress>
+    <WebServicesFolderName>{{ ws_folder }}</WebServicesFolderName>
+    <cs_compress>{{ cs_compress }}</cs_compress>
+    <cs_cipher>{{ cs_cipher }}</cs_cipher>
+    <INSTALLCACIC.EXE_HASH>{{ configs['INSTALLCACIC.EXE_HASH'] }}</INSTALLCACIC.EXE_HASH>
+    <MainProgramName>{{ configs.MainProgramName }}</MainProgramName>
+    <LocalFolderName>{{ configs.LocalFolderName }}</LocalFolderName>
+{% endblock %}
 \ No newline at end of file
	@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
		1	+{% extends 'CacicWSBundle::common.xml.twig' %}
		2	+{% block bodyXML %}
		3	+ <WebManagerAddress>{{ rede.getTeServCacic() }}</WebManagerAddress>
		4	+ <WebServicesFolderName>{{ ws_folder }}</WebServicesFolderName>
		5	+ <cs_compress>{{ cs_compress }}</cs_compress>
		6	+ <cs_cipher>{{ cs_cipher }}</cs_cipher>
		7	+ <INSTALLCACIC.EXE_HASH>{{ configs['INSTALLCACIC.EXE_HASH'] }}</INSTALLCACIC.EXE_HASH>
		8	+ <MainProgramName>{{ configs.MainProgramName }}</MainProgramName>
		9	+ <LocalFolderName>{{ configs.LocalFolderName }}</LocalFolderName>
		10	+{% endblock %}
0	\ No newline at end of file	11	\ No newline at end of file