Merge branch 'master' of https://github.com/lightbase/cacic

Gedeson Wasley
2 parents 78317a67 5b2e9494
Showing 8 changed files with 48 additions and 83 deletions Show diff stats
app/bootstrap.php.cache
app/config/config.yml
composer.json
composer.lock
src/Cacic/CommonBundle/Entity/ComputadorRepository.php
src/Cacic/WSBundle/Controller/ColetaController.php
src/Cacic/WSBundle/Controller/DefaultController.php
src/Cacic/WSBundle/Helper/TagValueHelper.php
@@ -1575,14 +1575,10 @@ return null !== $this-&gt;headers-&gt;get(&#39;Vary&#39;);
 }
 public function getVary()
 {
-if (!$vary = $this->headers->get('Vary', null, false)) {
+if (!$vary = $this->headers->get('Vary')) {
 return array();
 }
-$ret = array();
-foreach ($vary as $item) {
-$ret = array_merge($ret, preg_split('/[\s,]+/', $item));
-}
-return $ret;
+return is_array($vary) ? $vary : preg_split('/[\s,]+/', $vary);
 }
 public function setVary($headers, $replace = true)
 {
@@ -2174,11 +2170,11 @@ protected $booted;
 protected $name;
 protected $startTime;
 protected $loadClassCache;
-const VERSION ='2.3.12';
-const VERSION_ID ='20312';
+const VERSION ='2.3.10';
+const VERSION_ID ='20310';
 const MAJOR_VERSION ='2';
 const MINOR_VERSION ='3';
-const RELEASE_VERSION ='12';
+const RELEASE_VERSION ='10';
 const EXTRA_VERSION ='';
 public function __construct($environment, $debug)
 {
@@ -2544,33 +2540,21 @@ return $source;
 $rawChunk ='';
 $output ='';
 $tokens = token_get_all($source);
-$ignoreSpace = false;
 for (reset($tokens); false !== $token = current($tokens); next($tokens)) {
 if (is_string($token)) {
 $rawChunk .= $token;
 } elseif (T_START_HEREDOC === $token[0]) {
-$output .= $rawChunk.$token[1];
+$output .= preg_replace(array('/\s+$/Sm','/\n+/S'),"\n", $rawChunk).$token[1];
 do {
 $token = next($tokens);
 $output .= $token[1];
 } while ($token[0] !== T_END_HEREDOC);
 $rawChunk ='';
-} elseif (T_WHITESPACE === $token[0]) {
-if ($ignoreSpace) {
-$ignoreSpace = false;
-continue;
-}
-$rawChunk .= preg_replace(array('/\n{2,}/S'),"\n", $token[1]);
-} elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
-$ignoreSpace = true;
-} else {
+} elseif (!in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
 $rawChunk .= $token[1];
-if (T_OPEN_TAG === $token[0]) {
-$ignoreSpace = true;
-}
 }
 }
-$output .= $rawChunk;
+$output .= preg_replace(array('/\s+$/Sm','/\n+/S'),"\n", $rawChunk);
 return $output;
 }
 public function serialize()
@@ -2752,7 +2736,6 @@ $application-&gt;add($r-&gt;newInstance());
 namespace Symfony\Component\Config
 {
 use Symfony\Component\Config\Resource\ResourceInterface;
-use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 class ConfigCache
 {
@@ -2790,20 +2773,11 @@ return true;
 }
 public function write($content, array $metadata = null)
 {
-$mode = 0666;
-$umask = umask();
+$mode = 0666 & ~umask();
 $filesystem = new Filesystem();
-$filesystem->dumpFile($this->file, $content, null);
-try {
-$filesystem->chmod($this->file, $mode, $umask);
-} catch (IOException $e) {
-}
+$filesystem->dumpFile($this->file, $content, $mode);
 if (null !== $metadata && true === $this->debug) {
-$filesystem->dumpFile($this->getMetaFile(), serialize($metadata), null);
-try {
-$filesystem->chmod($this->getMetaFile(), $mode, $umask);
-} catch (IOException $e) {
-}
+$filesystem->dumpFile($this->getMetaFile(), serialize($metadata), $mode);
 }
 }
 private function getMetaFile()
@@ -134,6 +134,7 @@ knp_paginator:
 fm_elfinder:
     locale: %locale%
     editor: simple
+    compression: false
     connector:
         roots:
             downloads:
@@ -167,4 +168,4 @@ services:
     cacic_demo.command.demo_command:
             class: Cacic\CommonBundle\Command\DemoCommand
             tags:
-                -  { name: console.command }
 \ No newline at end of file
+                -  { name: console.command }
@@ -24,7 +24,7 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "symfony/symfony": "2.3.*",
+        "symfony/symfony": "2.3.10",
         "jquery/jquery": "1.10.*",
         "doctrine/orm": ">=2.2.3,<2.4-dev",
         "doctrine/doctrine-bundle": "1.2.*",
@@ -3,7 +3,7 @@
         "This file locks the dependencies of your project to a known state",
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
     ],
-    "hash": "7b0319266c174918185313801b3e4139",
+    "hash": "2374f22cb735f9931567e2668cf40380",
     "packages": [
         {
             "name": "braincrafted/bootstrap-bundle",
@@ -217,7 +217,7 @@
             ],
             "authors": [
                 {
-                    "name": "Jonathan H. Wage",
+                    "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com",
                     "homepage": "http://www.jwage.com/",
                     "role": "Creator"
@@ -292,7 +292,7 @@
             ],
             "authors": [
                 {
-                    "name": "Jonathan H. Wage",
+                    "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com",
                     "homepage": "http://www.jwage.com/",
                     "role": "Creator"
@@ -637,9 +637,7 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
+                    "email": "fabien@symfony.com"
                 },
                 {
                     "name": "Symfony Community",
@@ -1269,7 +1267,7 @@
             ],
             "authors": [
                 {
-                    "name": "Johannes M. Schmitt",
+                    "name": "Johannes Schmitt",
                     "email": "schmittjoh@gmail.com",
                     "homepage": "http://jmsyst.com",
                     "role": "Developer of wrapped JMSSerializerBundle"
@@ -1744,7 +1742,7 @@
                 {
                     "name": "Johannes M. Schmitt",
                     "email": "schmittjoh@gmail.com",
-                    "homepage": "https://github.com/schmittjoh",
+                    "homepage": "http://jmsyst.com",
                     "role": "Developer of wrapped JMSSerializerBundle"
                 }
             ],
@@ -2170,12 +2168,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/lightbase/cocar.git",
-                "reference": "8465bec2675d2f6b96b60a9ef59a95f4c25ef54e"
+                "reference": "2fc869b73608ed4d7821e7a2752cd555fc912dfd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lightbase/cocar/zipball/8465bec2675d2f6b96b60a9ef59a95f4c25ef54e",
-                "reference": "8465bec2675d2f6b96b60a9ef59a95f4c25ef54e",
+                "url": "https://api.github.com/repos/lightbase/cocar/zipball/2fc869b73608ed4d7821e7a2752cd555fc912dfd",
+                "reference": "2fc869b73608ed4d7821e7a2752cd555fc912dfd",
                 "shasum": ""
             },
             "require": {
@@ -2206,7 +2204,7 @@
             "support": {
                 "source": "https://github.com/lightbase/cocar/tree/master"
             },
-            "time": "2014-03-29 05:16:50"
+            "time": "2014-04-09 13:43:42"
         },
         {
             "name": "monolog/monolog",
@@ -2404,7 +2402,7 @@
             ],
             "authors": [
                 {
-                    "name": "Johannes M. Schmitt",
+                    "name": "Johannes Schmitt",
                     "email": "schmittjoh@gmail.com",
                     "homepage": "http://jmsyst.com",
                     "role": "Developer of wrapped JMSSerializerBundle"
@@ -2493,9 +2491,7 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "The base bundle for the Symfony Distributions",
@@ -2542,9 +2538,7 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "This bundle provides a way to configure your controllers with annotations",
@@ -2596,9 +2590,7 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "This bundle generates code for you",
@@ -2861,9 +2853,7 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
+                    "email": "fabien@symfony.com"
                 },
                 {
                     "name": "Symfony Community",
@@ -2937,16 +2927,16 @@
         },
         {
             "name": "symfony/symfony",
-            "version": "v2.3.12",
+            "version": "v2.3.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/symfony.git",
-                "reference": "3574df3d5e0039f3225007b8be534df5c4104503"
+                "reference": "e4b9ff28b7c357971947ed12f99fbc68ff116830"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/3574df3d5e0039f3225007b8be534df5c4104503",
-                "reference": "3574df3d5e0039f3225007b8be534df5c4104503",
+                "url": "https://api.github.com/repos/symfony/symfony/zipball/e4b9ff28b7c357971947ed12f99fbc68ff116830",
+                "reference": "e4b9ff28b7c357971947ed12f99fbc68ff116830",
                 "shasum": ""
             },
             "require": {
@@ -3043,7 +3033,7 @@
             "keywords": [
                 "framework"
             ],
-            "time": "2014-04-03 05:42:39"
+            "time": "2014-02-12 08:18:23"
         },
         {
             "name": "twbs/bootstrap",
@@ -3122,9 +3112,7 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Common additional features for Twig that do not directly belong in core",
@@ -221,7 +221,7 @@ class ComputadorRepository extends EntityRepository
     /*
     * Metodo responsável por inserir coletas iniciais, assim que o cacic é instalado
     */
-    public function getComputadorPreCole( Request $request , $te_so , $te_node_adress )
+    public function getComputadorPreCole( Request $request , $te_so , $te_node_adress, $rede, $so )
     {
         //recebe dados via POST, deCripata dados, e attribui a variaveis
         $computer_system   = OldCacicHelper::deCrypt( $request, $request->request->get('ComputerSystem'), true  );
@@ -232,10 +232,10 @@ class ComputadorRepository extends EntityRepository
         $data = new \DateTime('NOW'); //armazena data Atual
         //vefifica se existe SO coletado se não, insere novo SO
-        $so = $this->getEntityManager()->getRepository('CacicCommonBundle:So')->createIfNotExist( $te_so );
-        $rede = $this->getEntityManager()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request );
+        //$so = $this->getEntityManager()->getRepository('CacicCommonBundle:So')->createIfNotExist( $te_so );
+        //$rede = $this->getEntityManager()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request );
         $computador = $this->findOneBy( array( 'teNodeAddress'=> $te_node_adress, 'idSo'=> $so->getIdSo()) );
-        $classes = $this->getEntityManager()->getRepository('CacicCommonBundle:Classe')->findAll();
+        //$classes = $this->getEntityManager()->getRepository('CacicCommonBundle:Classe')->findAll();
         //inserção de dado se for um novo computador
         if( empty ( $computador ) )
@@ -360,7 +360,7 @@ class ColetaController extends Controller
         // Se não encontrar o valor, loga o erro e sai
         if (is_null($classProperty) || $classProperty == "") {
-            $logger->error("ERRO NA COLETA! Propriedade $classPropertyName não encontrada na requisição ou valor vazio");
+            $logger->debug("ERRO NA COLETA! Propriedade $classPropertyName não encontrada na requisição ou valor vazio");
             return;
         }
@@ -74,9 +74,10 @@ class DefaultController extends Controller
         //vefifica se existe SO coletado se não, insere novo SO
         $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->createIfNotExist( $te_so );
-        $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $te_so, $te_node_address );
         $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request );
-        $local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() ));
+        $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $te_so, $te_node_address, $rede, $so );
+        //$local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() ));
+        $local = $rede->getIdLocal();
         //Debugging do Agente
         $debugging = (  TagValueHelper::getValueFromTags('DateToDebugging',$computador->getTeDebugging() )  == date("Ymd") ? $computador->getTeDebugging()  	:
@@ -142,10 +143,11 @@ class DefaultController extends Controller
         OldCacicHelper::autenticaAgente($request);
         $te_node_adress = TagValueHelper::getValueFromTags( 'MACAddress', OldCacicHelper::deCrypt( $request, $request->get('NetworkAdapterConfiguration')));
-        $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $request->get( 'te_so' ),$te_node_adress );
-        $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request );
         $so = $this->getDoctrine()->getRepository('CacicCommonBundle:So')->findOneBy( array('teSo'=>$request->get( 'te_so' )));
-        $local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() ));
+        $rede = $this->getDoctrine()->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $request );
+        $computador = $this->getDoctrine()->getRepository('CacicCommonBundle:Computador')->getComputadorPreCole( $request, $request->get( 'te_so' ),$te_node_adress, $rede, $so );
+        //$local = $this->getDoctrine()->getRepository('CacicCommonBundle:Local')->findOneBy(array( 'idLocal' => $rede->getIdLocal() ));
+        $local = $rede->getIdLocal();
         $data = new \DateTime('NOW');
         //Debugging do Agente
@@ -35,7 +35,7 @@ class TagValueHelper
         preg_match_all("(\[" . $pStrTagLabel . "\](.+)\[\/" . $pStrTagLabel . "\])i",$pStrSource, $arrResult);
         // Garantir que o resultado contenha somente UTF-8 valido
-        $resultado = TagValueHelper::UTF8Sanitize($arrResult[1][0]);
+        $resultado = TagValueHelper::UTF8Sanitize(@$arrResult[1][0]);
         return $resultado;
     }
	@@ -24,7 +24,7 @@		@@ -24,7 +24,7 @@
24	],	24	],
25	"require": {	25	"require": {
26	"php": ">=5.3.3",	26	"php": ">=5.3.3",
27	- "symfony/symfony": "2.3.*",	27	+ "symfony/symfony": "2.3.10",
28	"jquery/jquery": "1.10.*",	28	"jquery/jquery": "1.10.*",
29	"doctrine/orm": ">=2.2.3,<2.4-dev",	29	"doctrine/orm": ">=2.2.3,<2.4-dev",
30	"doctrine/doctrine-bundle": "1.2.*",	30	"doctrine/doctrine-bundle": "1.2.*",
	@@ -360,7 +360,7 @@ class ColetaController extends Controller		@@ -360,7 +360,7 @@ class ColetaController extends Controller
360		360
361	// Se não encontrar o valor, loga o erro e sai	361	// Se não encontrar o valor, loga o erro e sai
362	if (is_null($classProperty) \|\| $classProperty == "") {	362	if (is_null($classProperty) \|\| $classProperty == "") {
363	- $logger->error("ERRO NA COLETA! Propriedade $classPropertyName não encontrada na requisição ou valor vazio");	363	+ $logger->debug("ERRO NA COLETA! Propriedade $classPropertyName não encontrada na requisição ou valor vazio");
364	return;	364	return;
365	}	365	}
366		366
	@@ -35,7 +35,7 @@ class TagValueHelper		@@ -35,7 +35,7 @@ class TagValueHelper
35	preg_match_all("(\[" . $pStrTagLabel . "\](.+)\[\/" . $pStrTagLabel . "\])i",$pStrSource, $arrResult);	35	preg_match_all("(\[" . $pStrTagLabel . "\](.+)\[\/" . $pStrTagLabel . "\])i",$pStrSource, $arrResult);
36		36
37	// Garantir que o resultado contenha somente UTF-8 valido	37	// Garantir que o resultado contenha somente UTF-8 valido
38	- $resultado = TagValueHelper::UTF8Sanitize($arrResult[1][0]);	38	+ $resultado = TagValueHelper::UTF8Sanitize(@$arrResult[1][0]);
39		39
40	return $resultado;	40	return $resultado;
41	}	41	}