Merged revision(s) 16275 from trunk:

bug 2669: cancel migration task 121

git-svn-id: http://piwigo.org/svn/branches/2.4@16276 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 1 insertions, 72 deletions

diff --git a/install/db/121-database.php b/install/db/121-database.php
index 6a85c2754..5179a51b0 100644
--- a/install/db/121-database.php
+++ b/install/db/121-database.php
@@ -28,78 +28,7 @@ if (!defined('PHPWG_ROOT_PATH'))
 
 // see http://piwigo.org/doc/doku.php?id=user_documentation:htaccess_and_hotlink_in_2.4
 
-if (!isset($page['warnings'])) $page['warnings'] = array();
-
-$upgrade_description = 'add/append htaccess for hotlinks';
-$warning_message = 'Failed to modify <b>.htaccess</b> file, a manual intervention is needed, <a href="http://piwigo.org/doc/doku.php?id=user_documentation:htaccess_and_hotlink_in_2.4" target="_blank">click here for more information</a>';
-
-$htaccess = PHPWG_ROOT_PATH.'/.htaccess';
-$writable = true;
-if (file_exists($htaccess))
-{
-  if (!is_readable($htaccess) || !is_writable($htaccess))
-  {
-    $writable = false;
-  }
-}
-else
-{
-  $writable = is_writable(PHPWG_ROOT_PATH);
-}
-
-if (!$writable)
-{
-  array_push($page['warnings'], $warning_message);
-  $upgrade_description.= ': failed';
-}
-else
-{
-  $content = file_exists($htaccess) ? file_get_contents($htaccess) : null;
-  if (strpos($content, 'RewriteEngine off') !== false)
-  {
-    array_push($page['warnings'], $warning_message);
-    $upgrade_description.= ': failed';
-  }
-  else
-  {
-    $content.= '
-<IfModule mod_rewrite.c>';
-
-    if (strpos($content, 'RewriteEngine on') === false)
-    {
-      $content.='
-RewriteEngine on';
-    }
-    
-    if (!isset($conf['prefix_thumbnail']))
-    {
-      $conf['prefix_thumbnail'] = 'TN-';
-    }
-
-    if (!isset($conf['dir_thumbnail']))
-    {
-      $conf['dir_thumbnail'] = 'thumbnail';
-    }
-    
-    $content.= '
-## redirect <2.4 thumbnails hotlinks to i.php
-RewriteRule ^upload/(.*)/'.preg_quote($conf['dir_thumbnail']).'/'.preg_quote($conf['prefix_thumbnail']).'(.*)\.([a-z0-9]{3,4})$ i.php?/upload/$1/$2-th.$3 [L]
-RewriteRule ^galleries/(.*)/'.preg_quote($conf['dir_thumbnail']).'/'.preg_quote($conf['prefix_thumbnail']).'(.*)\.([a-z0-9]{3,4})$ i.php?/galleries/$1/$2-th.$3 [L]
-
-## redirect <2.4 high-def hotlinks to original file
-RewriteRule ^upload/(.*)/pwg_high/(.*)\.([a-z0-9]{3,4})$ upload/$1/$2.$3 [L]
-RewriteRule ^galleries/(.*)/pwg_high/(.*)\.([a-z0-9]{3,4})$ galleries/$1/$2.$3 [L]
-
-## redirect <2.4 low-def hotlinks to i.php
-RewriteCond %{HTTP_REFERER} !^http(s)?://(www\.)?'.preg_quote($_SERVER['SERVER_NAME']).'/.*$ [NC]
-RewriteRule ^upload/(.*)/(.*)\.([a-z0-9]{3,4})$ i.php?/upload/$1/$2-me.$3 [L]
-RewriteCond %{HTTP_REFERER} !^http(s)?://(www\.)?'.preg_quote($_SERVER['SERVER_NAME']).'/.*$ [NC]
-RewriteRule ^galleries(.*)/(.*)\.([a-z0-9]{3,4})$ i.php?/galleries/$1/$2-me.$3 [L]
-</IfModule>';
-    
-    file_put_contents($htaccess, $content);
-  }
-}
+$upgrade_description = 'add/append htaccess for hotlinks (cancelled, see plugin "Hotlink Compatibility")';
 
 
 echo