From 163391ee391627f9c2b4eac359104809e2706a9b Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 6 Feb 2010 17:43:33 -0800
Subject: Partial fix for ticket 585: Require current password when changing an
 account's email address.

Still leaving the user/group admin page wide open though.
---
 modules/gallery/views/user_profile.html.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'modules/gallery')

diff --git a/modules/gallery/views/user_profile.html.php b/modules/gallery/views/user_profile.html.php
index 78e1c579..1c3e4ea2 100644
--- a/modules/gallery/views/user_profile.html.php
+++ b/modules/gallery/views/user_profile.html.php
@@ -63,6 +63,9 @@
     <a class="g-button ui-icon-right ui-state-default ui-corner-all g-dialog-link" href="<?= url::site("users/form_change_password/{$user->id}") ?>">
       <?= t("Change password") ?>
     </a>
+    <a class="g-button ui-icon-right ui-state-default ui-corner-all g-dialog-link" href="<?= url::site("users/form_change_email/{$user->id}") ?>">
+      <?= t("Change email") ?>
+    </a>
     <? endif ?>
 
     <a id="g-profile-return" class="g-button ui-icon-right ui-state-default ui-corner-all" href="#">
-- 
cgit v1.2.3


From 2c3c126aafaa4d7ed86075927887636042117a1c Mon Sep 17 00:00:00 2001
From: Andy Staudacher <andy.st@gmail.com>
Date: Sat, 6 Feb 2010 20:07:58 -0800
Subject: Fix ticket 930: Use the first frame as video thumbnail if the video
 is shorter than 3 seconds. And fall back to the default thumbnail if that
 operation fails.

Thanks to lsowen for providing a patch!
---
 modules/gallery/helpers/movie.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'modules/gallery')

diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 7033b7da..3c494e96 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -84,6 +84,20 @@ class movie_Core {
       " -an -ss 00:00:03 -an -r 1 -vframes 1" .
       " -y -f mjpeg " . escapeshellarg($output_file) . " 2>&1";
     exec($cmd);
+
+    clearstatcache();  // use $filename parameter when PHP_version is 5.3+
+    if (filesize($output_file) == 0) {
+      // Maybe the movie is shorter, fall back to the first frame.
+      $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($input_file) .
+        " -an -an -r 1 -vframes 1" .
+        " -y -f mjpeg " . escapeshellarg($output_file) . " 2>&1";
+      exec($cmd);
+
+      clearstatcache();
+      if (filesize($output_file) == 0) {
+        throw new Exception("@todo FFMPEG_FAILED");
+      }
+    }
   }
 
   static function find_ffmpeg() {
-- 
cgit v1.2.3


From adac97b5372322be5154996974a6496198105d16 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 7 Feb 2010 08:28:32 -0800
Subject: Add prefix support for the target of RENAME TABLE.

---
 modules/gallery/libraries/MY_Database.php | 9 ++++++++-
 modules/gallery/tests/Database_Test.php   | 7 +++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'modules/gallery')

diff --git a/modules/gallery/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index e2ef68cd..cb70104a 100644
--- a/modules/gallery/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
@@ -54,11 +54,18 @@ abstract class Database extends Database_Core {
        */
       return $sql;
     } else if (strpos($sql, "CREATE TABLE") === 0) {
-      // Creating a new table add it to the table cache.
+      // Creating a new table; add it to the table cache.
       $open_brace = strpos($sql, "{") + 1;
       $close_brace = strpos($sql, "}", $open_brace);
       $name = substr($sql, $open_brace, $close_brace - $open_brace);
       $this->_table_names["{{$name}}"] = "{$prefix}$name";
+    } else if (strpos($sql, "RENAME TABLE") === 0) {
+      // Renaming a table; add it to the table cache.
+      // You must use the form "TO {new_table_name}" exactly for this to work.
+      $open_brace = strpos($sql, "TO {") + 4;
+      $close_brace = strpos($sql, "}", $open_brace);
+      $name = substr($sql, $open_brace, $close_brace - $open_brace);
+      $this->_table_names["{{$name}}"] = "{$prefix}$name";
     }
 
     if (!isset($this->_table_names)) {
diff --git a/modules/gallery/tests/Database_Test.php b/modules/gallery/tests/Database_Test.php
index 861f7bba..730785e2 100644
--- a/modules/gallery/tests/Database_Test.php
+++ b/modules/gallery/tests/Database_Test.php
@@ -130,6 +130,13 @@ class Database_Test extends Gallery_Unit_Test_Case {
     $this->assert_same($expected, $sql);
   }
 
+  function prefix_replacement_for_rename_table_test() {
+    $db = Database::instance("mock");
+    $this->assert_same(
+      "RENAME TABLE g_test TO g_new_test",
+      $db->add_table_prefixes("RENAME TABLE {test} TO {new_test}"));
+  }
+
   function prefix_no_replacement_test() {
     $sql = db::build("mock")
       ->from("test_tables")
-- 
cgit v1.2.3