From c3075d81815ee059658e5cd29ef849ab194ef0fa Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 1 Jan 2010 21:58:07 -0800
Subject: Add a code block showing how to add a mod_rewrite block to the old
 Gallery2 install to redirect urls to Gallery 3.

---
 modules/g2_import/views/admin_g2_import.html.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'modules/g2_import/views')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 9a5e3f05..5bac9e9e 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -26,6 +26,7 @@
         </li>
       </ul>
     </div>
+
     <?= $form ?>
 
     <? if (g2_import::is_initialized()): ?>
@@ -91,6 +92,21 @@
         </a>
       </p>
     </div>
+
+    <div>
+      <h2> <?= t("Migrating from Gallery 2") ?> </h2>
+      <p>
+        <?= t("Once your migration is complete, put this block at the top of your gallery2/.htaccess file and all Gallery 2 urls will be redirected to Gallery 3") ?>
+      </p>
+
+      <code>
+        &lt;IfModule mod_rewrite.c&gt;<br/>
+          RewriteEngine On<br/>
+          RewriteBase <?= g2_import::$g2_base_url ?><br/>
+          RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?>   [QSA,L]<br/>
+        &lt;/IfModule&gt;<br/>
+      </code>
+    </div>
     <? endif ?>
   </div>
 </div>
-- 
cgit v1.2.3


From 1544bea535cd9ef46ffb0c9414fcdb3302d56670 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 2 Jan 2010 12:46:28 -0800
Subject: Add a tip about deactivating some modules to make importing faster.
 Combine two tips into one.

---
 modules/g2_import/views/admin_g2_import.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/g2_import/views')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 5bac9e9e..ddd7c26f 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -16,10 +16,10 @@
           <?= t("Permissions are <b>not imported</b>.  You will have to set them again manually (for now).") ?>
         </li>
         <li>
-          <?= t("The only supported image formats are JPG, PNG and GIF.  Other formats will be skipped.") ?>
+          <?= t("The only supported file formats are JPG, PNG and GIF, FLV and MP4.  Other formats will be skipped.") ?>
         </li>
         <li>
-          <?= t("The only supported movie formats are FLV and MP4.  Other formats will be skipped.") ?>
+          <?= t("Deactivating the <b>notification</b>, <b>search</b> and <b>exif</b> modules during your import will make it go faster.") ?>
         </li>
         <li>
           <?= t("The eAccelerator PHP performance extension is known to cause issues.  If you're using eAccelerator and having problems, please disable it while you do your import.  One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?>
-- 
cgit v1.2.3


From b3023493f4be1c84412cbcce9273da279655ee6e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 2 Jan 2010 14:00:00 -0800
Subject: Clean the G2 base url so that we can't leak XSS vulnerabilities that
 way (highly unlikely, but now it's impossible).

---
 modules/g2_import/views/admin_g2_import.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/g2_import/views')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index ddd7c26f..0875e7f7 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -102,7 +102,7 @@
       <code>
         &lt;IfModule mod_rewrite.c&gt;<br/>
           RewriteEngine On<br/>
-          RewriteBase <?= g2_import::$g2_base_url ?><br/>
+          RewriteBase <?= html::clean(g2_import::$g2_base_url) ?><br/>
           RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?>   [QSA,L]<br/>
         &lt;/IfModule&gt;<br/>
       </code>
-- 
cgit v1.2.3