git.cweiske.de / phancap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: c2039a4)
Support IDNA - internationalized domain names
authorChristian Weiske <cweiske@cweiske.de>
Mon, 11 Jul 2016 05:52:54 +0000 (07:52 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Mon, 11 Jul 2016 05:52:54 +0000 (07:52 +0200)
src/phancap/Options.php patch | blob | history
www/index.php patch | blob | history
www/setup.php patch | blob | history

diff --git a/src/phancap/Options.php b/src/phancap/Options.php
index 47cf2d1b663456839d8b90ef80278d902370e6e4..2cfec7e23cd276021befc035dd08e8fa2f4e4a2e 100644 (file)
--- a/src/phancap/Options.php
+++ b/src/phancap/Options.php
@@ -116,6 +116,8 @@ class Options
     public $values = array();
 
     /**
     public $values = array();
 
     /**
+     * Configuration object
+     *
      * @var Config
      */
     protected $config;
      * @var Config
      */
     protected $config;
@@ -350,6 +352,33 @@ class Options
         if (!isset($parts['host'])) {
             throw new \InvalidArgumentException('URL host missing');
         }
         if (!isset($parts['host'])) {
             throw new \InvalidArgumentException('URL host missing');
         }
+
+        $rebuild = false;
+        if (strlen(preg_replace('#[[:ascii:]]#', '', $parts['host']))) {
+            //non-ascii characters in the host name
+            $host = idn_to_ascii($parts['host']);
+            if ($host === false) {
+                //incoming URL was not UTF-8 but some ISO dialect
+                $host = idn_to_ascii(utf8_encode($parts['host']));
+                if ($host === false) {
+                    throw new \InvalidArgumentException(
+                        'Strange characters in host name'
+                    );
+                }
+            }
+            $parts['host'] = $host;
+            $rebuild = true;
+        }
+        if (strlen(preg_replace('#[[:ascii:]]#', '', $parts['path']))) {
+            //non-ascii characters in the path
+            $parts['path'] = str_replace('%2F', '/', urlencode($parts['path']));
+            $rebuild = true;
+        }
+
+        if ($rebuild) {
+            $url = static::http_build_url($parts);
+        }
+
         return $url;
     }
 
         return $url;
     }
 
@@ -366,5 +395,36 @@ class Options
         $this->options['smaxage']['default'] = $this->config->screenshotMaxAge;
         $this->options['smaxage']['min']     = $this->config->screenshotMinAge;
     }
         $this->options['smaxage']['default'] = $this->config->screenshotMaxAge;
         $this->options['smaxage']['min']     = $this->config->screenshotMinAge;
     }
+
+    /**
+     * Re-build an URL parts array generated by parse_url()
+     *
+     * @param string $parts Array of URL parts
+     *
+     * @return string URL
+     */
+    protected static function http_build_url($parts)
+    {
+        $scheme   = isset($parts['scheme'])
+            ? $parts['scheme'] . '://' : '';
+        $host     = isset($parts['host'])
+            ? $parts['host'] : '';
+        $port     = isset($parts['port'])
+            ? ':' . $parts['port'] : '';
+        $user     = isset($parts['user'])
+            ? $parts['user'] : '';
+        $pass     = isset($parts['pass'])
+
+            ? ':' . $parts['pass']  : '';
+        $pass     = ($user || $pass)
+            ? "$pass@" : '';
+        $path     = isset($parts['path'])
+            ? $parts['path'] : '';
+        $query    = isset($parts['query'])
+            ? '?' . $parts['query'] : '';
+        $fragment = isset($parts['fragment'])
+            ? '#' . $parts['fragment'] : '';
+        return "$scheme$user$pass$host$port$path$query$fragment";
+    }
 }
 ?>
 }
 ?>
diff --git a/www/index.php b/www/index.php
index 2f4c0ded62e63021f58a5f139cb4b7a126e7ae15..734751746be2ed76f52df2234cdb625ff5f12afc 100644 (file)
--- a/www/index.php
+++ b/www/index.php
@@ -34,7 +34,7 @@ try {
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
  <head>
   <title>phancap</title>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
  <head>
   <title>phancap</title>
-
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   <link rel="stylesheet" href="css/bootstrap.min.css"/>
   <link rel="stylesheet" href="css/bootstrap-theme.min.css"/>
   <link rel="stylesheet" href="css/phancap.css"/>
   <link rel="stylesheet" href="css/bootstrap.min.css"/>
   <link rel="stylesheet" href="css/bootstrap-theme.min.css"/>
   <link rel="stylesheet" href="css/phancap.css"/>
diff --git a/www/setup.php b/www/setup.php
index 10f23fc9912d6d83d12b93210a5cf2acf06cd53f..7772bad12253307fc6887038334052d597d6893f 100644 (file)
--- a/www/setup.php
+++ b/www/setup.php
@@ -82,11 +82,18 @@ foreach ($adapter as $classpart) {
     }
 }
 
     }
 }
 
+if (!function_exists('idn_to_ascii')) {
+    $messages[][] = array(
+        'err', 'Function "idn_to_ascii" is not available'
+    );
+}
+
 $out = <<<HTM
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
  <head>
   <title>phancap setup check</title>
 $out = <<<HTM
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
  <head>
   <title>phancap setup check</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   <link rel="stylesheet" href="css/bootstrap.min.css"/>
   <link rel="stylesheet" href="css/bootstrap-theme.min.css"/>
   <link rel="stylesheet" href="css/phancap.css"/>
   <link rel="stylesheet" href="css/bootstrap.min.css"/>
   <link rel="stylesheet" href="css/bootstrap-theme.min.css"/>
   <link rel="stylesheet" href="css/phancap.css"/>
Software to create website screenshot via an API.