Merge pull request #199 from NumEricR/nb-results

[github/wallabag/wallabag.git] / inc / poche / Tools.class.php

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 1baf745d909895506d87a8946ea15ce29f1a252e..3a792d43acbaf85bdcb45c737953c17e5eab34eb 100644 (file)
--- 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) {
@@ -239,24 +233,19 @@ class Tools
     {
         $myconfig_file = './inc/poche/myconfig.inc.php';
 
-        if (version_compare(POCHE_VERSION, '1.0-beta3') == 1) {
-            # $myconfig_file is only created with poche > 1.0-beta3
-            # in 1.0-beta3, the update script creates $myconfig_file
-
-            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.');
-            }
+        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.');
+        }
 
-            if (!file_exists($myconfig_file))
-            {
-                $fp = fopen($myconfig_file, 'w');
-                fwrite($fp, '<?php'."\r\n");
-                fwrite($fp, "define ('POCHE_VERSION', '1.0-beta3');" . "\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);
-            }
+        if (!file_exists($myconfig_file))
+        {
+            $fp = fopen($myconfig_file, 'w');
+            fwrite($fp, '<?php'."\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);
         }
     }
 }
\ No newline at end of file