Merge branch 'master' of git://github.com/gallery/gallery3

11 files changed, 194 insertions, 49 deletions

diff --git a/.build_number b/.build_number
index 0c4adaa9..5e176488 100644
--- a/.build_number
+++ b/.build_number
@@ -3,4 +3,4 @@
 ; process.  You don't need to edit it.  In fact..
 ;
 ;     DO NOT EDIT THIS FILE BY HAND!
-build_number=260
+build_number=264
diff --git a/installer/install.sql b/installer/install.sql
index 0156b9db..44ed1bf4 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -244,7 +244,7 @@ CREATE TABLE {modules} (
   KEY `weight` (`weight`)
 ) AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO {modules} VALUES (1,1,'gallery',50,1);
+INSERT INTO {modules} VALUES (1,1,'gallery',52,1);
 INSERT INTO {modules} VALUES (2,1,'user',4,2);
 INSERT INTO {modules} VALUES (3,1,'comment',7,3);
 INSERT INTO {modules} VALUES (4,1,'organize',4,4);
@@ -382,7 +382,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=44 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=45 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO {vars} VALUES (NULL,'gallery','active_site_theme','wind');
 INSERT INTO {vars} VALUES (NULL,'gallery','active_admin_theme','admin_wind');
@@ -411,10 +411,10 @@ INSERT INTO {vars} VALUES (NULL,'gallery','email_from','unknown@unknown.com');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_reply_to','unknown@unknown.com');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_line_length','70');
 INSERT INTO {vars} VALUES (NULL,'gallery','email_header_separator','s:1:\"\n\";');
-INSERT INTO {vars} VALUES (NULL,'gallery','lock_timeout','1');
 INSERT INTO {vars} VALUES (NULL,'gallery','show_user_profiles_to','registered_users');
 INSERT INTO {vars} VALUES (NULL,'gallery','extra_binary_paths','/usr/local/bin:/opt/local/bin:/opt/bin');
 INSERT INTO {vars} VALUES (NULL,'gallery','timezone',NULL);
+INSERT INTO {vars} VALUES (NULL,'gallery','lock_timeout','1');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_site_sidebar','a:4:{i:10;a:2:{i:0;s:7:\"gallery\";i:1;s:8:\"language\";}i:11;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:12;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:13;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');
 INSERT INTO {vars} VALUES (NULL,'gallery','identity_provider','user');
 INSERT INTO {vars} VALUES (NULL,'user','minimum_password_length','5');
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 99bc3726..1f190800 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -314,7 +314,7 @@ class gallery_installer {
     module::set_var("gallery", "timezone", null);
     module::set_var("gallery", "lock_timeout", 1);
 
-    module::set_version("gallery", 51);
+    module::set_version("gallery", 52);
   }
 
   static function upgrade($version) {
@@ -688,7 +688,7 @@ class gallery_installer {
 
     if ($version == 47 || $version == 48) {
       // Add configuration variable to set timezone.  Defaults to the currently
-      // used timezone (from PHP configuration).  Note that in v48 we werew
+      // used timezone (from PHP configuration).  Note that in v48 we were
       // setting this value incorrectly, so we're going to stomp this value for v49.
       module::set_var("gallery", "timezone", null);
       module::set_version("gallery", $version = 49);
@@ -716,12 +716,25 @@ class gallery_installer {
     }
 
     if ($version == 50) {
-      // In v50, a lock_timeout variable was added so that administrators could edit the time out
+      // In v51, we added a lock_timeout variable so that administrators could edit the time out
       // from 1 second to a higher variable if their system runs concurrent parallel uploads for 
       // instance.
       module::set_var("gallery", "lock_timeout", 1);
       module::set_version("gallery", $version = 51);
     }
+
+    if ($version == 51) {
+      // In v52, we added functions to the legal_file helper that map photo and movie file 
+      // extensions to their mime types (and allow extension of the list by other modules).  During
+      // this process, we correctly mapped m4v files to video/x-m4v, correcting a previous error
+      // where they were mapped to video/mp4.  This corrects the existing items.
+      db::build()
+        ->update("items")
+        ->set("mime_type", "video/x-m4v")
+        ->where("name", "REGEXP", "\.m4v$") // case insensitive since name column is utf8_general_ci
+        ->execute();
+      module::set_version("gallery", $version = 52);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php
index bd48d7b7..b3622764 100644
--- a/modules/gallery/helpers/legal_file.php
+++ b/modules/gallery/helpers/legal_file.php
@@ -19,11 +19,53 @@
  */
 class legal_file_Core {
   /**
+   * Create a default list of allowed photo MIME types paired with their extensions and then let 
+   * modules modify it.  This is an ordered map, mapping extensions to their MIME types.
+   * Extensions cannot be duplicated, but MIMEs can (e.g. jpeg and jpg both map to image/jpeg).
+   *
+   * @param string $extension (opt.) - return MIME of extension; if not given, return complete array
+   */
+  static function get_photo_types_by_extension($extension=NULL) {
+    $types_by_extension_wrapper = new stdClass();
+    $types_by_extension_wrapper->types_by_extension = array(
+      "jpg" => "image/jpeg", "jpeg" => "image/jpeg", "gif" => "image/gif", "png" => "image/png");
+    module::event("photo_types_by_extension", $types_by_extension_wrapper);
+    if ($extension) {
+      // return matching MIME type
+      return $types_by_extension_wrapper->types_by_extension[$extension];
+    } else {
+      // return complete array
+      return $types_by_extension_wrapper->types_by_extension;
+    }
+  }
+
+  /**
+   * Create a default list of allowed movie MIME types paired with their extensions and then let
+   * modules modify it.  This is an ordered map, mapping extensions to their MIME types.
+   * Extensions cannot be duplicated, but MIMEs can (e.g. jpeg and jpg both map to image/jpeg).
+   *
+   * @param string $extension (opt.) - return MIME of extension; if not given, return complete array
+   */
+  static function get_movie_types_by_extension($extension=NULL) {
+    $types_by_extension_wrapper = new stdClass();
+    $types_by_extension_wrapper->types_by_extension = array(
+      "flv" => "video/x-flv", "mp4" => "video/mp4", "m4v" => "video/x-m4v");
+    module::event("movie_types_by_extension", $types_by_extension_wrapper);
+    if ($extension) {
+      // return matching MIME type
+      return $types_by_extension_wrapper->types_by_extension[$extension];
+    } else {
+      // return complete array
+      return $types_by_extension_wrapper->types_by_extension;
+    }
+  }
+
+  /**
    * Create a default list of allowed photo extensions and then let modules modify it.
    */
   static function get_photo_extensions() {
     $extensions_wrapper = new stdClass();
-    $extensions_wrapper->extensions = array("gif", "jpg", "jpeg", "png");
+    $extensions_wrapper->extensions = array_keys(legal_file::get_photo_types_by_extension());
     module::event("legal_photo_extensions", $extensions_wrapper);
     return $extensions_wrapper->extensions;
   }
@@ -33,7 +75,7 @@ class legal_file_Core {
    */
   static function get_movie_extensions() {
     $extensions_wrapper = new stdClass();
-    $extensions_wrapper->extensions = array("flv", "mp4", "m4v");
+    $extensions_wrapper->extensions = array_keys(legal_file::get_movie_types_by_extension());
     module::event("legal_movie_extensions", $extensions_wrapper);
     return $extensions_wrapper->extensions;
   }
@@ -63,20 +105,25 @@ class legal_file_Core {
 
   /**
    * Create a default list of allowed photo MIME types and then let modules modify it.
+   * Can be used to add legal alternatives for default MIME types.
+   * (e.g. flv maps to video/x-flv by default, but video/flv is still legal).
    */
   static function get_photo_types() {
     $types_wrapper = new stdClass();
-    $types_wrapper->types = array("image/jpeg", "image/gif", "image/png");
+    $types_wrapper->types = array_values(legal_file::get_photo_types_by_extension());
     module::event("legal_photo_types", $types_wrapper);
     return $types_wrapper->types;
   }
 
   /**
    * Create a default list of allowed movie MIME types and then let modules modify it.
+   * Can be used to add legal alternatives for default MIME types.
+   * (e.g. flv maps to video/x-flv by default, but video/flv is still legal).
    */
   static function get_movie_types() {
     $types_wrapper = new stdClass();
-    $types_wrapper->types = array("video/flv", "video/x-flv", "video/mp4");
+    $types_wrapper->types = array_values(legal_file::get_movie_types_by_extension());
+    $types_wrapper->types[] = "video/flv";
     module::event("legal_movie_types", $types_wrapper);
     return $types_wrapper->types;
   }
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index b54811df..ddc513ea 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -63,21 +63,29 @@ class movie_Core {
       throw new Exception("@todo MISSING_FFMPEG");
     }
 
+    list($width, $height, $mime_type, $extension, $duration) = movie::get_file_metadata($input_file);
+
+    // extract frame at 0:03, unless movie is shorter than 4 sec.
+    $start_time_arg = ($duration > 4) ? " -ss 00:00:03" : "";
+
     $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($input_file) .
-      " -an -ss 00:00:03 -an -r 1 -vframes 1" .
+      " -an $start_time_arg -an -r 1 -vframes 1" .
+      " -s {$width}x{$height}" .
       " -y -f mjpeg " . escapeshellarg($output_file) . " 2>&1";
-    exec($cmd);
+    exec($cmd, $exec_output, $exec_return);
 
     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" .
+    if (filesize($output_file) == 0 || $exec_return) {
+      // Maybe the movie needs the "-threads 1" argument added
+      // (see http://sourceforge.net/apps/trac/gallery/ticket/1924)
+      $cmd = escapeshellcmd($ffmpeg) . " -threads 1 -i " . escapeshellarg($input_file) .
+        " -an $start_time_arg -an -r 1 -vframes 1" .
+        " -s {$width}x{$height}" .
         " -y -f mjpeg " . escapeshellarg($output_file) . " 2>&1";
-      exec($cmd);
+      exec($cmd, $exec_output, $exec_return);
 
       clearstatcache();
-      if (filesize($output_file) == 0) {
+      if (filesize($output_file) == 0 || $exec_return) {
         throw new Exception("@todo FFMPEG_FAILED");
       }
     }
@@ -96,7 +104,7 @@ class movie_Core {
   }
 
   /**
-   * Return the width, height, mime_type and extension of the given movie file.
+   * Return the width, height, mime_type, extension and duration of the given movie file.
    */
   static function get_file_metadata($file_path) {
     $ffmpeg = movie::find_ffmpeg();
@@ -106,18 +114,32 @@ class movie_Core {
 
     $cmd = escapeshellcmd($ffmpeg) . " -i " . escapeshellarg($file_path) . " 2>&1";
     $result = `$cmd`;
-    if (preg_match("/Stream.*?Video:.*?, (\d+)x(\d+)/", $result, $regs)) {
-      list ($width, $height) = array($regs[1], $regs[2]);
+    if (preg_match("/Stream.*?Video:.*?, (\d+)x(\d+)/", $result, $matches_res)) {
+      if (preg_match("/Stream.*?Video:.*? \[.*?DAR (\d+):(\d+).*?\]/", $result, $matches_dar) &&
+          $matches_dar[1] >= 1 && $matches_dar[2] >= 1) {
+        // DAR is defined - determine width based on height and DAR
+        // (should always be int, but adding round to be sure)
+        $matches_res[1] = round($matches_res[2] * $matches_dar[1] / $matches_dar[2]);
+      }
+      list ($width, $height) = array($matches_res[1], $matches_res[2]);
     } else {
       list ($width, $height) = array(0, 0);
     }
 
-    $pi = pathinfo($file_path);
-    $extension = isset($pi["extension"]) ? $pi["extension"] : "flv"; // No extension?  Assume FLV.
-    $mime_type = in_array(strtolower($extension), array("mp4", "m4v")) ?
-      "video/mp4" : "video/x-flv";
+    $extension = strtolower(pathinfo($file_path, PATHINFO_EXTENSION));
+    $extension = $extension ? $extension : "flv"; // No extension?  Assume FLV.
+    $mime_type = legal_file::get_movie_types_by_extension($extension);
+    $mime_type = $mime_type ? $mime_type : "video/x-flv"; // No MIME found?  Default to video/x-flv.
+
+    if (preg_match("/Duration: (\d+):(\d+):(\d+\.\d+)/", $result, $matches)) {
+      $duration = 3600 * $matches[1] + 60 * $matches[2] + $matches[3];
+    } else if (preg_match("/duration.*?:.*?(\d+)/", $result, $matches)) {
+      $duration = $matches[1];
+    } else {
+      $duration = 0;
+    }
 
-    return array($width, $height, $mime_type, $extension);
+    return array($width, $height, $mime_type, $extension, $duration);
   }
 
 }
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 9f2951d5..c4001bd5 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -83,10 +83,17 @@ class photo_Core {
    */
   static function get_file_metadata($file_path) {
     $image_info = getimagesize($file_path);
-    $width = $image_info[0];
-    $height = $image_info[1];
-    $mime_type = $image_info["mime"];
-    $extension = image_type_to_extension($image_info[2], false);
-    return array($width, $height, $mime_type, $extension);
+    if ($image_info) {
+      $width = $image_info[0];
+      $height = $image_info[1];
+      $mime_type = $image_info["mime"];
+      $extension = image_type_to_extension($image_info[2], false);
+      return array($width, $height, $mime_type, $extension);
+    } else {
+      // getimagesize failed - use legal_file mapping instead.
+      $extension = strtolower(pathinfo($file_path, PATHINFO_EXTENSION));
+      $mime_type = legal_file::get_photo_types_by_extension($extension);
+      return array(0, 0, $mime_type, $extension);
+    }
   }
 }
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index 424c0c2d..faefd663 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,6 +1,6 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 51
+version = 52
 author_name = "Gallery Team"
 author_url = "http://codex.gallery2.org/Gallery:Team"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:gallery"
diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index 235cc90e..52eb973c 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -24,12 +24,21 @@ class Search_Controller extends Controller {
     $q_with_more_terms = search::add_query_terms($q);
     $show = Input::instance()->get("show");
 
+    $album_id = Input::instance()->get("album", item::root()->id);
+    $album = ORM::factory("item", $album_id);
+    if (!access::can("view", $album) || !$album->is_album()) {
+      $album = item::root();
+    }
+
     if ($show) {
       $child = ORM::factory("item", $show);
-      $index = search::get_position($child, $q_with_more_terms);
+      $index = search::get_position_within_album($child, $q_with_more_terms, $album);
       if ($index) {
         $page = ceil($index / $page_size);
-        url::redirect(url::abs_site("search?q=" . urlencode($q) . ($page == 1 ? "" : "&page=$page")));
+        url::redirect(url::abs_site("search" .
+          "?q=" . urlencode($q) .
+          "&album=" . urlencode($album->id) .
+          ($page == 1 ? "" : "&page=$page")));
       }
     }
 
@@ -42,7 +51,8 @@ class Search_Controller extends Controller {
 
     $offset = ($page - 1) * $page_size;
 
-    list ($count, $result) = search::search($q_with_more_terms, $page_size, $offset);
+    list ($count, $result) =
+      search::search_within_album($q_with_more_terms, $album, $page_size, $offset);
 
     $title = t("Search: %q", array("q" => $q_with_more_terms));
 
@@ -61,28 +71,35 @@ class Search_Controller extends Controller {
             "children_count" => $count));
 
     $template->content = new View("search.html");
+    $template->content->album = $album;
     $template->content->items = $result;
     $template->content->q = $q;
 
     print $template;
 
     item::set_display_context_callback(
-      "Search_Controller::get_display_context", $title, $q_with_more_terms, $q);
+      "Search_Controller::get_display_context", $album->id, $title, $q_with_more_terms, $q);
   }
 
-  static function get_display_context($item, $title, $query_terms, $q) {
-    $position = search::get_position($item, $query_terms);
+  static function get_display_context($item, $album_id, $title, $query_terms, $q) {
+    $album = ORM::factory("item", $album_id);
+    $position = search::get_position_within_album($item, $query_terms, $album);
 
     if ($position > 1) {
-      list ($count, $result_data) = search::search($query_terms, 3, $position - 2);
+      list ($count, $result_data) =
+        search::search_within_album($query_terms, $album, 3, $position - 2);
       list ($previous_item, $ignore, $next_item) = $result_data;
     } else {
       $previous_item = null;
-      list ($count, $result_data) = search::search($query_terms, 1, $position);
+      list ($count, $result_data) =
+        search::search_within_album($query_terms, $album, 1, $position);
       list ($next_item) = $result_data;
     }
 
-    $search_url = url::abs_site("search?q=" . urlencode($q) . "&show={$item->id}");
+    $search_url = url::abs_site("search" .
+      "?q=" . urlencode($q) .
+      "&album=" . urlencode($album_id) .
+      "&show={$item->id}");
     $root = item::root();
 
     return array("position" => $position,
diff --git a/modules/search/helpers/search.php b/modules/search/helpers/search.php
index 64a13825..32b36e73 100644
--- a/modules/search/helpers/search.php
+++ b/modules/search/helpers/search.php
@@ -35,9 +35,13 @@ class search_Core {
   }
 
   static function search($q, $limit, $offset) {
+    return search::search_within_album($q, item::root(), $limit, $offset);
+  }
+
+  static function search_within_album($q, $album, $limit, $offset) {
     $db = Database::instance();
 
-    $query = self::_build_query_base($q) .
+    $query = self::_build_query_base($q, $album) .
       "ORDER BY `score` DESC " .
       "LIMIT $limit OFFSET " . (int)$offset;
 
@@ -47,8 +51,10 @@ class search_Core {
     return array($count, new ORM_Iterator(ORM::factory("item"), $data));
   }
 
-  private static function _build_query_base($q, $where=array()) {
-    $q = Database::instance()->escape($q);
+  private static function _build_query_base($q, $album, $where=array()) {
+    $db = Database::instance();
+    $q = $db->escape($q);
+
     if (!identity::active_user()->admin) {
       foreach (identity::group_ids_for_active_user() as $id) {
         $fields[] = "`view_$id` = TRUE"; // access::ALLOW
@@ -58,13 +64,23 @@ class search_Core {
       $access_sql = "";
     }
 
+    if ($album->id == item::root()->id) {
+      $album_sql = "";
+    } else {
+      $album_sql =
+        " AND {items}.left_ptr > " .$db->escape($album->left_ptr) .
+        " AND {items}.right_ptr <= " . $db->escape($album->right_ptr);
+    }
+
     return
       "SELECT SQL_CALC_FOUND_ROWS {items}.*, " .
       "  MATCH({search_records}.`data`) AGAINST ('$q') AS `score` " .
       "FROM {items} JOIN {search_records} ON ({items}.`id` = {search_records}.`item_id`) " .
       "WHERE MATCH({search_records}.`data`) AGAINST ('$q' IN BOOLEAN MODE) " .
+      $album_sql .
       (empty($where) ? "" : " AND " . join(" AND ", $where)) .
-      $access_sql;
+      $access_sql .
+      " ";
   }
 
   /**
@@ -111,8 +127,12 @@ class search_Core {
   }
 
   static function get_position($item, $q) {
+    return search::get_position_within_album($item, $q, item::root());
+  }
+
+  static function get_position_within_album($item, $q, $album) {
     $page_size = module::get_var("gallery", "page_size", 9);
-    $query = self::_build_query_base($q, array("{items}.id = " . $item->id));
+    $query = self::_build_query_base($q, $album, array("{items}.id = " . $item->id));
     $db = Database::instance();
 
     // Truncate the score by two decimal places as this resolves the issues
@@ -124,12 +144,12 @@ class search_Core {
       item::clear_display_context_callback();
       url::redirect(url::current());
     }
-    $score = $current->score();
+    $score = $current->score;
     if (strlen($score) > 7) {
       $score = substr($score, 0, strlen($score) - 2);
     }
 
-    $data = $db->query(self::_build_query_base($q) . " HAVING `score` >= " . $score);
+    $data = $db->query(self::_build_query_base($q, $album) . " HAVING `score` >= " . $score);
     $data->seek($data->count() - 1);
 
     while ($data->get("id") != $item->id && $data->prev()->valid()) {
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 4279cbab..f1906744 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -8,6 +8,7 @@
     <ul>
       <li>
         <label for="q"><?= t("Search the gallery") ?></label>
+        <input name="album" type="hidden" value="<?= html::clean_attribute($album->id) ?>" />
         <input name="q" id="q" type="text" value="<?= html::clean_attribute($q) ?>" class="text" />
       </li>
       <li>
@@ -20,6 +21,17 @@
 <div id="g-search-results">
   <h1><?= t("Search results") ?></h1>
 
+  <? if ($album->id == item::root()->id): ?>
+    <div>
+      <?= t("Searched the whole gallery.") ?>
+    </div>
+  <? else: ?>
+    <div>
+      <?= t("Searched within album <b>%album</b>.", array("album" => html::purify($album->title))) ?>
+      <a href="<?= url::site(url::merge(array("album" => item::root()->id))) ?>"><?= t("Search whole gallery") ?></a>
+    </div>
+  <? endif; ?>
+
   <? if (count($items)): ?>
   <ul id="g-album-grid" class="ui-helper-clearfix">
     <? foreach ($items as $item): ?>
diff --git a/modules/search/views/search_link.html.php b/modules/search/views/search_link.html.php
index dd3a76a4..be3305b7 100644
--- a/modules/search/views/search_link.html.php
+++ b/modules/search/views/search_link.html.php
@@ -9,4 +9,11 @@
       <input type="submit" value="<?= t("Go")->for_html_attr() ?>" class="submit" />
     </li>
   </ul>
+  <? if (isset($item) && $item instanceof Item_Model_Core): ?>
+    <? if ($item->is_album()): ?>
+      <input type="hidden" name="album" value="<?= $item->id ?>" />
+    <? else: ?>
+      <input type="hidden" name="album" value="<?= $item->parent_id ?>" />
+    <? endif; ?>
+  <? endif; ?>
 </form>