From f212f6a794c4aff96446b99e4824a9e2c8cfb259 Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Thu, 14 Feb 2013 23:42:20 +0100
Subject: #2003 - Add admin/movies screen. Added admin/movies screen analogous
 to the admin/graphics screen so the user can: - see how FFmpeg is configured
 (path and version, similar to toolkits in admin/graphics) - get some
 instructions on how to install FFmpeg if not found - change the
 movie_allow_uploads setting - ask Gallery to rebuild their movie thumbs
 Specifics: - admin_movies, admin_movies.html (new) - new Movies admin screen
 - ffmpeg.png (new) - logo for admin screen - movie::get_ffmpeg_version (new)
 - return version number and date of FFmpeg - form_uploadify.html - change
 admin message if movie uploads are disabled - gallery_event::admin_menu -
 added Movies link to Settings - xss_data.txt - updated golden file for unit
 tests

---
 modules/gallery/helpers/gallery_event.php |  4 ++++
 modules/gallery/helpers/movie.php         | 28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index aeb1c7eb..54c60296 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -398,6 +398,10 @@ class gallery_event_Core {
                         ->id("graphics_toolkits")
                         ->label(t("Graphics"))
                         ->url(url::site("admin/graphics")))
+               ->append(Menu::factory("link")
+                        ->id("movies_settings")
+                        ->label(t("Movies"))
+                        ->url(url::site("admin/movies")))
                ->append(Menu::factory("link")
                         ->id("languages")
                         ->label(t("Languages"))
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 863e1cf9..aff2acc1 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -146,6 +146,34 @@ class movie_Core {
     return $ffmpeg_path;
   }
 
+  /**
+   * Return version number and build date of ffmpeg if found, empty string(s) if not.  When using
+   * static builds that aren't official releases, the version numbers are strange, hence why the
+   * date can be useful.
+   */
+  static function get_ffmpeg_version() {
+    $ffmpeg = movie::find_ffmpeg();
+    if (empty($ffmpeg)) {
+      return array("", "");
+    }
+
+    // Find version using -h argument since -version wasn't available in early versions.
+    // To keep the preg_match searches quick, we'll trim the (otherwise long) result.
+    $cmd = escapeshellcmd($ffmpeg) . " -h 2>&1";
+    $result = substr(`$cmd`, 0, 1000);
+    if (preg_match("/ffmpeg version (\S+)/i", $result, $matches_version)) {
+      // Version number found - see if we can get the build date or copyright year as well.
+      if (preg_match("/built on (\S+\s\S+\s\S+)/i", $result, $matches_build_date)) {
+        return array(trim($matches_version[1], ","), trim($matches_build_date[1], ","));
+      } else if (preg_match("/copyright \S*\s?2000-(\d{4})/i", $result, $matches_copyright_date)) {
+        return array(trim($matches_version[1], ","), $matches_copyright_date[1]);
+      } else {
+        return array(trim($matches_version[1], ","), "");
+      }
+    }
+    return array("", "");
+  }
+
   /**
    * Return the width, height, mime_type, extension and duration of the given movie file.
    * Metadata is first generated using ffmpeg (or set to defaults if it fails),
-- 
cgit v1.2.3