Revert "Inject js" (#64)

Author: MASNathan

README.md

@@ -60,52 +60,19 @@ You can also set the User Agent
 $screenCapture->setUserAgentString('Some User Agent String');
 ```
 
-And the resulted image type
+And the resulted image format
 ``` php
-// allowed types are 'jpg' and 'png', default is 'jpg'.
-$screenCapture->setImageType(Screen\Image\Types\Png::FORMAT);
-// or
-$screenCapture->setImageType('png');
+// allowed formats are 'jpg' and 'png', default is 'jpg'.
+$screenCapture->setFormat('png');
 ```
 * If the format is ```jpg``` and the background color is not set, the default value will be ```#FFFFFF```, if ```png``` the default background color will be transparent.
 
 And most importantly, save the result
 ``` php
-$fileLocation = '/some/dir/test.' . $screen->getImageType()->getFormat();
-$screenCapture->save($fileLocation);
-
-// you don't need to set the file extension
-$fileLocation = '/some/dir/test';
-$screenCapture->save($fileLocation); // Will automatically determine the extension type
-
-echo $screenCapture->getImageLocation(); // --> /some/dir/test.png
+$fileLocation = '/some/dir/test.' . $screen->getFormat();
+$screen->save($fileLocation);
 ```
 
-##Injection your own JS into the web page
-
-You can also run your own JS scripts or snippets before the screenshot.
-
-For that we have the method ```includeJs```, here are some usage examples:
-
-``` php
-// Including a remote file
-$jQueryUrl = 'https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js';
-$screenCapture->includeJs(new \Screen\Injection\Url($jQUeryUrl));
-
-// Including a local file
-$localFilePath = 'path/to/my/script.js';
-$screenCapture->includeJs(new \Screen\Injection\LocalPath($localFilePath));
-
-// Using the scripts included on the library
-$screen->includeJs(new \Screen\Injection\Scripts\FacebookHideCookiesPolicy());
-$screen->includeJs(new \Screen\Injection\Scripts\FacebookHideSignUp());
-
-// Using a js snippet
-$screen->includeJs("console.log('This is supa cool!');");
-```
-
-Just use this method before calling ```save(...)```
-
 ##Other configurations
 Additionally to the basic usage, you can set so extra configurations.
 

demo/shot.php

@@ -35,12 +35,12 @@
 }
 
 if (isset($_GET['format'])) { // Format
-    $screen->setImageType($_GET['format']);
+    $screen->setFormat($_GET['format']);
 }
 
-$fileLocation = 'test';
+$fileLocation = 'test.' . $screen->getFormat();
 $screen->save($fileLocation);
 
-header('Content-Type:' . $screen->getImageType()->getMimeType());
-header('Content-Length: ' . filesize($screen->getImageLocation()));
-readfile($screen->getImageLocation());
+header('Content-Type:' . $screen->getMimeType());
+header('Content-Length: ' . filesize($fileLocation));
+readfile($fileLocation);

scripts/facebook-hide-cookies-policy.js

@@ -2,11 +2,6 @@
 
 namespace Screen;
 
-use Screen\Exceptions\TemplateNotFoundException;
-use Screen\Image\Types;
-use Screen\Image\Types\Type;
-use Screen\Injection\LocalPath;
-use Screen\Injection\Url;
 use Screen\Location\Jobs;
 use Screen\Location\Output;
 
@@ -62,11 +57,11 @@ class Capture
     protected $backgroundColor = '';
 
     /**
-     * Image Type, default is jpeg
+     * Image format
      *
-     * @var Type
+     * @var string
      */
-    protected $imageType;
+    protected $format = 'jpg';
 
     /**
      * User Agent String used on the page request
@@ -103,27 +98,6 @@ class Capture
      */
     public $output;
 
-    /**
-     * Location where the file was written to
-     *
-     * @var string
-     */
-    protected $imageLocation;
-
-    /**
-     * List of included JS scripts
-     *
-     * @var array
-     */
-    protected $includedJsScripts = array();
-
-    /**
-     * List of included JS snippets
-     *
-     * @var array
-     */
-    protected $includedJsSnippets = array();
-
     /**
      * Capture constructor.
      */
@@ -138,31 +112,18 @@ public function __construct($url = null)
 
         $this->jobs = new Jobs();
         $this->output = new Output();
-
-        $this->setImageType(Types\Jpg::FORMAT);
     }
 
-    /**
-     * Saves the screenshot to the requested location
-     *
-     * @param string $imageLocation      Image Location
-     * @param bool   $deleteFileIfExists True to delete the file if it exists
-     *
-     * @return bool
-     */
     public function save($imageLocation, $deleteFileIfExists = true)
     {
-        $this->imageLocation = $this->output->getLocation() . $imageLocation;
-
-        if (!pathinfo($this->imageLocation, PATHINFO_EXTENSION)) {
-            $this->imageLocation .= '.' . $this->getImageType()->getFormat();
-        }
+        $outputPath = $this->output->getLocation() . $imageLocation;
 
         $data = array(
             'url'           => $this->url,
             'width'         => $this->width,
             'height'        => $this->height,
-            'imageLocation' => LocalPath::sanitize($this->imageLocation),
+            // If used on windows the \ char needs to be handled to be used on a js string
+            'imageLocation' => str_replace("\\", "\\\\", $outputPath),
         );
 
         if ($this->clipWidth && $this->clipHeight) {
@@ -174,7 +135,7 @@ public function save($imageLocation, $deleteFileIfExists = true)
 
         if ($this->backgroundColor) {
             $data['backgroundColor'] = $this->backgroundColor;
-        } elseif ($this->getImageType()->getFormat() == Types\Jpg::FORMAT) {
+        } elseif ($this->getFormat() == 'jpg') {
             // If there is no background color set, and it's a jpeg
             // we need to set a bg color, otherwise the background will be black
             $data['backgroundColor'] = '#FFFFFF';
@@ -184,16 +145,8 @@ public function save($imageLocation, $deleteFileIfExists = true)
             $data['userAgent'] = $this->userAgentString;
         }
 
-        if ($this->includedJsScripts) {
-            $data['includedJsScripts'] = $this->includedJsScripts;
-        }
-
-        if ($this->includedJsSnippets) {
-            $data['includedJsSnippets'] = $this->includedJsSnippets;
-        }
-
-        if ($deleteFileIfExists && file_exists($this->imageLocation) && is_writable($this->imageLocation)) {
-            unlink($this->imageLocation);
+        if ($deleteFileIfExists && file_exists($outputPath) && is_writable($outputPath)) {
+            unlink($outputPath);
         }
 
         $jobName = md5(json_encode($data));
@@ -208,14 +161,14 @@ public function save($imageLocation, $deleteFileIfExists = true)
         $command = sprintf("%sphantomjs %s", $this->binPath, $jobPath);
         $result = exec(escapeshellcmd($command));
 
-        return file_exists($this->imageLocation);
+        return file_exists($outputPath);
     }
 
     private function getTemplateResult($templateName, array $args)
     {
         $templatePath = $this->templatePath . DIRECTORY_SEPARATOR . $templateName . '.php';
         if (!file_exists($templatePath)) {
-            throw new TemplateNotFoundException($templateName);
+            throw new \Exception("The template {$templateName} does not exist!");
         }
         ob_start();
         extract($args);
@@ -247,7 +200,19 @@ public function setBinPath($binPath)
      */
     public function setUrl($url)
     {
-        $this->url = new Url($url);
+        // Prepend http:// if the url doesn't contain it
+        if (!stristr($url, 'http://') && !stristr($url, 'https://')) {
+            $url = 'http://' . $url;
+        }
+
+        if (!$url || !filter_var($url, FILTER_VALIDATE_URL)) {
+            throw new \Exception("Invalid URL");
+        }
+
+        $url = str_replace(array(';', '"', '<?'), '', strip_tags($url));
+        $url = str_replace(array('\077', '\''), array(' ', '/'), $url);
+
+        $this->url = $url;
     }
 
     /**
@@ -321,37 +286,49 @@ public function setBackgroundColor($backgroundColor)
     }
 
     /**
-     * Sets the image type
+     * Sets the image format
      *
-     * @param string $type 'jpg', 'png', etc...
+     * @param string $format  'jpg' | 'png'
      *
      * @return Capture
      */
-    public function setImageType($type)
+    public function setFormat($format)
     {
-        $this->imageType = Types::getClass($type);
+        $format = strtolower($format);
+        if (!in_array($format, ['jpg', 'png'])) {
+            throw new Exception(
+                "Invalid image format '{$format}'. " .
+                "Allowed formats are 'jpg' and 'png'"
+            );
+        }
+
+        $this->format = $format;
 
         return $this;
     }
 
     /**
-     * Returns the image type instance
+     * Gets the image format
      *
-     * @return Type
+     * @return string
      */
-    public function getImageType()
+    public function getFormat()
     {
-        return $this->imageType;
+        return $this->format;
     }
 
     /**
-     * Returns the location where the screenshot file was written
+     * Gets the MIME type of resulted image
      *
      * @return string
      */
-    public function getImageLocation()
+    public function getMimeType()
     {
-        return $this->imageLocation;
+        if ($this->format === 'png') {
+            return 'image/png';
+        }
+
+        return 'image/jpeg';
     }
 
     /**
@@ -367,22 +344,4 @@ public function setUserAgentString($userAgentString)
 
         return $this;
     }
-
-    /**
-     * Adds a JS script or snippet to the screen shot script
-     *
-     * @param string|URL $script Script to include
-     *
-     * @return Capture
-     */
-    public function includeJs($script)
-    {
-        if (is_a($script, Url::class)) {
-            $this->includedJsScripts[] = $script;
-        } else {
-            $this->includedJsSnippets[] = $script;
-        }
-
-        return $this;
-    }
 }