X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fpoche%2FTools.class.php;h=3a792d43acbaf85bdcb45c737953c17e5eab34eb;hb=d5ce28df67fcddfb957ce28424f3e5751f433695;hp=52d0f2d5c7cfb90f19eba95f1c995d5b184b3967;hpb=b64a882696ba6c403c36f9434230fc636741b7d1;p=github%2Fwallabag%2Fwallabag.git

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 52d0f2d5..3a792d43 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -216,13 +216,7 @@ class Tools
 
     public static function getDomain($url)
     {
-      $pieces = parse_url($url);
-      $domain = isset($pieces['host']) ? $pieces['host'] : '';
-      if (preg_match('/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.[a-z\.]{2,6})$/i', $domain, $regs)) {
-        return $regs['domain'];
-      }
-      
-      return FALSE;
+      return parse_url($url, PHP_URL_HOST);
     }
 
     public static function getReadingTime($text) {
@@ -238,7 +232,7 @@ class Tools
     public static function createMyConfig()
     {
         $myconfig_file = './inc/poche/myconfig.inc.php';
-        
+
         if (!is_writable('./inc/poche/')) {
             self::logm('you don\'t have write access to create ./inc/poche/myconfig.inc.php');
             die('You don\'t have write access to create ./inc/poche/myconfig.inc.php.');
@@ -248,7 +242,7 @@ class Tools
         {
             $fp = fopen($myconfig_file, 'w');
             fwrite($fp, '<?php'."\r\n");
-            fwrite($fp, "define ('POCHE_VERSION', '1.0-beta3');" . "\r\n");
+            fwrite($fp, "define ('POCHE_VERSION', '1.0-beta4');" . "\r\n");
             fwrite($fp, "define ('SALT', '" . md5(time() . $_SERVER['SCRIPT_FILENAME'] . rand()) . "');" . "\r\n");
             fwrite($fp, "define ('LANG', 'en_EN.utf8');" . "\r\n");
             fclose($fp);