Download as
Browse Code »

Commit 29bf3f6c2f4f2511c93b2cecfdb501882c562022

Authored by Eduardo Santos
Committed by Eduardo Santos
1 parent 6e45662d
Exists in master and in 1 other branch 3.1

Corrige erro nas impressoras e bug da coleta

Showing 2 changed files with 29 additions and 31 deletions   Show diff stats
@@ -314,9 +314,9 @@ @@ -314,9 +314,9 @@
314 "email": "kontakt@beberlei.de" 314 "email": "kontakt@beberlei.de"
315 }, 315 },
316 { 316 {
317 - "name": "Johannes Schmitt", 317 + "name": "Johannes M. Schmitt",
318 "email": "schmittjoh@gmail.com", 318 "email": "schmittjoh@gmail.com",
319 - "homepage": "http://jmsyst.com", 319 + "homepage": "https://github.com/schmittjoh",
320 "role": "Developer of wrapped JMSSerializerBundle" 320 "role": "Developer of wrapped JMSSerializerBundle"
321 } 321 }
322 ], 322 ],
@@ -362,7 +362,7 @@ @@ -362,7 +362,7 @@
362 ], 362 ],
363 "authors": [ 363 "authors": [
364 { 364 {
365 - "name": "Jonathan H. Wage", 365 + "name": "Jonathan Wage",
366 "email": "jonwage@gmail.com", 366 "email": "jonwage@gmail.com",
367 "homepage": "http://www.jwage.com/", 367 "homepage": "http://www.jwage.com/",
368 "role": "Creator" 368 "role": "Creator"
@@ -381,7 +381,7 @@ @@ -381,7 +381,7 @@
381 "email": "kontakt@beberlei.de" 381 "email": "kontakt@beberlei.de"
382 }, 382 },
383 { 383 {
384 - "name": "Johannes Schmitt", 384 + "name": "Johannes M. Schmitt",
385 "email": "schmittjoh@gmail.com", 385 "email": "schmittjoh@gmail.com",
386 "homepage": "https://github.com/schmittjoh", 386 "homepage": "https://github.com/schmittjoh",
387 "role": "Developer of wrapped JMSSerializerBundle" 387 "role": "Developer of wrapped JMSSerializerBundle"
@@ -837,7 +837,7 @@ @@ -837,7 +837,7 @@
837 { 837 {
838 "name": "Johannes M. Schmitt", 838 "name": "Johannes M. Schmitt",
839 "email": "schmittjoh@gmail.com", 839 "email": "schmittjoh@gmail.com",
840 - "homepage": "http://jmsyst.com", 840 + "homepage": "https://github.com/schmittjoh",
841 "role": "Developer of wrapped JMSSerializerBundle" 841 "role": "Developer of wrapped JMSSerializerBundle"
842 } 842 }
843 ], 843 ],
@@ -889,9 +889,9 @@ @@ -889,9 +889,9 @@
889 "email": "roman@code-factory.org" 889 "email": "roman@code-factory.org"
890 }, 890 },
891 { 891 {
892 - "name": "Johannes Schmitt", 892 + "name": "Johannes M. Schmitt",
893 "email": "schmittjoh@gmail.com", 893 "email": "schmittjoh@gmail.com",
894 - "homepage": "http://jmsyst.com", 894 + "homepage": "https://github.com/schmittjoh",
895 "role": "Developer of wrapped JMSSerializerBundle" 895 "role": "Developer of wrapped JMSSerializerBundle"
896 } 896 }
897 ], 897 ],
@@ -1041,12 +1041,12 @@ @@ -1041,12 +1041,12 @@
1041 "source": { 1041 "source": {
1042 "type": "git", 1042 "type": "git",
1043 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", 1043 "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git",
1044 - "reference": "5e91023b941cb11d8ac09c46405a4aa1920ca217" 1044 + "reference": "22d6b2a401b66fb4f18840efc27826de441d902c"
1045 }, 1045 },
1046 "dist": { 1046 "dist": {
1047 "type": "zip", 1047 "type": "zip",
1048 - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/5e91023b941cb11d8ac09c46405a4aa1920ca217",  
1049 - "reference": "5e91023b941cb11d8ac09c46405a4aa1920ca217", 1048 + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/22d6b2a401b66fb4f18840efc27826de441d902c",
  1049 + "reference": "22d6b2a401b66fb4f18840efc27826de441d902c",
1050 "shasum": "" 1050 "shasum": ""
1051 }, 1051 },
1052 "require": { 1052 "require": {
@@ -1062,7 +1062,7 @@ @@ -1062,7 +1062,7 @@
1062 "jms/serializer-bundle": "<0.11" 1062 "jms/serializer-bundle": "<0.11"
1063 }, 1063 },
1064 "require-dev": { 1064 "require-dev": {
1065 - "jms/serializer-bundle": "0.12.*", 1065 + "jms/serializer-bundle": "~0.12",
1066 "sensio/framework-extra-bundle": "~2.2", 1066 "sensio/framework-extra-bundle": "~2.2",
1067 "symfony/form": "~2.2", 1067 "symfony/form": "~2.2",
1068 "symfony/security": "~2.2", 1068 "symfony/security": "~2.2",
@@ -1071,7 +1071,7 @@ @@ -1071,7 +1071,7 @@
1071 "symfony/yaml": "~2.2" 1071 "symfony/yaml": "~2.2"
1072 }, 1072 },
1073 "suggest": { 1073 "suggest": {
1074 - "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires 0.12.*", 1074 + "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires ~0.12",
1075 "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener", 1075 "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener",
1076 "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.2", 1076 "symfony/serializer": "Add support for basic serialization capabilities and xml decoding, requires ~2.2",
1077 "symfony/validator": "Add support for validation capabilities in the ParamFetcher, requires ~2.2" 1077 "symfony/validator": "Add support for validation capabilities in the ParamFetcher, requires ~2.2"
@@ -1110,7 +1110,7 @@ @@ -1110,7 +1110,7 @@
1110 "keywords": [ 1110 "keywords": [
1111 "rest" 1111 "rest"
1112 ], 1112 ],
1113 - "time": "2014-08-02 13:36:07" 1113 + "time": "2014-08-11 13:50:52"
1114 }, 1114 },
1115 { 1115 {
1116 "name": "helios-ag/fm-elfinder-bundle", 1116 "name": "helios-ag/fm-elfinder-bundle",
@@ -1195,7 +1195,7 @@ @@ -1195,7 +1195,7 @@
1195 ], 1195 ],
1196 "authors": [ 1196 "authors": [
1197 { 1197 {
1198 - "name": "Al Ganiev", 1198 + "name": "Albert Ganiev",
1199 "email": "helios.ag@gmail.com" 1199 "email": "helios.ag@gmail.com"
1200 }, 1200 },
1201 { 1201 {
@@ -1752,12 +1752,12 @@ @@ -1752,12 +1752,12 @@
1752 "source": { 1752 "source": {
1753 "type": "git", 1753 "type": "git",
1754 "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", 1754 "url": "https://github.com/schmittjoh/JMSSerializerBundle.git",
1755 - "reference": "55bb8fc449c626ab8d47d58fa13fd37f84376dfc" 1755 + "reference": "3a980e5409aa3d143534e68a72895e7e33b64c75"
1756 }, 1756 },
1757 "dist": { 1757 "dist": {
1758 "type": "zip", 1758 "type": "zip",
1759 - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/55bb8fc449c626ab8d47d58fa13fd37f84376dfc",  
1760 - "reference": "55bb8fc449c626ab8d47d58fa13fd37f84376dfc", 1759 + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/3a980e5409aa3d143534e68a72895e7e33b64c75",
  1760 + "reference": "3a980e5409aa3d143534e68a72895e7e33b64c75",
1761 "shasum": "" 1761 "shasum": ""
1762 }, 1762 },
1763 "require": { 1763 "require": {
@@ -1799,9 +1799,7 @@ @@ -1799,9 +1799,7 @@
1799 "authors": [ 1799 "authors": [
1800 { 1800 {
1801 "name": "Johannes M. Schmitt", 1801 "name": "Johannes M. Schmitt",
1802 - "email": "schmittjoh@gmail.com",  
1803 - "homepage": "http://jmsyst.com",  
1804 - "role": "Developer of wrapped JMSSerializerBundle" 1802 + "email": "schmittjoh@gmail.com"
1805 } 1803 }
1806 ], 1804 ],
1807 "description": "Allows you to easily serialize, and deserialize data of any complexity", 1805 "description": "Allows you to easily serialize, and deserialize data of any complexity",
@@ -1813,7 +1811,7 @@ @@ -1813,7 +1811,7 @@
1813 "serialization", 1811 "serialization",
1814 "xml" 1812 "xml"
1815 ], 1813 ],
1816 - "time": "2014-07-08 16:41:25" 1814 + "time": "2014-08-07 13:20:59"
1817 }, 1815 },
1818 { 1816 {
1819 "name": "jms/translation-bundle", 1817 "name": "jms/translation-bundle",
@@ -2105,7 +2103,7 @@ @@ -2105,7 +2103,7 @@
2105 "email": "stof@notk.org" 2103 "email": "stof@notk.org"
2106 }, 2104 },
2107 { 2105 {
2108 - "name": "Knplabs", 2106 + "name": "KnpLabs",
2109 "homepage": "http://knplabs.com" 2107 "homepage": "http://knplabs.com"
2110 }, 2108 },
2111 { 2109 {
@@ -2297,12 +2295,12 @@ @@ -2297,12 +2295,12 @@
2297 "source": { 2295 "source": {
2298 "type": "git", 2296 "type": "git",
2299 "url": "https://github.com/lightbase/cocar.git", 2297 "url": "https://github.com/lightbase/cocar.git",
2300 - "reference": "c9cabf7119e18a49956edae87996dded77e213d2" 2298 + "reference": "720c610b5ca409c385902cadb68d8443f0fe9ae3"
2301 }, 2299 },
2302 "dist": { 2300 "dist": {
2303 "type": "zip", 2301 "type": "zip",
2304 - "url": "https://api.github.com/repos/lightbase/cocar/zipball/c9cabf7119e18a49956edae87996dded77e213d2",  
2305 - "reference": "c9cabf7119e18a49956edae87996dded77e213d2", 2302 + "url": "https://api.github.com/repos/lightbase/cocar/zipball/720c610b5ca409c385902cadb68d8443f0fe9ae3",
  2303 + "reference": "720c610b5ca409c385902cadb68d8443f0fe9ae3",
2306 "shasum": "" 2304 "shasum": ""
2307 }, 2305 },
2308 "require": { 2306 "require": {
@@ -2333,7 +2331,7 @@ @@ -2333,7 +2331,7 @@
2333 "support": { 2331 "support": {
2334 "source": "https://github.com/lightbase/cocar/tree/master" 2332 "source": "https://github.com/lightbase/cocar/tree/master"
2335 }, 2333 },
2336 - "time": "2014-08-01 13:34:45" 2334 + "time": "2014-09-19 21:37:41"
2337 }, 2335 },
2338 { 2336 {
2339 "name": "monolog/monolog", 2337 "name": "monolog/monolog",
@@ -2483,7 +2481,7 @@ @@ -2483,7 +2481,7 @@
2483 { 2481 {
2484 "name": "Johannes M. Schmitt", 2482 "name": "Johannes M. Schmitt",
2485 "email": "schmittjoh@gmail.com", 2483 "email": "schmittjoh@gmail.com",
2486 - "homepage": "http://jmsyst.com", 2484 + "homepage": "https://github.com/schmittjoh",
2487 "role": "Developer of wrapped JMSSerializerBundle" 2485 "role": "Developer of wrapped JMSSerializerBundle"
2488 } 2486 }
2489 ], 2487 ],
@@ -2533,7 +2531,7 @@ @@ -2533,7 +2531,7 @@
2533 { 2531 {
2534 "name": "Johannes M. Schmitt", 2532 "name": "Johannes M. Schmitt",
2535 "email": "schmittjoh@gmail.com", 2533 "email": "schmittjoh@gmail.com",
2536 - "homepage": "http://jmsyst.com", 2534 + "homepage": "https://github.com/schmittjoh",
2537 "role": "Developer of wrapped JMSSerializerBundle" 2535 "role": "Developer of wrapped JMSSerializerBundle"
2538 } 2536 }
2539 ], 2537 ],
@@ -3356,7 +3354,7 @@ @@ -3356,7 +3354,7 @@
3356 ], 3354 ],
3357 "authors": [ 3355 "authors": [
3358 { 3356 {
3359 - "name": "William DURAND", 3357 + "name": "William Durand",
3360 "email": "william.durand1@gmail.com", 3358 "email": "william.durand1@gmail.com",
3361 "homepage": "http://www.willdurand.fr" 3359 "homepage": "http://www.willdurand.fr"
3362 } 3360 }
src/Cacic/WSBundle/Controller/DefaultController.php
  Diff comments   View file @29bf3f6
@@ -110,7 +110,7 @@ class DefaultController extends Controller @@ -110,7 +110,7 @@ class DefaultController extends Controller
110 $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $ip_computador, $netmask ); 110 $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $ip_computador, $netmask );
111 111
112 if (empty($netmask) || (empty($te_node_address)) || empty($so)) { 112 if (empty($netmask) || (empty($te_node_address)) || empty($so)) {
113 - $this->get('logger')->error("Erro na operação de getTest. Máscara = $netmask. MAC = $te_node_address. SO = $te_so"); 113 + $this->get('logger')->error("Erro na operação de getTest. IP = $ip_computador Máscara = $netmask. MAC = $te_node_address. SO = $te_so");
114 114
115 $response = new Response(); 115 $response = new Response();
116 $response->headers->set('Content-Type', 'xml'); 116 $response->headers->set('Content-Type', 'xml');
@@ -224,7 +224,7 @@ class DefaultController extends Controller @@ -224,7 +224,7 @@ class DefaultController extends Controller
224 * Se a máscara de subrede ou o mac address estiver vazio, força o redirecionamento para provável atualização 224 * Se a máscara de subrede ou o mac address estiver vazio, força o redirecionamento para provável atualização
225 */ 225 */
226 if (empty($netmask) || (empty($te_node_address)) || empty($so)) { 226 if (empty($netmask) || (empty($te_node_address)) || empty($so)) {
227 - $this->get('logger')->error("Erro na operação de getConfig. Máscara = $netmask. MAC = $te_node_address. SO = $request->get( 'te_so' )"); 227 + $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' ));
228 228
229 return $this->forward('CacicWSBundle:Default:update', $this->getRequest()->request->all()); 229 return $this->forward('CacicWSBundle:Default:update', $this->getRequest()->request->all());
230 } 230 }