From f8291f593d0eefbf947c5759f648c7cc37edfecb Mon Sep 17 00:00:00 2001
From: Knah Tsaeb <Knah-Tsaeb@knah-tsaeb.org>
Date: Fri, 5 Oct 2018 11:51:51 +0200
Subject: [PATCH] Add support for fetch favicon

---
 bin/error_fav.png | Bin 0 -> 5609 bytes
 inc/admin.php     |  80 ++++++++++++++++++++++++++++++++++------------
 index.php         |   8 +++--
 readme.md         |   1 +
 4 files changed, 65 insertions(+), 24 deletions(-)
 create mode 100644 bin/error_fav.png

diff --git a/bin/error_fav.png b/bin/error_fav.png
new file mode 100644
index 0000000000000000000000000000000000000000..069194d325ad3be0e2ab82260b8086167662df04
GIT binary patch
literal 5609
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
O4QQ(ysMW*mBmNJ~<9Wsa

literal 0
HcmV?d00001

diff --git a/inc/admin.php b/inc/admin.php
index 34a261b..ecb060d 100644
--- a/inc/admin.php
+++ b/inc/admin.php
@@ -76,6 +76,32 @@ function parseFailLog($log)
     return $res;
 }
 
+function parseFaviconLog($log)
+{
+    if (empty($log) || ($log !== 'favicon')) {
+        die('Are you sure about this.');
+    }
+    $res  = array();
+    $list = glob('cache/logs/' . $log . '/*.json');
+    if (!empty($list)) {
+        foreach ($list as $value) {
+            $res[] = json_decode(file_get_contents($value), true);
+        }
+    }
+    return $res;
+}
+
+function getInfoLog($hash)
+{
+    $file = 'cache/logs/favicon/' . $hash . '.json';
+    if (file_exists($file)) {
+        $res = json_decode(file_get_contents($file), true);
+    } else {
+        $res = array();
+    }
+    return $res;
+}
+
 function manualGen($hash, $log)
 {
     $line = file_get_contents('cache/logs/' . $log . '/' . $hash . '.log');
@@ -135,9 +161,13 @@ function tryRootDomain($hash, $log)
     }
 }
 
-function keepThisThumb($hash, $log)
+function keepThisThumb($hash, $log, $favicon = false)
 {
-    unlink('cache/logs/' . $log . '/' . $hash . '.log');
+    if ($favicon === true) {
+        unlink('cache/logs/' . $log . '/' . $hash . '.json');
+    } else {
+        unlink('cache/logs/' . $log . '/' . $hash . '.log');
+    }
 }
 
 function tryWithCurl($hash, $log)
@@ -147,7 +177,7 @@ function tryWithCurl($hash, $log)
     $line = explode(' --- ', $line);
     //$hash = sha1($GLOBALS['config']['salt'].rawurldecode($line[1]));
     $line[1] = iconv(mb_detect_encoding($line[1], mb_detect_order(), true), "UTF-8", $line[1]);
-    $ch = curl_init();
+    $ch      = curl_init();
     curl_setopt($ch, CURLOPT_URL, $line[1]);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
@@ -170,14 +200,14 @@ function tryWithCurl($hash, $log)
     exec('bash thumb_server.sh ../cache/tmp/' . $hash . '.html ' . escapeshellarg($line[2]) . ' ' . escapeshellarg($line[3]) . ' ' . escapeshellarg($line[4]) . ' trc 1 noErrorLog', $result);
     chdir('../');
     unlink('cache/tmp/' . $hash . '.html');
-    if ((int) $result[0] == 1) {
+    if (file_exists(pathForFile($line[4], $hash) . '.png')) {
         $res['success']  = 1;
         $res['filePath'] = pathForFile($line[4], $hash) . '.png';
         $res['base64']   = 'data:image/png;base64,' . base64_encode(file_get_contents($res['filePath']));
         return $res;
     } else {
         $res['error'] = 1;
-        $res['msg']   = 'Error with curl'.n_print($result);
+        $res['msg']   = 'Error with curl' . n_print($result);
         return $res;
     }
 }
@@ -190,7 +220,7 @@ function tryWithOpenGraph($hash, $log)
     $line      = explode(' --- ', $line);
     $url       = $line[1];
     $startPath = '';
-    $url = iconv(mb_detect_encoding($line[1], mb_detect_order(), true), "UTF-8", $url);
+    $url       = iconv(mb_detect_encoding($line[1], mb_detect_order(), true), "UTF-8", $url);
 
     $info = Embed::create($url);
     $ext  = testIfImg($info->image);
@@ -210,6 +240,7 @@ function tryWithOpenGraph($hash, $log)
     } else {
         $res['error'] = 1;
         $res['msg']   = 'Error with OpenGraph data';
+        $res['base64'] = 'data:image/png;base64,' . base64_encode(file_get_contents('bin/error.png'));
         return $res;
     }
 
@@ -310,7 +341,13 @@ if (isset($ui['log']) && ($ui['log'] === 'suspect' || $ui['log'] === 'retry' ||
         if (isset($ui['cache']) && (int) $ui['cache'] === 1) {
             $response['success']  = 1;
             $response['filePath'] = pathForFile($ui['s'], $ui['hash']) . '.png';
-            $response['base64']   = 'data:image/png;base64,' . base64_encode(file_get_contents($response['filePath']));
+            if(file_exists($response['filePath'])){
+                $file = file_get_contents($response['filePath']);
+            } else {
+                $file = file_get_contents('bin/error.png');
+            }
+            
+            $response['base64']   = 'data:image/png;base64,' . base64_encode($file);
             if (!file_exists($response['filePath'])) {
                 $response['base64'] = 'data:image/png;base64,' . base64_encode(file_get_contents('bin/error.png'));
             }
@@ -339,29 +376,30 @@ if (isset($ui['log']) && ($ui['log'] === 'suspect' || $ui['log'] === 'retry' ||
         echo 'No result';
     }
 }
+
 echo '</div>';
 if (!empty($response) && !empty($response['success']) && $response['success'] === 1) {
     echo '<div id="result">';
-    echo '<img src="', $response['base64'], '" style="width:100%;"/>';
+    echo '<img src="', $response['base64'], '" style="max-width:100%;"/>';
     echo '<p><input type="text" value="http://', $_SERVER['SERVER_NAME'], '/', $response['filePath'], '" onclick="this.select()"/></p>';
-    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&mGen=1">Manuel launch</a> / ';
+    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&mGen=1#result">Manuel launch</a> / ';
     if (extension_loaded("curl")) {
-        echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&tryCurl=1">Try with curl</a> / ';
+        echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&tryCurl=1#result">Try with curl</a> / ';
     }
-    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&root=1">Try with root domain</a> / ';
-    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&openGraph=1">Try with OpenGraph</a> / ';
-    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&keep=1">Keep this thumbshot</a>';
+    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&root=1#result">Try with root domain</a> / ';
+    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&openGraph=1#result">Try with OpenGraph</a> / ';
+    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&keep=1#result">Keep this thumbshot</a>';
     echo '</div>';
-}
-if (!empty($response) && !empty($response['error']) && $response['error'] === 1) {
+} elseif (!empty($response) && !empty($response['error']) && $response['error'] === 1) {
     echo '<div id="result">';
     echo '<p>', $response['msg'], '</p>';
-    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&mGen=1">Manuel launch</a> / ';
+    echo '<p><img src="', $response['base64'], '" style="max-width:100%;"/></p>';
+    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&mGen=1#result">Manuel launch</a> / ';
     if (extension_loaded("curl")) {
-        echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&tryCurl=1">Try with curl</a> / ';
+        echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&tryCurl=1#result">Try with curl</a> / ';
     }
-    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&root=1">Try with root domain</a> / ';
-    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&openGraph=1">Try with OpenGraph</a> / ';
-    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&keep=1">Keep this thumbshot</a>';
+    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&root=1#result">Try with root domain</a> / ';
+    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&openGraph=1#result">Try with OpenGraph</a> / ';
+    echo '<a href="?p=admin&log=', $ui['log'], '&hash=', $ui['hash'], '&keep=1#result">Keep this thumbshot</a>';
     echo '</div>';
-}
\ No newline at end of file
+}
diff --git a/index.php b/index.php
index ccc4326..0e911fa 100644
--- a/index.php
+++ b/index.php
@@ -618,7 +618,7 @@ function makeFavicon($hash, $url, $filePath)
             if (!is_dir($hashPath)) {
                 mkdir($hashPath, 0700, true);
             }
-            exec('convert -background transparent ' . escapeshellarg($tmpFile[' . $key . ']) . ' -resize x32 ' . $file, $resResize);
+            exec('convert -background transparent ' . escapeshellarg($tmpFile . '[' . $key . ']') . ' -resize x32 ' . $file, $resResize);
             unlink('cache/tmp/' . $hash . '.' . $data['ext']);
         }
     } else {
@@ -629,9 +629,11 @@ function makeFavicon($hash, $url, $filePath)
         unlink('cache/tmp/' . $hash . '.' . $data['ext']);
     }
 
-    //n_print($data);
     if (file_exists($file)) {
         return $file;
+    } else {
+        file_put_contents($file, file_get_contents('bin/error_fav.png'));
+        return $file;
     }
 
 }
@@ -721,7 +723,7 @@ if (!empty($ui['request']) && $ui['p'] !== 'install' && $ui['p'] !== 'login' &&
                     'normal'   => 'bin/error.png',
                     'thumb'    => 'bin/error_thumb.png',
                     'complete' => 'bin/error.png',
-                    'favicon'  => 'bin/error.png',
+                    'favicon'  => 'bin/error_fav.png',
                 );
             }
         } else {
diff --git a/readme.md b/readme.md
index 98c3650..717f106 100644
--- a/readme.md
+++ b/readme.md
@@ -8,6 +8,7 @@ All info in the homepage http://forge.leslibres.org/projects/soshot
 **Thanks**
 
  * Icon by http://www.iconfinder.com/icondetails/7917/128/camera_file_image_icon
+ * Icon by https://www.iconfinder.com/icons/34267/browser_earth_global_globe_international_internet_map_planet_world_icon
  * Bash script idea by http://www.cambus.net/blog/page/3/
  * Httpstatus in bash by https://gist.github.com/rsvp/1171304
  * The engine phantomjs by http://phantomjs.org/