From 06098cbe9954404ffbc12ef0f8b1b62ecfdae172 Mon Sep 17 00:00:00 2001
From: niaxilin <github@mattjanssen.com>
Date: Thu, 21 Apr 2011 22:54:20 -0700
Subject: [PATCH 01/18] Fixed googlemap_max_autozoom not having desired effect.

---
 3.1/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/3.1/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php b/3.1/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
index 24b69acb..056bfe6c 100644
--- a/3.1/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
+++ b/3.1/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
@@ -35,14 +35,14 @@
       <? } else { ?>
       <? } ?>
     <? } ?>
-    <? if (module::get_var("exif_gps", "googlemap_max_autozoom") != "") : ?>
+    <? if (($max_autozoom = module::get_var("exif_gps", "googlemap_max_autozoom")) != "") : ?>
     // If there is a maximum auto-zoom value, then set up an event to check the zoom
     // level the first time it is changed, and adjust it if necessary.
     // (if we call map.getZoom right after .fitBounds, getZoom will return the initial 
     // zoom level, not the auto zoom level, this way we get the auto zoomed value).
     google.maps.event.addListener(map, 'zoom_changed', function() {
       if (google_zoom_hack) {
-        if (map.getZoom() > 18) map.setZoom(18);
+        if (map.getZoom() > <?= $max_autozoom ?>) map.setZoom(<?= $max_autozoom ?>);
         google_zoom_hack = false;
       }
     });

From 3735e967338fd0f9412e2b1040b4257dff90691c Mon Sep 17 00:00:00 2001
From: niaxilin <github@mattjanssen.com>
Date: Thu, 21 Apr 2011 22:55:15 -0700
Subject: [PATCH 02/18] Fixed googlemap_max_autozoom not having desired effect.

---
 3.1/modules/exif_gps/views/exif_gps_map.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/3.1/modules/exif_gps/views/exif_gps_map.html.php b/3.1/modules/exif_gps/views/exif_gps_map.html.php
index 6c8a59ee..95f6221c 100644
--- a/3.1/modules/exif_gps/views/exif_gps_map.html.php
+++ b/3.1/modules/exif_gps/views/exif_gps_map.html.php
@@ -62,14 +62,14 @@
       infowindow<?=$counter; ?>.open(map,marker<?=$counter; ?>);
     });
 
-    <? if (module::get_var("exif_gps", "googlemap_max_autozoom") != "") : ?>
+    <? if (($max_autozoom = module::get_var("exif_gps", "googlemap_max_autozoom")) != "") : ?>
     // If there is a maximum auto-zoom value, then set up an event to check the zoom
     // level the first time it is changed, and adjust it if necessary.
     // (if we call map.getZoom right after .fitBounds, getZoom will return the initial 
     // zoom level, not the auto zoom level, this way we get the auto zoomed value).
     google.maps.event.addListener(map, 'zoom_changed', function() {
       if (google_zoom_hack) {
-        if (map.getZoom() > 18) map.setZoom(18);
+        if (map.getZoom() > <?= $max_autozoom ?>) map.setZoom(<?= $max_autozoom ?>);
         google_zoom_hack = false;
       }
     });

From 8a3c9b4435c5cac8cf96a4416c3a6f87c46bd575 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 14:18:38 -0400
Subject: [PATCH 03/18] Copyright Fix.

---
 3.0/modules/videos/controllers/admin_videos.php | 2 +-
 3.0/modules/videos/controllers/videos.php       | 2 +-
 3.0/modules/videos/helpers/videos.php           | 2 +-
 3.0/modules/videos/helpers/videos_event.php     | 2 +-
 3.0/modules/videos/helpers/videos_installer.php | 2 +-
 3.0/modules/videos/helpers/videos_theme.php     | 2 +-
 3.0/modules/videos/models/videos_entry.php      | 2 +-
 3.0/modules/videos/module.info                  | 6 +++---
 3.1/modules/videos/controllers/admin_videos.php | 2 +-
 3.1/modules/videos/controllers/videos.php       | 2 +-
 3.1/modules/videos/helpers/videos.php           | 2 +-
 3.1/modules/videos/helpers/videos_event.php     | 2 +-
 3.1/modules/videos/helpers/videos_installer.php | 2 +-
 3.1/modules/videos/helpers/videos_theme.php     | 2 +-
 3.1/modules/videos/models/videos_entry.php      | 2 +-
 3.1/modules/videos/module.info                  | 6 +++---
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/3.0/modules/videos/controllers/admin_videos.php b/3.0/modules/videos/controllers/admin_videos.php
index b5fe1cf3..81d691cb 100644
--- a/3.0/modules/videos/controllers/admin_videos.php
+++ b/3.0/modules/videos/controllers/admin_videos.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.0/modules/videos/controllers/videos.php b/3.0/modules/videos/controllers/videos.php
index b30f4f0e..34461b3e 100644
--- a/3.0/modules/videos/controllers/videos.php
+++ b/3.0/modules/videos/controllers/videos.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.0/modules/videos/helpers/videos.php b/3.0/modules/videos/helpers/videos.php
index 0bb15c31..f6f3240d 100644
--- a/3.0/modules/videos/helpers/videos.php
+++ b/3.0/modules/videos/helpers/videos.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.0/modules/videos/helpers/videos_event.php b/3.0/modules/videos/helpers/videos_event.php
index 5f4359ec..2bcd53f0 100644
--- a/3.0/modules/videos/helpers/videos_event.php
+++ b/3.0/modules/videos/helpers/videos_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.0/modules/videos/helpers/videos_installer.php b/3.0/modules/videos/helpers/videos_installer.php
index cbd4922a..36a1b423 100644
--- a/3.0/modules/videos/helpers/videos_installer.php
+++ b/3.0/modules/videos/helpers/videos_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.0/modules/videos/helpers/videos_theme.php b/3.0/modules/videos/helpers/videos_theme.php
index a14f69a2..61200985 100644
--- a/3.0/modules/videos/helpers/videos_theme.php
+++ b/3.0/modules/videos/helpers/videos_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.0/modules/videos/models/videos_entry.php b/3.0/modules/videos/models/videos_entry.php
index 515e8b9d..58514c31 100644
--- a/3.0/modules/videos/models/videos_entry.php
+++ b/3.0/modules/videos/models/videos_entry.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.0/modules/videos/module.info b/3.0/modules/videos/module.info
index 820c616d..d32b53dd 100644
--- a/3.0/modules/videos/module.info
+++ b/3.0/modules/videos/module.info
@@ -1,7 +1,7 @@
 name = "Videos"
 description = "Allows authorized users to load videos directly from your web server"
 version = 4
-author_name = ""
-author_url = ""
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:videos"
-discuss_url = "http://gallery.menalto.com/forum_module_videos"
+discuss_url = "http://gallery.menalto.com/node/98149"
diff --git a/3.1/modules/videos/controllers/admin_videos.php b/3.1/modules/videos/controllers/admin_videos.php
index b5fe1cf3..81d691cb 100644
--- a/3.1/modules/videos/controllers/admin_videos.php
+++ b/3.1/modules/videos/controllers/admin_videos.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.1/modules/videos/controllers/videos.php b/3.1/modules/videos/controllers/videos.php
index b30f4f0e..34461b3e 100644
--- a/3.1/modules/videos/controllers/videos.php
+++ b/3.1/modules/videos/controllers/videos.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.1/modules/videos/helpers/videos.php b/3.1/modules/videos/helpers/videos.php
index 0bb15c31..f6f3240d 100644
--- a/3.1/modules/videos/helpers/videos.php
+++ b/3.1/modules/videos/helpers/videos.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.1/modules/videos/helpers/videos_event.php b/3.1/modules/videos/helpers/videos_event.php
index 5f4359ec..2bcd53f0 100644
--- a/3.1/modules/videos/helpers/videos_event.php
+++ b/3.1/modules/videos/helpers/videos_event.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.1/modules/videos/helpers/videos_installer.php b/3.1/modules/videos/helpers/videos_installer.php
index cbd4922a..36a1b423 100644
--- a/3.1/modules/videos/helpers/videos_installer.php
+++ b/3.1/modules/videos/helpers/videos_installer.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.1/modules/videos/helpers/videos_theme.php b/3.1/modules/videos/helpers/videos_theme.php
index a14f69a2..61200985 100644
--- a/3.1/modules/videos/helpers/videos_theme.php
+++ b/3.1/modules/videos/helpers/videos_theme.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.1/modules/videos/models/videos_entry.php b/3.1/modules/videos/models/videos_entry.php
index 515e8b9d..58514c31 100644
--- a/3.1/modules/videos/models/videos_entry.php
+++ b/3.1/modules/videos/models/videos_entry.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/3.1/modules/videos/module.info b/3.1/modules/videos/module.info
index 820c616d..d32b53dd 100644
--- a/3.1/modules/videos/module.info
+++ b/3.1/modules/videos/module.info
@@ -1,7 +1,7 @@
 name = "Videos"
 description = "Allows authorized users to load videos directly from your web server"
 version = 4
-author_name = ""
-author_url = ""
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:videos"
-discuss_url = "http://gallery.menalto.com/forum_module_videos"
+discuss_url = "http://gallery.menalto.com/node/98149"

From 7fd1fcf351d6afc820b22c8ca54222ca1bfa4237 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 14:20:34 -0400
Subject: [PATCH 04/18] Change Enter Password to Unlock album, as per forum
 request.

---
 3.0/modules/albumpassword/helpers/albumpassword_event.php | 2 +-
 3.1/modules/albumpassword/helpers/albumpassword_event.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/3.0/modules/albumpassword/helpers/albumpassword_event.php b/3.0/modules/albumpassword/helpers/albumpassword_event.php
index 1201400d..b6b93e81 100644
--- a/3.0/modules/albumpassword/helpers/albumpassword_event.php
+++ b/3.0/modules/albumpassword/helpers/albumpassword_event.php
@@ -34,7 +34,7 @@ class albumpassword_event_Core {
                       ->id("albumpassword_login")
                       ->css_id("g-album-password-login")
                       ->url(url::site("albumpassword/login"))
-                      ->label(t("Enter password")));
+                      ->label(t("Unlock albums")));
     } else {
       // If a password has been entered already
       // display the log out link, and links to the protected albums
diff --git a/3.1/modules/albumpassword/helpers/albumpassword_event.php b/3.1/modules/albumpassword/helpers/albumpassword_event.php
index 1201400d..b6b93e81 100644
--- a/3.1/modules/albumpassword/helpers/albumpassword_event.php
+++ b/3.1/modules/albumpassword/helpers/albumpassword_event.php
@@ -34,7 +34,7 @@ class albumpassword_event_Core {
                       ->id("albumpassword_login")
                       ->css_id("g-album-password-login")
                       ->url(url::site("albumpassword/login"))
-                      ->label(t("Enter password")));
+                      ->label(t("Unlock albums")));
     } else {
       // If a password has been entered already
       // display the log out link, and links to the protected albums

From e51a3c6dbcf73d99afc0a8f35cd4c9ca904615f2 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 14:24:14 -0400
Subject: [PATCH 05/18] module.info update.

---
 3.0/modules/albumpassword/module.info | 6 +++---
 3.1/modules/albumpassword/module.info | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/3.0/modules/albumpassword/module.info b/3.0/modules/albumpassword/module.info
index 654a7fe1..313bddf5 100644
--- a/3.0/modules/albumpassword/module.info
+++ b/3.0/modules/albumpassword/module.info
@@ -1,7 +1,7 @@
 name = "Album Password"
 description = "Restrict access to individual albums."
 version = 3
-author_name = ""
-author_url = ""
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:albumpassword"
-discuss_url = "http://gallery.menalto.com/forum_module_albumpassword"
+discuss_url = "http://gallery.menalto.com/node/98856"
diff --git a/3.1/modules/albumpassword/module.info b/3.1/modules/albumpassword/module.info
index 654a7fe1..313bddf5 100644
--- a/3.1/modules/albumpassword/module.info
+++ b/3.1/modules/albumpassword/module.info
@@ -1,7 +1,7 @@
 name = "Album Password"
 description = "Restrict access to individual albums."
 version = 3
-author_name = ""
-author_url = ""
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:albumpassword"
-discuss_url = "http://gallery.menalto.com/forum_module_albumpassword"
+discuss_url = "http://gallery.menalto.com/node/98856"

From 8b3fa68dbad8b42034d30cdc3e93e902b3051eb1 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 14:26:53 -0400
Subject: [PATCH 06/18] Force all passwords to be lower case.

---
 3.0/modules/albumpassword/controllers/albumpassword.php | 4 ++--
 3.1/modules/albumpassword/controllers/albumpassword.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3.0/modules/albumpassword/controllers/albumpassword.php b/3.0/modules/albumpassword/controllers/albumpassword.php
index 83ff4f0e..6fea60e8 100644
--- a/3.0/modules/albumpassword/controllers/albumpassword.php
+++ b/3.0/modules/albumpassword/controllers/albumpassword.php
@@ -71,7 +71,7 @@ class albumpassword_Controller extends Controller {
 
     // Convert submitted data to local variables.
     $album_id = Input::instance()->post("item_id");
-    $album_password = Input::instance()->post("assignpassword_password");
+    $album_password = strtolower(Input::instance()->post("assignpassword_password"));
 
     // Check for, and remove, any existing passwords and cached ids.
     $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_id)->find_all();
@@ -126,7 +126,7 @@ class albumpassword_Controller extends Controller {
     access::verify_csrf();
 
     // Convert submitted data to local variables.
-    $album_password = Input::instance()->post("albumpassword_password");
+    $album_password = strtolower(Input::instance()->post("albumpassword_password"));
 
     // See if the submitted password matches any in the database.
     $existing_password = ORM::factory("items_albumpassword")
diff --git a/3.1/modules/albumpassword/controllers/albumpassword.php b/3.1/modules/albumpassword/controllers/albumpassword.php
index 83ff4f0e..6fea60e8 100644
--- a/3.1/modules/albumpassword/controllers/albumpassword.php
+++ b/3.1/modules/albumpassword/controllers/albumpassword.php
@@ -71,7 +71,7 @@ class albumpassword_Controller extends Controller {
 
     // Convert submitted data to local variables.
     $album_id = Input::instance()->post("item_id");
-    $album_password = Input::instance()->post("assignpassword_password");
+    $album_password = strtolower(Input::instance()->post("assignpassword_password"));
 
     // Check for, and remove, any existing passwords and cached ids.
     $existing_password = ORM::factory("items_albumpassword")->where("album_id", "=", $album_id)->find_all();
@@ -126,7 +126,7 @@ class albumpassword_Controller extends Controller {
     access::verify_csrf();
 
     // Convert submitted data to local variables.
-    $album_password = Input::instance()->post("albumpassword_password");
+    $album_password = strtolower(Input::instance()->post("albumpassword_password"));
 
     // See if the submitted password matches any in the database.
     $existing_password = ORM::factory("items_albumpassword")

From eb635e91c8b34497f86313abbe854d3c6cbe0e94 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 14:50:08 -0400
Subject: [PATCH 07/18] Lowercase existing passwords to fix case issue.

---
 .../helpers/albumpassword_task.php            | 69 +++++++++++++++++--
 .../helpers/albumpassword_task.php            | 69 +++++++++++++++++--
 2 files changed, 128 insertions(+), 10 deletions(-)

diff --git a/3.0/modules/albumpassword/helpers/albumpassword_task.php b/3.0/modules/albumpassword/helpers/albumpassword_task.php
index b6ea007a..07f620e1 100644
--- a/3.0/modules/albumpassword/helpers/albumpassword_task.php
+++ b/3.0/modules/albumpassword/helpers/albumpassword_task.php
@@ -26,11 +26,70 @@ class albumpassword_task_Core {
       ->join("albumpassword_idcaches", "items_albumpasswords.id", "albumpassword_idcaches.password_id", "LEFT OUTER")
       ->and_where("albumpassword_idcaches.password_id", "IS", NULL)->count_all();
 
-    return array(Task_Definition::factory()
-                 ->callback("albumpassword_task::update_idcaches")
-                 ->name(t("Rebuild Album Password ID Caches DB"))
-                 ->description(t("Logs the contents of all protected albums into the db."))
-                 ->severity($bad_albums ? log::WARNING : log::SUCCESS));
+    $tasks = array();
+
+    $tasks[] = Task_Definition::factory()
+               ->callback("albumpassword_task::update_idcaches")
+               ->name(t("Rebuild Album Password ID Caches DB"))
+               ->description(t("Logs the contents of all protected albums into the db."))
+               ->severity($bad_albums ? log::WARNING : log::SUCCESS);
+
+    $tasks[] = Task_Definition::factory()
+               ->callback("albumpassword_task::lowercase_passwords")
+               ->name(t("Fix Password DB Casing"))
+               ->description(t("Fixes case sensitivity issues."))
+               ->severity(log::SUCCESS);
+
+    return $tasks;
+  }
+
+  static function lowercase_passwords($task) {
+    // Converts all passwords to lower case.
+
+    $start = microtime(true);
+    $total = $task->get("total");
+    $existing_passwords = ORM::factory("items_albumpassword")->find_all();
+
+    if (empty($total)) {
+      // Set the initial values for all variables.
+      $task->set("total", count($existing_passwords));
+      $total = $task->get("total");
+      $task->set("last_password_id", 0);
+      $task->set("completed_passwords", 0);
+    }
+
+    // Retrieve the values for variables from the last time this
+    //  function was run.
+    $last_password_id = $task->get("last_password_id");
+    $completed_passwords = $task->get("completed_passwords");
+
+    foreach (ORM::factory("items_albumpassword")
+             ->where("id", ">", $last_password_id)
+             ->order_by("id")
+             ->find_all(100) as $one_password) {
+      $one_password->password = strtolower($one_password->password);
+	  $one_password->save();
+
+      $last_password_id = $one_password->id;
+      $completed_passwords++;
+
+      if ($completed_passwords == count($existing_passwords) || microtime(true) - $start > 1.5) {
+        break;
+      }
+    }
+	
+    $task->set("last_password_id", $last_password_id);
+    $task->set("completed_passwords", $completed_passwords);
+
+    if ($completed_passwords == count($existing_passwords)) {
+      $task->done = true;
+      $task->state = "success";
+      $task->percent_complete = 100;
+    } else {
+      $task->percent_complete = round(100 * $completed_passwords / count($existing_passwords));
+    }
+    $task->status = t2("One password fixed", "%count / %total passwords fixed", $completed_passwords,
+                       array("total" => count($existing_passwords)));
   }
 
   static function update_idcaches($task) {
diff --git a/3.1/modules/albumpassword/helpers/albumpassword_task.php b/3.1/modules/albumpassword/helpers/albumpassword_task.php
index b6ea007a..07f620e1 100644
--- a/3.1/modules/albumpassword/helpers/albumpassword_task.php
+++ b/3.1/modules/albumpassword/helpers/albumpassword_task.php
@@ -26,11 +26,70 @@ class albumpassword_task_Core {
       ->join("albumpassword_idcaches", "items_albumpasswords.id", "albumpassword_idcaches.password_id", "LEFT OUTER")
       ->and_where("albumpassword_idcaches.password_id", "IS", NULL)->count_all();
 
-    return array(Task_Definition::factory()
-                 ->callback("albumpassword_task::update_idcaches")
-                 ->name(t("Rebuild Album Password ID Caches DB"))
-                 ->description(t("Logs the contents of all protected albums into the db."))
-                 ->severity($bad_albums ? log::WARNING : log::SUCCESS));
+    $tasks = array();
+
+    $tasks[] = Task_Definition::factory()
+               ->callback("albumpassword_task::update_idcaches")
+               ->name(t("Rebuild Album Password ID Caches DB"))
+               ->description(t("Logs the contents of all protected albums into the db."))
+               ->severity($bad_albums ? log::WARNING : log::SUCCESS);
+
+    $tasks[] = Task_Definition::factory()
+               ->callback("albumpassword_task::lowercase_passwords")
+               ->name(t("Fix Password DB Casing"))
+               ->description(t("Fixes case sensitivity issues."))
+               ->severity(log::SUCCESS);
+
+    return $tasks;
+  }
+
+  static function lowercase_passwords($task) {
+    // Converts all passwords to lower case.
+
+    $start = microtime(true);
+    $total = $task->get("total");
+    $existing_passwords = ORM::factory("items_albumpassword")->find_all();
+
+    if (empty($total)) {
+      // Set the initial values for all variables.
+      $task->set("total", count($existing_passwords));
+      $total = $task->get("total");
+      $task->set("last_password_id", 0);
+      $task->set("completed_passwords", 0);
+    }
+
+    // Retrieve the values for variables from the last time this
+    //  function was run.
+    $last_password_id = $task->get("last_password_id");
+    $completed_passwords = $task->get("completed_passwords");
+
+    foreach (ORM::factory("items_albumpassword")
+             ->where("id", ">", $last_password_id)
+             ->order_by("id")
+             ->find_all(100) as $one_password) {
+      $one_password->password = strtolower($one_password->password);
+	  $one_password->save();
+
+      $last_password_id = $one_password->id;
+      $completed_passwords++;
+
+      if ($completed_passwords == count($existing_passwords) || microtime(true) - $start > 1.5) {
+        break;
+      }
+    }
+	
+    $task->set("last_password_id", $last_password_id);
+    $task->set("completed_passwords", $completed_passwords);
+
+    if ($completed_passwords == count($existing_passwords)) {
+      $task->done = true;
+      $task->state = "success";
+      $task->percent_complete = 100;
+    } else {
+      $task->percent_complete = round(100 * $completed_passwords / count($existing_passwords));
+    }
+    $task->status = t2("One password fixed", "%count / %total passwords fixed", $completed_passwords,
+                       array("total" => count($existing_passwords)));
   }
 
   static function update_idcaches($task) {

From 0ed7935582ce8ac24dc4c3bcb389221a824abfea Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 15:05:54 -0400
Subject: [PATCH 08/18] Merged niaxilin's bugfix into the 3.0 branch.

---
 3.0/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php | 4 ++--
 3.0/modules/exif_gps/views/exif_gps_map.html.php              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3.0/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php b/3.0/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
index 24b69acb..056bfe6c 100644
--- a/3.0/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
+++ b/3.0/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
@@ -35,14 +35,14 @@
       <? } else { ?>
       <? } ?>
     <? } ?>
-    <? if (module::get_var("exif_gps", "googlemap_max_autozoom") != "") : ?>
+    <? if (($max_autozoom = module::get_var("exif_gps", "googlemap_max_autozoom")) != "") : ?>
     // If there is a maximum auto-zoom value, then set up an event to check the zoom
     // level the first time it is changed, and adjust it if necessary.
     // (if we call map.getZoom right after .fitBounds, getZoom will return the initial 
     // zoom level, not the auto zoom level, this way we get the auto zoomed value).
     google.maps.event.addListener(map, 'zoom_changed', function() {
       if (google_zoom_hack) {
-        if (map.getZoom() > 18) map.setZoom(18);
+        if (map.getZoom() > <?= $max_autozoom ?>) map.setZoom(<?= $max_autozoom ?>);
         google_zoom_hack = false;
       }
     });
diff --git a/3.0/modules/exif_gps/views/exif_gps_map.html.php b/3.0/modules/exif_gps/views/exif_gps_map.html.php
index 6c8a59ee..95f6221c 100644
--- a/3.0/modules/exif_gps/views/exif_gps_map.html.php
+++ b/3.0/modules/exif_gps/views/exif_gps_map.html.php
@@ -62,14 +62,14 @@
       infowindow<?=$counter; ?>.open(map,marker<?=$counter; ?>);
     });
 
-    <? if (module::get_var("exif_gps", "googlemap_max_autozoom") != "") : ?>
+    <? if (($max_autozoom = module::get_var("exif_gps", "googlemap_max_autozoom")) != "") : ?>
     // If there is a maximum auto-zoom value, then set up an event to check the zoom
     // level the first time it is changed, and adjust it if necessary.
     // (if we call map.getZoom right after .fitBounds, getZoom will return the initial 
     // zoom level, not the auto zoom level, this way we get the auto zoomed value).
     google.maps.event.addListener(map, 'zoom_changed', function() {
       if (google_zoom_hack) {
-        if (map.getZoom() > 18) map.setZoom(18);
+        if (map.getZoom() > <?= $max_autozoom ?>) map.setZoom(<?= $max_autozoom ?>);
         google_zoom_hack = false;
       }
     });

From e4dfed129ec2eae669a0415dde0b281cadc9a16a Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 15:08:20 -0400
Subject: [PATCH 09/18] EXIF GPS module.info update.

---
 3.0/modules/exif_gps/module.info | 6 +++---
 3.1/modules/exif_gps/module.info | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/3.0/modules/exif_gps/module.info b/3.0/modules/exif_gps/module.info
index ef153200..ebde931e 100644
--- a/3.0/modules/exif_gps/module.info
+++ b/3.0/modules/exif_gps/module.info
@@ -1,7 +1,7 @@
 name = "Exif GPS Data"
 description = "Extract Exif GPS data from photos."
 version = 2
-author_name = ""
-author_url = ""
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:exif_gps"
-discuss_url = "http://gallery.menalto.com/forum_module_exif_gps"
+discuss_url = "http://gallery.menalto.com/node/94762"
diff --git a/3.1/modules/exif_gps/module.info b/3.1/modules/exif_gps/module.info
index ef153200..ebde931e 100644
--- a/3.1/modules/exif_gps/module.info
+++ b/3.1/modules/exif_gps/module.info
@@ -1,7 +1,7 @@
 name = "Exif GPS Data"
 description = "Extract Exif GPS data from photos."
 version = 2
-author_name = ""
-author_url = ""
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:exif_gps"
-discuss_url = "http://gallery.menalto.com/forum_module_exif_gps"
+discuss_url = "http://gallery.menalto.com/node/94762"

From 5cd1fc9d03e4a0c88e3d0afe60f2eda09a60d3c6 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 15:29:07 -0400
Subject: [PATCH 10/18] Implemented mattbostock's suggestion for degrading the
 javascript map to a static image for older browsers.

---
 .../exif_gps/views/exif_gps_dynamic2_sidebar.html.php     | 8 +++++++-
 .../exif_gps/views/exif_gps_dynamic_sidebar.html.php      | 2 +-
 .../exif_gps/views/exif_gps_dynamic2_sidebar.html.php     | 8 +++++++-
 .../exif_gps/views/exif_gps_dynamic_sidebar.html.php      | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/3.0/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php b/3.0/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
index 056bfe6c..f4f95799 100644
--- a/3.0/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
+++ b/3.0/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
@@ -1,4 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<?
+  $latitude = 0;
+  $longitude = 0;
+?>
 <script type="text/javascript" src="http://www.google.com/jsapi?key=<?= module::get_var("exif_gps", "googlemap_api_key"); ?>"></script>
 <script type="text/javascript">
   google.load("maps", "3",{"other_params":"sensor=false"});
@@ -20,6 +24,8 @@
       <? if (!isset($currLat)) { ?>
         <? $currLat = $item_coordinates->latitude; ?>
         <? $currLong = $item_coordinates->longitude; ?>
+        <? $latitude = $item_coordinates->latitude; ?>
+        <? $longitude = $item_coordinates->longitude; ?>
         var marker<?=$counter; ?> = new google.maps.Marker({
           position: new google.maps.LatLng(<?=$item_coordinates->latitude; ?>,<?=$item_coordinates->longitude; ?>), 
           map: map
@@ -56,4 +62,4 @@
 
 </script>
 
-<div id="sidebar_map_canvas" style="width:205px; height:214px"></div>
+<div id="sidebar_map_canvas" style="width:205px; height:214px"><img src="http://maps.google.com/maps/api/staticmap?center=<?=$latitude; ?>,<?=$longitude; ?>&zoom=<?= module::get_var("exif_gps", "sidebar_zoom"); ?>&size=205x214&maptype=<?=$sidebar_map_type ?>&markers=color:red|color:red|<?=$latitude; ?>,<?=$longitude; ?>&sensor=false"></div>
diff --git a/3.0/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php b/3.0/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php
index d5b497dc..ff28e101 100644
--- a/3.0/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php
+++ b/3.0/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php
@@ -19,4 +19,4 @@
   google.setOnLoadCallback(initialize);
 
 </script>
-<div id="sidebar_map_canvas" style="width:205px; height:214px"></div>
+<div id="sidebar_map_canvas" style="width:205px; height:214px"><img src="http://maps.google.com/maps/api/staticmap?center=<?=$latitude; ?>,<?=$longitude; ?>&zoom=<?= module::get_var("exif_gps", "sidebar_zoom"); ?>&size=205x214&maptype=<?=$sidebar_map_type ?>&markers=color:red|color:red|<?=$latitude; ?>,<?=$longitude; ?>&sensor=false"></div>
diff --git a/3.1/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php b/3.1/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
index 056bfe6c..f4f95799 100644
--- a/3.1/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
+++ b/3.1/modules/exif_gps/views/exif_gps_dynamic2_sidebar.html.php
@@ -1,4 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
+<?
+  $latitude = 0;
+  $longitude = 0;
+?>
 <script type="text/javascript" src="http://www.google.com/jsapi?key=<?= module::get_var("exif_gps", "googlemap_api_key"); ?>"></script>
 <script type="text/javascript">
   google.load("maps", "3",{"other_params":"sensor=false"});
@@ -20,6 +24,8 @@
       <? if (!isset($currLat)) { ?>
         <? $currLat = $item_coordinates->latitude; ?>
         <? $currLong = $item_coordinates->longitude; ?>
+        <? $latitude = $item_coordinates->latitude; ?>
+        <? $longitude = $item_coordinates->longitude; ?>
         var marker<?=$counter; ?> = new google.maps.Marker({
           position: new google.maps.LatLng(<?=$item_coordinates->latitude; ?>,<?=$item_coordinates->longitude; ?>), 
           map: map
@@ -56,4 +62,4 @@
 
 </script>
 
-<div id="sidebar_map_canvas" style="width:205px; height:214px"></div>
+<div id="sidebar_map_canvas" style="width:205px; height:214px"><img src="http://maps.google.com/maps/api/staticmap?center=<?=$latitude; ?>,<?=$longitude; ?>&zoom=<?= module::get_var("exif_gps", "sidebar_zoom"); ?>&size=205x214&maptype=<?=$sidebar_map_type ?>&markers=color:red|color:red|<?=$latitude; ?>,<?=$longitude; ?>&sensor=false"></div>
diff --git a/3.1/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php b/3.1/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php
index d5b497dc..ff28e101 100644
--- a/3.1/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php
+++ b/3.1/modules/exif_gps/views/exif_gps_dynamic_sidebar.html.php
@@ -19,4 +19,4 @@
   google.setOnLoadCallback(initialize);
 
 </script>
-<div id="sidebar_map_canvas" style="width:205px; height:214px"></div>
+<div id="sidebar_map_canvas" style="width:205px; height:214px"><img src="http://maps.google.com/maps/api/staticmap?center=<?=$latitude; ?>,<?=$longitude; ?>&zoom=<?= module::get_var("exif_gps", "sidebar_zoom"); ?>&size=205x214&maptype=<?=$sidebar_map_type ?>&markers=color:red|color:red|<?=$latitude; ?>,<?=$longitude; ?>&sensor=false"></div>

From 9ae209c27d879655b4818709525869915152a4e6 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 18:49:37 -0400
Subject: [PATCH 11/18] Hide smtp password details with a password input box.

---
 3.0/modules/phpmailer/controllers/admin_phpmailer.php | 2 +-
 3.1/modules/phpmailer/controllers/admin_phpmailer.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/3.0/modules/phpmailer/controllers/admin_phpmailer.php b/3.0/modules/phpmailer/controllers/admin_phpmailer.php
index d7b6941d..a35ae85e 100644
--- a/3.0/modules/phpmailer/controllers/admin_phpmailer.php
+++ b/3.0/modules/phpmailer/controllers/admin_phpmailer.php
@@ -80,7 +80,7 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     $phpmailerSMTP->input("phpmailer_smtp_login")
                    ->label(t("SMTP Login Name"))
                    ->value(module::get_var("phpmailer", "smtp_login"));
-    $phpmailerSMTP->input("phpmailer_smtp_password")
+    $phpmailerSMTP->password("phpmailer_smtp_password")
                    ->label(t("SMTP Password"))
                    ->value(module::get_var("phpmailer", "smtp_password"));
 
diff --git a/3.1/modules/phpmailer/controllers/admin_phpmailer.php b/3.1/modules/phpmailer/controllers/admin_phpmailer.php
index d7b6941d..a35ae85e 100644
--- a/3.1/modules/phpmailer/controllers/admin_phpmailer.php
+++ b/3.1/modules/phpmailer/controllers/admin_phpmailer.php
@@ -80,7 +80,7 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     $phpmailerSMTP->input("phpmailer_smtp_login")
                    ->label(t("SMTP Login Name"))
                    ->value(module::get_var("phpmailer", "smtp_login"));
-    $phpmailerSMTP->input("phpmailer_smtp_password")
+    $phpmailerSMTP->password("phpmailer_smtp_password")
                    ->label(t("SMTP Password"))
                    ->value(module::get_var("phpmailer", "smtp_password"));
 

From 5c873ba9247e08be6626dfb48712245f3bbe4d75 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 18:50:40 -0400
Subject: [PATCH 12/18] Bug Fix for Ticket#1572 / eCard compatability.

---
 3.0/modules/phpmailer/libraries/Sendmail.php | 11 +++++++++++
 3.1/modules/phpmailer/libraries/Sendmail.php | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/3.0/modules/phpmailer/libraries/Sendmail.php b/3.0/modules/phpmailer/libraries/Sendmail.php
index 289f9aeb..798c28e4 100644
--- a/3.0/modules/phpmailer/libraries/Sendmail.php
+++ b/3.0/modules/phpmailer/libraries/Sendmail.php
@@ -115,6 +115,17 @@ class Sendmail_Core {
     $mail->FromName = module::get_var("phpmailer", "phpmailer_from_name");
     $mail->AddAddress($to); 
     $mail->IsHTML(true);
+	
+    // demdel's fix for the ecard module.
+    $boundaryLine = explode("\n", $message, -1);
+    $newboundary = substr($boundaryLine[0],2);
+    if (preg_match("/--/", $boundaryLine[0])) {
+      if (preg_match("/--".$newboundary."--/", end($boundaryLine))) {
+        $mail->CharSet = "UTF-8";
+        $mail->ContentType = "multipart/related; boundary=\"".$newboundary."\"";
+      }
+    }
+
     $mail->Subject = $subject;
     $mail->Body = $message;
 
diff --git a/3.1/modules/phpmailer/libraries/Sendmail.php b/3.1/modules/phpmailer/libraries/Sendmail.php
index 289f9aeb..798c28e4 100644
--- a/3.1/modules/phpmailer/libraries/Sendmail.php
+++ b/3.1/modules/phpmailer/libraries/Sendmail.php
@@ -115,6 +115,17 @@ class Sendmail_Core {
     $mail->FromName = module::get_var("phpmailer", "phpmailer_from_name");
     $mail->AddAddress($to); 
     $mail->IsHTML(true);
+	
+    // demdel's fix for the ecard module.
+    $boundaryLine = explode("\n", $message, -1);
+    $newboundary = substr($boundaryLine[0],2);
+    if (preg_match("/--/", $boundaryLine[0])) {
+      if (preg_match("/--".$newboundary."--/", end($boundaryLine))) {
+        $mail->CharSet = "UTF-8";
+        $mail->ContentType = "multipart/related; boundary=\"".$newboundary."\"";
+      }
+    }
+
     $mail->Subject = $subject;
     $mail->Body = $message;
 

From 11629c400394b03f65603b48a05c27550c3e0888 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 19:40:01 -0400
Subject: [PATCH 13/18] Increase version number to 2, set some default
 variables.

---
 .../phpmailer/helpers/phpmailer_installer.php | 41 +++++++++++++++++++
 3.0/modules/phpmailer/module.info             |  8 ++--
 .../phpmailer/helpers/phpmailer_installer.php | 41 +++++++++++++++++++
 3.1/modules/phpmailer/module.info             |  8 ++--
 4 files changed, 90 insertions(+), 8 deletions(-)
 create mode 100644 3.0/modules/phpmailer/helpers/phpmailer_installer.php
 create mode 100644 3.1/modules/phpmailer/helpers/phpmailer_installer.php

diff --git a/3.0/modules/phpmailer/helpers/phpmailer_installer.php b/3.0/modules/phpmailer/helpers/phpmailer_installer.php
new file mode 100644
index 00000000..8fb8b0cd
--- /dev/null
+++ b/3.0/modules/phpmailer/helpers/phpmailer_installer.php
@@ -0,0 +1,41 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2011 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class phpmailer_installer {
+  static function install() {
+    // Set the default value for this module's behavior.
+    module::set_var("phpmailer", "phpmailer_path", "/path/to/class.phpmailer.php");
+    module::set_var("phpmailer", "phpmailer_from_address", "example@gallery.com");
+    module::set_var("phpmailer", "phpmailer_from_name", "Gallery Administrator");
+    module::set_var("phpmailer", "smtp_server", "smtp.example.com");
+    module::set_var("phpmailer", "use_ssl", false);
+    module::set_var("phpmailer", "smtp_login", "");
+    module::set_var("phpmailer", "smtp_password", "");
+    module::set_var("phpmailer", "smtp_port", "25");
+
+    // Set the module's version number.
+    module::set_version("phpmailer", 2);
+  }
+
+  static function upgrade($version) {
+    module::set_var("phpmailer", "use_ssl", false);
+    module::set_var("phpmailer", "smtp_port", "25");
+    module::set_version("phpmailer", 2);
+  }
+}
diff --git a/3.0/modules/phpmailer/module.info b/3.0/modules/phpmailer/module.info
index c0b4add5..c8659374 100644
--- a/3.0/modules/phpmailer/module.info
+++ b/3.0/modules/phpmailer/module.info
@@ -1,7 +1,7 @@
 name = "PHPMailer"
 description = "Use PHPMailer when sending email messages."
-version = 1
-author_name = ""
-author_url = ""
+version = 2
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:phpmailer"
-discuss_url = "http://gallery.menalto.com/forum_module_phpmailer"
+discuss_url = "http://gallery.menalto.com/node/89279"
diff --git a/3.1/modules/phpmailer/helpers/phpmailer_installer.php b/3.1/modules/phpmailer/helpers/phpmailer_installer.php
new file mode 100644
index 00000000..8fb8b0cd
--- /dev/null
+++ b/3.1/modules/phpmailer/helpers/phpmailer_installer.php
@@ -0,0 +1,41 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2011 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class phpmailer_installer {
+  static function install() {
+    // Set the default value for this module's behavior.
+    module::set_var("phpmailer", "phpmailer_path", "/path/to/class.phpmailer.php");
+    module::set_var("phpmailer", "phpmailer_from_address", "example@gallery.com");
+    module::set_var("phpmailer", "phpmailer_from_name", "Gallery Administrator");
+    module::set_var("phpmailer", "smtp_server", "smtp.example.com");
+    module::set_var("phpmailer", "use_ssl", false);
+    module::set_var("phpmailer", "smtp_login", "");
+    module::set_var("phpmailer", "smtp_password", "");
+    module::set_var("phpmailer", "smtp_port", "25");
+
+    // Set the module's version number.
+    module::set_version("phpmailer", 2);
+  }
+
+  static function upgrade($version) {
+    module::set_var("phpmailer", "use_ssl", false);
+    module::set_var("phpmailer", "smtp_port", "25");
+    module::set_version("phpmailer", 2);
+  }
+}
diff --git a/3.1/modules/phpmailer/module.info b/3.1/modules/phpmailer/module.info
index c0b4add5..c8659374 100644
--- a/3.1/modules/phpmailer/module.info
+++ b/3.1/modules/phpmailer/module.info
@@ -1,7 +1,7 @@
 name = "PHPMailer"
 description = "Use PHPMailer when sending email messages."
-version = 1
-author_name = ""
-author_url = ""
+version = 2
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:phpmailer"
-discuss_url = "http://gallery.menalto.com/forum_module_phpmailer"
+discuss_url = "http://gallery.menalto.com/node/89279"

From cb174b20aa429c57b8c0a1bcaabb395cda02bac1 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 19:41:02 -0400
Subject: [PATCH 14/18] Add settings for SSL and SMTP port number.

---
 .../phpmailer/controllers/admin_phpmailer.php  | 18 +++++++++++++++++-
 .../phpmailer/controllers/admin_phpmailer.php  | 18 +++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/3.0/modules/phpmailer/controllers/admin_phpmailer.php b/3.0/modules/phpmailer/controllers/admin_phpmailer.php
index a35ae85e..dddc1b34 100644
--- a/3.0/modules/phpmailer/controllers/admin_phpmailer.php
+++ b/3.0/modules/phpmailer/controllers/admin_phpmailer.php
@@ -36,16 +36,26 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     $str_phpmailer_from_addr = Input::instance()->post("phpmailer_from_address");
     $str_phpmailer_from_name = Input::instance()->post("phpmailer_from_name");    
     $str_smtp_server = Input::instance()->post("phpmailer_smtp_server");
+    $str_use_ssl = Input::instance()->post("phpmailer_use_ssl");
     $str_smtp_login = Input::instance()->post("phpmailer_smtp_login");
     $str_smtp_pass = Input::instance()->post("phpmailer_smtp_password");
-        
+    $str_smtp_port = Input::instance()->post("phpmailer_smtp_port");
+
+    if (count($str_use_ssl) > 0) {
+      $str_use_ssl = true;
+    } else {
+      $str_use_ssl = false;
+    }
+	
     // Save Settings.
     module::set_var("phpmailer", "phpmailer_path", $str_phpmailer_path);
     module::set_var("phpmailer", "phpmailer_from_address", $str_phpmailer_from_addr);
     module::set_var("phpmailer", "phpmailer_from_name", $str_phpmailer_from_name);
     module::set_var("phpmailer", "smtp_server", $str_smtp_server);
+    module::set_var("phpmailer", "use_ssl", $str_use_ssl);
     module::set_var("phpmailer", "smtp_login", $str_smtp_login);
     module::set_var("phpmailer", "smtp_password", $str_smtp_pass);
+    module::set_var("phpmailer", "smtp_port", $str_smtp_port);
     message::success(t("Your Settings Have Been Saved."));
     
     // Load Admin page.
@@ -83,6 +93,12 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     $phpmailerSMTP->password("phpmailer_smtp_password")
                    ->label(t("SMTP Password"))
                    ->value(module::get_var("phpmailer", "smtp_password"));
+    $phpmailerSMTP->input("phpmailer_smtp_port")
+                   ->label(t("SMTP Port"))
+                   ->value(module::get_var("phpmailer", "smtp_port"));
+    $phpmailer_checklist["use_ssl_checkbox"] = array(t("Use SSL?"), module::get_var("phpmailer", "use_ssl"));
+    $phpmailerSMTP->checklist("phpmailer_use_ssl")
+                  ->options($phpmailer_checklist);
 
     // Add a save button to the form.
     $form->submit("SaveSettings")->value(t("Save"));
diff --git a/3.1/modules/phpmailer/controllers/admin_phpmailer.php b/3.1/modules/phpmailer/controllers/admin_phpmailer.php
index a35ae85e..dddc1b34 100644
--- a/3.1/modules/phpmailer/controllers/admin_phpmailer.php
+++ b/3.1/modules/phpmailer/controllers/admin_phpmailer.php
@@ -36,16 +36,26 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     $str_phpmailer_from_addr = Input::instance()->post("phpmailer_from_address");
     $str_phpmailer_from_name = Input::instance()->post("phpmailer_from_name");    
     $str_smtp_server = Input::instance()->post("phpmailer_smtp_server");
+    $str_use_ssl = Input::instance()->post("phpmailer_use_ssl");
     $str_smtp_login = Input::instance()->post("phpmailer_smtp_login");
     $str_smtp_pass = Input::instance()->post("phpmailer_smtp_password");
-        
+    $str_smtp_port = Input::instance()->post("phpmailer_smtp_port");
+
+    if (count($str_use_ssl) > 0) {
+      $str_use_ssl = true;
+    } else {
+      $str_use_ssl = false;
+    }
+	
     // Save Settings.
     module::set_var("phpmailer", "phpmailer_path", $str_phpmailer_path);
     module::set_var("phpmailer", "phpmailer_from_address", $str_phpmailer_from_addr);
     module::set_var("phpmailer", "phpmailer_from_name", $str_phpmailer_from_name);
     module::set_var("phpmailer", "smtp_server", $str_smtp_server);
+    module::set_var("phpmailer", "use_ssl", $str_use_ssl);
     module::set_var("phpmailer", "smtp_login", $str_smtp_login);
     module::set_var("phpmailer", "smtp_password", $str_smtp_pass);
+    module::set_var("phpmailer", "smtp_port", $str_smtp_port);
     message::success(t("Your Settings Have Been Saved."));
     
     // Load Admin page.
@@ -83,6 +93,12 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     $phpmailerSMTP->password("phpmailer_smtp_password")
                    ->label(t("SMTP Password"))
                    ->value(module::get_var("phpmailer", "smtp_password"));
+    $phpmailerSMTP->input("phpmailer_smtp_port")
+                   ->label(t("SMTP Port"))
+                   ->value(module::get_var("phpmailer", "smtp_port"));
+    $phpmailer_checklist["use_ssl_checkbox"] = array(t("Use SSL?"), module::get_var("phpmailer", "use_ssl"));
+    $phpmailerSMTP->checklist("phpmailer_use_ssl")
+                  ->options($phpmailer_checklist);
 
     // Add a save button to the form.
     $form->submit("SaveSettings")->value(t("Save"));

From 54339a22ca075b486c38dadf0005d60bb2024be6 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 19:57:45 -0400
Subject: [PATCH 15/18] Enable SSL support.

---
 3.0/modules/phpmailer/libraries/Sendmail.php | 8 ++++++--
 3.1/modules/phpmailer/libraries/Sendmail.php | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/3.0/modules/phpmailer/libraries/Sendmail.php b/3.0/modules/phpmailer/libraries/Sendmail.php
index 798c28e4..95ed8a9d 100644
--- a/3.0/modules/phpmailer/libraries/Sendmail.php
+++ b/3.0/modules/phpmailer/libraries/Sendmail.php
@@ -102,9 +102,13 @@ class Sendmail_Core {
 
     $mail->IsSMTP();
     $mail->Host = module::get_var("phpmailer", "smtp_server");
+    $mail->Port = module::get_var("phpmailer", "smtp_port");
 
     if (module::get_var("phpmailer", "smtp_login") != "") {
       $mail->SMTPAuth = true;
+      if (module::get_var("phpmailer", "use_ssl") == true) {
+        $mail->SMTPSecure = "ssl";
+      }
       $mail->Username = module::get_var("phpmailer", "smtp_login");
       $mail->Password = module::get_var("phpmailer", "smtp_password");
     } else {
@@ -115,7 +119,7 @@ class Sendmail_Core {
     $mail->FromName = module::get_var("phpmailer", "phpmailer_from_name");
     $mail->AddAddress($to); 
     $mail->IsHTML(true);
-	
+
     // demdel's fix for the ecard module.
     $boundaryLine = explode("\n", $message, -1);
     $newboundary = substr($boundaryLine[0],2);
@@ -131,4 +135,4 @@ class Sendmail_Core {
 
     return $mail->Send();
   }
-}
\ No newline at end of file
+}
diff --git a/3.1/modules/phpmailer/libraries/Sendmail.php b/3.1/modules/phpmailer/libraries/Sendmail.php
index 798c28e4..95ed8a9d 100644
--- a/3.1/modules/phpmailer/libraries/Sendmail.php
+++ b/3.1/modules/phpmailer/libraries/Sendmail.php
@@ -102,9 +102,13 @@ class Sendmail_Core {
 
     $mail->IsSMTP();
     $mail->Host = module::get_var("phpmailer", "smtp_server");
+    $mail->Port = module::get_var("phpmailer", "smtp_port");
 
     if (module::get_var("phpmailer", "smtp_login") != "") {
       $mail->SMTPAuth = true;
+      if (module::get_var("phpmailer", "use_ssl") == true) {
+        $mail->SMTPSecure = "ssl";
+      }
       $mail->Username = module::get_var("phpmailer", "smtp_login");
       $mail->Password = module::get_var("phpmailer", "smtp_password");
     } else {
@@ -115,7 +119,7 @@ class Sendmail_Core {
     $mail->FromName = module::get_var("phpmailer", "phpmailer_from_name");
     $mail->AddAddress($to); 
     $mail->IsHTML(true);
-	
+
     // demdel's fix for the ecard module.
     $boundaryLine = explode("\n", $message, -1);
     $newboundary = substr($boundaryLine[0],2);
@@ -131,4 +135,4 @@ class Sendmail_Core {
 
     return $mail->Send();
   }
-}
\ No newline at end of file
+}

From c48dab34d35822eddc654e6a5fb7a4f3a7eef33c Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Mon, 25 Apr 2011 20:01:40 -0400
Subject: [PATCH 16/18] Whitespace fixes.

---
 3.0/modules/phpmailer/controllers/admin_phpmailer.php | 6 +++---
 3.1/modules/phpmailer/controllers/admin_phpmailer.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/3.0/modules/phpmailer/controllers/admin_phpmailer.php b/3.0/modules/phpmailer/controllers/admin_phpmailer.php
index dddc1b34..b64248aa 100644
--- a/3.0/modules/phpmailer/controllers/admin_phpmailer.php
+++ b/3.0/modules/phpmailer/controllers/admin_phpmailer.php
@@ -46,7 +46,7 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     } else {
       $str_use_ssl = false;
     }
-	
+
     // Save Settings.
     module::set_var("phpmailer", "phpmailer_path", $str_phpmailer_path);
     module::set_var("phpmailer", "phpmailer_from_address", $str_phpmailer_from_addr);
@@ -57,7 +57,7 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     module::set_var("phpmailer", "smtp_password", $str_smtp_pass);
     module::set_var("phpmailer", "smtp_port", $str_smtp_port);
     message::success(t("Your Settings Have Been Saved."));
-    
+
     // Load Admin page.
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_phpmailer.html");
@@ -106,4 +106,4 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     // Return the newly generated form.
     return $form;
   }
-}
\ No newline at end of file
+}
diff --git a/3.1/modules/phpmailer/controllers/admin_phpmailer.php b/3.1/modules/phpmailer/controllers/admin_phpmailer.php
index dddc1b34..b64248aa 100644
--- a/3.1/modules/phpmailer/controllers/admin_phpmailer.php
+++ b/3.1/modules/phpmailer/controllers/admin_phpmailer.php
@@ -46,7 +46,7 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     } else {
       $str_use_ssl = false;
     }
-	
+
     // Save Settings.
     module::set_var("phpmailer", "phpmailer_path", $str_phpmailer_path);
     module::set_var("phpmailer", "phpmailer_from_address", $str_phpmailer_from_addr);
@@ -57,7 +57,7 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     module::set_var("phpmailer", "smtp_password", $str_smtp_pass);
     module::set_var("phpmailer", "smtp_port", $str_smtp_port);
     message::success(t("Your Settings Have Been Saved."));
-    
+
     // Load Admin page.
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_phpmailer.html");
@@ -106,4 +106,4 @@ class Admin_PHPMailer_Controller extends Admin_Controller {
     // Return the newly generated form.
     return $form;
   }
-}
\ No newline at end of file
+}

From b036be6534419ae05ff11ce23239977de1cf0b96 Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Tue, 26 Apr 2011 19:24:01 -0400
Subject: [PATCH 17/18] Bugfix:  Properly record map type on admin screen.

---
 3.0/modules/tagsmap/controllers/admin_tagsmap.php | 8 ++++++--
 3.1/modules/tagsmap/controllers/admin_tagsmap.php | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/3.0/modules/tagsmap/controllers/admin_tagsmap.php b/3.0/modules/tagsmap/controllers/admin_tagsmap.php
index 8c9b643a..40d87119 100644
--- a/3.0/modules/tagsmap/controllers/admin_tagsmap.php
+++ b/3.0/modules/tagsmap/controllers/admin_tagsmap.php
@@ -206,8 +206,12 @@ class Admin_TagsMap_Controller extends Admin_Controller {
     $startingmap_group->dropdown("google_default_type")
       ->label(t("Default Map Type"))
       ->options(
-        array("G_NORMAL_MAP", "G_SATELLITE_MAP", "G_HYBRID_MAP",
-              "G_PHYSICAL_MAP", "G_SATELLITE_3D_MAP"));
+        array("G_NORMAL_MAP" => "Normal", 
+              "G_SATELLITE_MAP" => "Satellite", 
+              "G_HYBRID_MAP" => "Hybrid",
+              "G_PHYSICAL_MAP" => "Physical", 
+              "G_SATELLITE_3D_MAP" => "Google Earth"))
+      ->selected(module::get_var("tagsmap", "googlemap_type"));
 
     // Add a save button to the form.
     $form->submit("SaveSettings")->value(t("Save"));
diff --git a/3.1/modules/tagsmap/controllers/admin_tagsmap.php b/3.1/modules/tagsmap/controllers/admin_tagsmap.php
index 8c9b643a..40d87119 100644
--- a/3.1/modules/tagsmap/controllers/admin_tagsmap.php
+++ b/3.1/modules/tagsmap/controllers/admin_tagsmap.php
@@ -206,8 +206,12 @@ class Admin_TagsMap_Controller extends Admin_Controller {
     $startingmap_group->dropdown("google_default_type")
       ->label(t("Default Map Type"))
       ->options(
-        array("G_NORMAL_MAP", "G_SATELLITE_MAP", "G_HYBRID_MAP",
-              "G_PHYSICAL_MAP", "G_SATELLITE_3D_MAP"));
+        array("G_NORMAL_MAP" => "Normal", 
+              "G_SATELLITE_MAP" => "Satellite", 
+              "G_HYBRID_MAP" => "Hybrid",
+              "G_PHYSICAL_MAP" => "Physical", 
+              "G_SATELLITE_3D_MAP" => "Google Earth"))
+      ->selected(module::get_var("tagsmap", "googlemap_type"));
 
     // Add a save button to the form.
     $form->submit("SaveSettings")->value(t("Save"));

From 2a121f0311e2a3a3233c24c49f76f20373418c3e Mon Sep 17 00:00:00 2001
From: rWatcher <rwatcher@watcherdatabase.tk>
Date: Tue, 26 Apr 2011 19:30:16 -0400
Subject: [PATCH 18/18] Tagsmap module.info update.

---
 3.0/modules/tagsmap/module.info | 6 +++---
 3.1/modules/tagsmap/module.info | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/3.0/modules/tagsmap/module.info b/3.0/modules/tagsmap/module.info
index c3165b8a..827de3eb 100644
--- a/3.0/modules/tagsmap/module.info
+++ b/3.0/modules/tagsmap/module.info
@@ -1,7 +1,7 @@
 name = "TagsMap"
 description = "Assign GPS coordinates to existing tags and display them on a map."
 version = 2
-author_name = ""
-author_url = ""
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:tagsmap"
-discuss_url = "http://gallery.menalto.com/forum_module_tagsmap"
+discuss_url = "http://gallery.menalto.com/node/89338"
diff --git a/3.1/modules/tagsmap/module.info b/3.1/modules/tagsmap/module.info
index c3165b8a..827de3eb 100644
--- a/3.1/modules/tagsmap/module.info
+++ b/3.1/modules/tagsmap/module.info
@@ -1,7 +1,7 @@
 name = "TagsMap"
 description = "Assign GPS coordinates to existing tags and display them on a map."
 version = 2
-author_name = ""
-author_url = ""
+author_name = "rWatcher"
+author_url = "http://codex.gallery2.org/User:RWatcher"
 info_url = "http://codex.gallery2.org/Gallery3:Modules:tagsmap"
-discuss_url = "http://gallery.menalto.com/forum_module_tagsmap"
+discuss_url = "http://gallery.menalto.com/node/89338"