added logging

src/helpers.php

@@ -14,3 +14,22 @@ function renderTemplate($templatename,$variables=[],$basepath=ROOT.'/src')
 
     return $rendered;
 }
+
+function addToLog($data)
+{
+    $fp = fopen(ROOT.DS.'logs'.DS.'app.log','a');
+    fwrite($fp,date("d.m.y H:i")."\t".$data."\n");
+    fclose($fp);
+}
+
+function getUserIP()
+{
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        $ip = $_SERVER['HTTP_CLIENT_IP'];
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    } else {
+        $ip = $_SERVER['REMOTE_ADDR'];
+    }
+    return $ip;
+}

web/index.php

@@ -1,4 +1,5 @@
 <?php
+
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 
@@ -17,18 +18,18 @@ if(php_sapi_name()=='cli-server' && file_exists(ROOT.DS.'web'.DS.implode('/',$ur
     return false;
 
 
-switch($url[0])
+switch ($url[0]) {
-{
     case 'api':
         $target = substr($_SERVER['REQUEST_URI'], 5);
         if (!$target || !filter_var($target, FILTER_VALIDATE_URL))
             $target = $_REQUEST['url'];
-        if(!filter_var($target, FILTER_VALIDATE_URL))
+        if (!filter_var($target, FILTER_VALIDATE_URL)) {
-        {
             header('HTTP/1.0 400 Bad Request');
             echo 'Invalid URL';
             exit;
         }
+        $ip = getUserIP();
+
         $viewport = $_REQUEST['viewport'];
         $js = $_REQUEST['js'] == 'false' ? false : true;
 
@@ -43,25 +44,29 @@ switch($url[0])
         if (!$js)
             $capabilities->setCapability('javascriptEnabled', false);
 
+
+        try {
             $driver = RemoteWebDriver::create($serverUrl, $capabilities);
-
             $driver->get($target);
-
             //hide scroll bars
             $driver->executeScript('document.body.style.overflow = "hidden";');
 
             //set screenshot size to 1920x1080
             //$driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension(1024, 768));
             //if $viewport is set, set window size
-        if($viewport)
+            if ($viewport) {
-        {
                 $viewport = explode('x', $viewport);
                 $driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension($viewport[0], $viewport[1]));
-        }
+            } else {
-        else
-        {
                 $driver->manage()->window()->setSize(new \Facebook\WebDriver\WebDriverDimension(1024, 768));
             }
+            addToLog("$ip\tRequested $target with viewport " . implode('x', $viewport) . " and js " . ($js ? 'enabled' : 'disabled'));
+        } catch (Exception $e) {
+            header('HTTP/1.0 500 Internal Server Error');
+            addToLog("$ip\tRequested $target but resulted in error:\t" . $e->getMessage());
+            echo 'Error: ' . $e->getMessage();
+            exit;
+        }
 
         // take screenshot and save to file
         //header for png