ready to upload on pkglist

frankspress · Mar 28, 2020 · 67494aa · 67494aa
1 parent a7479d3
commit 67494aa
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 298 deletions.
diff --git a/src/Controller/ApiParser.php b/src/Controller/ApiParser.php
@@ -40,8 +40,6 @@ public function __construct( EmailHandler $emailHandler, UploadHandler $uploadHa
 
     public function sgParser() {
 
-        $milliseconds = round(microtime(true) * 1000);
-
         $newEmail = $this->emailHandler->parseEmail();
         $newAttachment = [];
 
@@ -54,9 +52,7 @@ public function sgParser() {
             $this->eventDispatcher->dispatch( $event,SgParserEvents::PARSER_API );
         }
 
-        $milliseconds2 = round(microtime(true) * 1000);
-     //   file_put_contents(__DIR__."/timeee.txt",  'time init:'. $milliseconds.' time done:'.$milliseconds2  );
-        return new JsonResponse(['success'], 200);
+        return new JsonResponse([], 200);
     }
 
 

diff --git a/src/Controller/request.log b/src/Controller/request.log
diff --git a/src/Controller/request2.log b/src/Controller/request2.log
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -24,17 +24,21 @@ public function getConfigTreeBuilder()
 
         $rootNode
             ->children()
+
                 ->arrayNode('email')
+                ->addDefaultsIfNotSet()
                     ->children()
                         ->integerNode('max_body_length')->defaultValue(3000)->info('Int, max body length allowed')->end()
-                        ->booleanNode('raw_response')->defaultValue(true)->info('Returns only the actual email or direct response')->end()
-                        ->booleanNode('raw_subject')->defaultValue(true)->info('Strips RE: from email subject')->end()
+                        ->booleanNode('raw_response')->defaultFalse()->info('Returns only the actual email or direct response')->end()
+                        ->booleanNode('raw_subject')->defaultFalse()->info('Strips RE: from email subject')->end()
                     ->end()
                 ->end()
+
                 ->arrayNode('attachment')
+                ->addDefaultsIfNotSet()
                     ->children()
-                        ->booleanNode('handle_attachment')->defaultTrue()->info('Bool, Attachment download is disabled by default')->end()
-                        ->scalarNode('file_upload_size')->defaultValue('3M')->info('string, Upload size, 1M, 5M etc., see Symfony File Validator for more info')->end()
+                        ->booleanNode('handle_attachment')->defaultFalse()->info('Bool, Attachment download is disabled by default')->end()
+                        ->scalarNode('file_upload_size')->cannotBeEmpty()->defaultValue('3M')->info('string, Upload size, 1M, 5M etc., see Symfony File Validator for more info')->end()
                         ->booleanNode('php_injection')->defaultFalse()->info('Bool, Checks for malicious php code')->end()
                         ->arrayNode('mime_types')
                             ->scalarPrototype()->end()

diff --git a/src/DependencyInjection/FrankspressSgParserExtension.php b/src/DependencyInjection/FrankspressSgParserExtension.php
@@ -26,6 +26,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('services.xml');
 
         $configuration = $this->getConfiguration($configs, $container);
+
         $config = $this->processConfiguration($configuration, $configs);
 
         $definition = $container->getDefinition('sg_parser_bundle.api_parser');
@@ -41,10 +42,6 @@ public function load(array $configs, ContainerBuilder $container)
         $definition->setArgument(3, $config['email']['raw_response']);
         $definition->setArgument(4, $config['email']['raw_subject']);
 
-//         It's a reference to a service @
-////            $definition->setArgument(0, new Reference($config['word_provider']));
-//            $container->setAlias('frank_bundle.frank_word_provider', $config['word_provider']);
-
 
     }
 }
diff --git a/src/Handler/UploadHandler.php b/src/Handler/UploadHandler.php
@@ -72,29 +72,6 @@ private function fileValidator(File $file = null )
 
     public function addAttachment() {
 
-
-//        $attachmentContainer = [];
-//        $attachmentList = json_decode( $this->request->getCurrentRequest()->get('attachment-info') );
-//
-//        $file = $this->request->getCurrentRequest()->files->get('img');
-//
-//        /** @var File $file */
-//
-//        $attachment = new NewAttachment();
-//        $attachment->setFileName( pathinfo($file->getFilename(), PATHINFO_FILENAME) . '.' . $file->guessExtension() );
-//        $attachment->setType( $file->guessExtension() );
-//        $attachment->setFilePath( $file->getPathname() );
-//        $attachment->setSize( $file->getSize() );
-//
-//
-//        if ( ! $this->fileValidator($file) || ! $this->phpInjectionCheck($file) ) {
-//            $attachment->setError( $this->violationMessage );
-//        }
-//
-//        $attachmentContainer [] = $attachment;
-//
-//        return $attachmentContainer;
-
         $attachmentContainer = [];
         $attachmentList =   json_decode( $this->request->getCurrentRequest()->get('attachment-info'));
 

diff --git a/src/Resources/config/routes.xml b/src/Resources/config/routes.xml
@@ -6,4 +6,5 @@
 
     <route id="sg_api_parser" controller="sg_parser_bundle.api_parser:sgparser" path="/"  >
     </route>
+
 </routes>
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -31,7 +31,5 @@
             <argument type="service" id="event_dispatcher" on-invalid="null"/>
         </service>
 
-
-
     </services>
 </container>