Merge branch 'master' into talmdal_dev

gallery · Sep 18, 2010 · 38be33e · 38be33e
2 parents 207d848 + 3e1743b
commit 38be33e
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 10 deletions.
diff --git a/installer/install.sql b/installer/install.sql
@@ -244,7 +244,7 @@ CREATE TABLE {modules} (
   KEY `weight` (`weight`)
 ) AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
-INSERT INTO {modules} VALUES (1,1,'gallery',38,1);
+INSERT INTO {modules} VALUES (1,1,'gallery',40,1);
 INSERT INTO {modules} VALUES (2,1,'user',3,2);
 INSERT INTO {modules} VALUES (3,1,'comment',3,3);
 INSERT INTO {modules} VALUES (4,1,'organize',2,4);
@@ -395,7 +395,7 @@ CREATE TABLE {vars} (
   `value` text,
   PRIMARY KEY (`id`),
   UNIQUE KEY `module_name` (`module_name`,`name`)
-) AUTO_INCREMENT=49 DEFAULT CHARSET=utf8;
+) AUTO_INCREMENT=51 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');
@@ -422,6 +422,8 @@ INSERT INTO {vars} VALUES (NULL,'gallery','email_reply_to','unknown@unknown.com'
 INSERT INTO {vars} VALUES (NULL,'gallery','choose_default_tookit','1');
 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','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,'comment','spam_caught','0');
 INSERT INTO {vars} VALUES (NULL,'comment','access_permissions','everybody');
 INSERT INTO {vars} VALUES (NULL,'gallery','blocks_site_sidebar','a:4:{i:9;a:2:{i:0;s:7:\"gallery\";i:1;s:8:\"language\";}i:10;a:2:{i:0;s:4:\"info\";i:1;s:8:\"metadata\";}i:11;a:2:{i:0;s:3:\"rss\";i:1;s:9:\"rss_feeds\";}i:12;a:2:{i:0;s:3:\"tag\";i:1;s:3:\"tag\";}}');

diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
@@ -45,6 +45,7 @@ public function create($id) {
         switch ($key) {
         case "guest_name":  $key = "name";  break;
         case "guest_email": $key = "email"; break;
+        case "guest_url":   $key = "url";   break;
         }
         $form->add_comment->inputs[$key]->add_error($error, 1);
       }

diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
@@ -38,7 +38,8 @@ static function get_add_form($item) {
       ->error_messages("invalid", t("You must enter a valid email address"));
     $group->input("url")
       ->label(t("Website (hidden)"))
-      ->id("g-url");
+      ->id("g-url")
+      ->error_messages("url", t("You must enter a valid url"));
     $group->textarea("text")
       ->label(t("Comment"))
       ->id("g-text")

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
@@ -36,7 +36,8 @@ public function rotate($id, $dir) {
     }
 
     if ($degrees) {
-      $tmpfile = tempnam(TMPPATH, "rotate");
+      $tmpfile = tempnam(TMPPATH, "rotate") . "." .
+        pathinfo($item->file_path(), PATHINFO_EXTENSION);
       gallery_graphics::rotate($item->file_path(), $tmpfile, array("degrees" => $degrees));
       $item->set_data_file($tmpfile);
       $item->save();

diff --git a/modules/gallery/controllers/user_profile.php b/modules/gallery/controllers/user_profile.php
@@ -18,13 +18,18 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class User_Profile_Controller extends Controller {
+
   public function show($id) {
     // If we get here, then we should have a user id other than guest.
     $user = identity::lookup_user($id);
     if (!$user) {
       throw new Kohana_404_Exception();
     }
 
+    if (!$this->_can_view_profile_pages($user)) {
+      throw new Kohana_404_Exception();
+    }
+
     $v = new Theme_View("page.html", "other", "profile");
     $v->page_title = t("%name Profile", array("name" => $user->display_name()));
     $v->content = new View("user_profile.html");
@@ -44,12 +49,20 @@ public function show($id) {
 
   public function contact($id) {
     $user = identity::lookup_user($id);
+    if (!$this->_can_view_profile_pages($user)) {
+      throw new Kohana_404_Exception();
+    }
+
     print user_profile::get_contact_form($user);
   }
 
   public function send($id) {
     access::verify_csrf();
     $user = identity::lookup_user($id);
+    if (!$this->_can_view_profile_pages($user)) {
+      throw new Kohana_404_Exception();
+    }
+
     $form = user_profile::get_contact_form($user);
     if ($form->validate()) {
       Sendmail::factory()
@@ -66,4 +79,30 @@ public function send($id) {
       json::reply(array("result" => "error", "html" => (string)$form));
     }
   }
+
+  private function _can_view_profile_pages($user) {
+    if (!$user->loaded()) {
+      return false;
+    }
+
+    if ($user->id == identity::active_user()->id) {
+      // You can always view your own profile
+      return true;
+    }
+
+    switch (module::get_var("gallery", "show_user_profiles_to")) {
+    case "admin_users":
+      return identity::active_user()->admin;
+
+    case "registered_users":
+      return !identity::active_user()->guest;
+
+    case "everybody":
+      return true;
+
+    default:
+      // Fail in private mode on an invalid setting
+      return false;
+    }
+  }
 }
diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
@@ -114,6 +114,7 @@ static function get_sort_order_options() {
                  "captured" => t("Date captured"),
                  "created" => t("Date uploaded"),
                  "title" => t("Title"),
+                 "name" => t("File name"),
                  "updated" => t("Date modified"),
                  "view_count" => t("Number of views"),
                  "rand_key" => t("Random"));

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
@@ -302,14 +302,14 @@ static function install() {
     module::set_var("gallery", "maintenance_mode", 0);
     module::set_var("gallery", "visible_title_length", 15);
     module::set_var("gallery", "favicon_url", "lib/images/favicon.ico");
-
-    // Sendmail configuration
     module::set_var("gallery", "email_from", "");
     module::set_var("gallery", "email_reply_to", "");
     module::set_var("gallery", "email_line_length", 70);
     module::set_var("gallery", "email_header_separator", serialize("\n"));
+    module::set_var("gallery", "show_user_profiles_to", "registered_users");
+    module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
 
-    module::set_version("gallery", 38);
+    module::set_version("gallery", 40);
   }
 
   static function upgrade($version) {
@@ -627,6 +627,16 @@ static function upgrade($version) {
       }
       module::set_version("gallery", $version = 38);
     }
+
+    if ($version == 38) {
+      module::set_var("gallery", "show_user_profiles_to", "registered_users");
+      module::set_version("gallery", $version = 39);
+    }
+
+    if ($version == 39) {
+      module::set_var("gallery", "extra_binary_paths", "/usr/local/bin:/opt/local/bin:/opt/bin");
+      module::set_version("gallery", $version = 40);
+    }
   }
 
   static function uninstall() {

diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
@@ -314,9 +314,10 @@ static function detect_toolkits() {
       $toolkits->graphicsmagick->error = t("GraphicsMagick requires the <b>exec</b> function");
     } else {
       $graphics_path = module::get_var("gallery", "graphics_toolkit_path", null);
+      $extra_binary_paths = module::get_var("gallery", "extra_binary_paths", null);
 
       putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") .
-             ":/usr/local/bin:/opt/local/bin:/opt/bin");
+             ":" . $extra_binary_paths);
 
       // @todo: consider refactoring the two segments below into a loop since they are so
       // similar.

diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
@@ -86,9 +86,10 @@ static function extract_frame($input_file, $output_file) {
   static function find_ffmpeg() {
     if (!($ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) || !file_exists($ffmpeg_path)) {
       $graphics_path = module::get_var("gallery", "graphics_toolkit_path", null);
+      $extra_binary_paths = module::get_var("gallery", "extra_binary_paths", null);
 
       putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") .
-             ":/usr/local/bin:/opt/local/bin:/opt/bin");
+             ":" . $extra_binary_paths);
       if (function_exists("exec")) {
         $ffmpeg_path = exec("which ffmpeg");
       }

diff --git a/modules/gallery/module.info b/modules/gallery/module.info
@@ -1,3 +1,3 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 38
+version = 40
diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
@@ -16,6 +16,7 @@
   <h1> <?= t("Graphics settings") ?> </h1>
   <p>
     <?= t("Gallery needs a graphics toolkit in order to manipulate your photos.  Please choose one from the list below.") ?>
+    <?= t("Can't decide which toolkit to choose?  <a href=\"%url\">We can help!</a>", array("url" => "http://codex.gallery2.org/Gallery3:Choosing_A_Graphics_Toolkit")) ?>
   </p>
 
   <div class="g-block-content">