From ff0b66a1a4ed189c3e02a8ad50a63f4d65b3bfa7 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 12 Jul 2009 22:53:47 -0600
Subject: Put owner's url into user link. Seems better than displaying email
 until we have something like a user profile page.

---
 modules/info/helpers/info_theme.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'modules/info')

diff --git a/modules/info/helpers/info_theme.php b/modules/info/helpers/info_theme.php
index 863317a8..51378e54 100644
--- a/modules/info/helpers/info_theme.php
+++ b/modules/info/helpers/info_theme.php
@@ -37,7 +37,11 @@ class info_theme_Core {
     }
     if ($item->owner) {
       $results .= "<li>";
-      $results .= t("By: %owner_name", array("owner_name" => "<a href=\"#\">{$item->owner->full_name}</a>"));
+      if ($item->owner->url) {
+        $results .= t("By: %owner_name", array("owner_name" => "<a href=\"{$item->owner->url}\">{$item->owner->full_name}</a>"));
+      } else {
+        $results .= t("By: %owner_name", array("owner_name" => "{$item->owner->full_name}"));
+      }
       $results .= "</li>";
     }
     return $results;
-- 
cgit v1.2.3


From e2a9a1d28459b96e412004df4d4ec010fb9b30e2 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 13 Jul 2009 10:36:55 -0700
Subject: Add quotes around all values that contain spaces in them, and add a
 test to make sure that we continue to do so.

This makes sure that we don't have problems with 5.3 which treats the
literal "on" as a boolean.
---
 modules/akismet/module.info                   |  2 +-
 modules/comment/module.info                   |  2 +-
 modules/digibug/module.info                   |  4 +--
 modules/exif/module.info                      |  2 +-
 modules/g2_import/module.info                 |  4 +--
 modules/gallery/module.info                   |  4 +--
 modules/gallery/tests/File_Structure_Test.php | 37 +++++++++++++++++++++++++++
 modules/image_block/module.info               |  4 +--
 modules/info/module.info                      |  4 +--
 modules/notification/module.info              |  2 +-
 modules/organize/module.info                  |  4 +--
 modules/recaptcha/module.info                 |  2 +-
 modules/rss/module.info                       |  4 +--
 modules/search/module.info                    |  4 +--
 modules/server_add/module.info                |  4 +--
 modules/slideshow/module.info                 |  4 +--
 modules/tag/module.info                       |  4 +--
 modules/user/module.info                      |  4 +--
 modules/watermark/module.info                 |  4 +--
 themes/admin_default/theme.info               |  6 ++---
 themes/default/theme.info                     |  6 ++---
 21 files changed, 74 insertions(+), 37 deletions(-)

(limited to 'modules/info')

diff --git a/modules/akismet/module.info b/modules/akismet/module.info
index d45d8a7b..b61ed107 100644
--- a/modules/akismet/module.info
+++ b/modules/akismet/module.info
@@ -1,3 +1,3 @@
-name = Akismet
+name = "Akismet"
 description = "Filter comments through the Akismet web service to detect and eliminate spam (http://akismet.com).  You'll need a WordPress.com API key to use it."
 version = 1
diff --git a/modules/comment/module.info b/modules/comment/module.info
index 55997317..c371cf27 100644
--- a/modules/comment/module.info
+++ b/modules/comment/module.info
@@ -1,3 +1,3 @@
-name = Comments
+name = "Comments"
 description = "Allows users and guests to leave comments on photos and albums."
 version = 2
diff --git a/modules/digibug/module.info b/modules/digibug/module.info
index c25a2454..be4e880a 100644
--- a/modules/digibug/module.info
+++ b/modules/digibug/module.info
@@ -1,3 +1,3 @@
-name = Digibug
-description = Digibug Photo Printing Module
+name = "Digibug"
+description = "Digibug Photo Printing Module"
 version = 2
diff --git a/modules/exif/module.info b/modules/exif/module.info
index 1e16a5ff..c8ae688e 100644
--- a/modules/exif/module.info
+++ b/modules/exif/module.info
@@ -1,3 +1,3 @@
-name = Exif Data
+name = "Exif Data"
 description = "Extract Exif data and display it on photo pages."
 version = 1
diff --git a/modules/g2_import/module.info b/modules/g2_import/module.info
index 9e04f49b..554cf33b 100644
--- a/modules/g2_import/module.info
+++ b/modules/g2_import/module.info
@@ -1,3 +1,3 @@
-name = Gallery2 Import
-description = Import your Gallery 2 content into Gallery 3
+name = "Gallery2 Import"
+description = "Import your Gallery 2 content into Gallery 3"
 version = 1
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index c184aba7..64a30b1f 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,3 +1,3 @@
-name = Gallery 3
-description = Gallery core application
+name = "Gallery 3"
+description = "Gallery core application"
 version = 6
diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 06f456ff..8a97e00b 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -213,6 +213,43 @@ class File_Structure_Test extends Unit_Test_Case {
       }
     }
   }
+
+  public function module_info_is_well_formed_test() {
+    $info_files = array_merge(
+      glob("modules/*/module.info"),
+      glob("themes/*/module.info"));
+
+    $errors = array();
+    foreach ($info_files as $file) {
+      foreach (file($file) as $line) {
+        $parts = explode("=", $line, 2);
+        $values[trim($parts[0])] = trim($parts[1]);
+      }
+
+      $module = dirname($file);
+      // Certain keys must exist
+      foreach (array("name", "description", "version") as $key) {
+        if (!array_key_exists($key, $values)) {
+          $errors[] = "$module: missing key $key";
+        }
+      }
+
+      // Any values containing spaces must be quoted
+      foreach ($values as $key => $value) {
+        if (strpos($value, " ") !== false && !preg_match('/^".*"$/', $value)) {
+          $errors[] = "$module: value for $key must be quoted";
+        }
+      }
+
+      // The file must parse
+      if (!is_array(parse_ini_file($file))) {
+        $errors[] = "$module: info file is not parseable";
+      }
+    }
+    if ($errors) {
+      $this->assert_true(false, $errors);
+    }
+  }
 }
 
 class PhpCodeFilterIterator extends FilterIterator {
diff --git a/modules/image_block/module.info b/modules/image_block/module.info
index 8852d33c..e6d85048 100644
--- a/modules/image_block/module.info
+++ b/modules/image_block/module.info
@@ -1,3 +1,3 @@
-name = Image Block
-description = Display a random image in the sidebar
+name = "Image Block"
+description = "Display a random image in the sidebar"
 version = 1
diff --git a/modules/info/module.info b/modules/info/module.info
index ce03473e..e352213c 100644
--- a/modules/info/module.info
+++ b/modules/info/module.info
@@ -1,3 +1,3 @@
-name = Info
-description = Display extra information about photos and albums
+name = "Info"
+description = "Display extra information about photos and albums"
 version = 1
diff --git a/modules/notification/module.info b/modules/notification/module.info
index d4dc34e0..31684ccf 100644
--- a/modules/notification/module.info
+++ b/modules/notification/module.info
@@ -1,3 +1,3 @@
-name = Notification
+name = "Notification"
 description = "Send notifications to users when changes are made to watched albums."
 version = 1
diff --git a/modules/organize/module.info b/modules/organize/module.info
index b3ae94a3..5c6b1de0 100644
--- a/modules/organize/module.info
+++ b/modules/organize/module.info
@@ -1,3 +1,3 @@
-name = Organize
-description = Organize your gallery by apply tags or moving images
+name = "Organize"
+description = "Organize your gallery by apply tags or moving images"
 version = 1
diff --git a/modules/recaptcha/module.info b/modules/recaptcha/module.info
index 9f44648a..cfa1bf7a 100644
--- a/modules/recaptcha/module.info
+++ b/modules/recaptcha/module.info
@@ -1,3 +1,3 @@
-name = reCAPTCHA
+name = "reCAPTCHA"
 description = "reCAPTCHA displays a graphical verification that protects the input form from abuse from 'bots,' or automated programs usually written to generate spam (http://recaptcha.net)."
 version = 1
diff --git a/modules/rss/module.info b/modules/rss/module.info
index ffd26192..81ee7848 100644
--- a/modules/rss/module.info
+++ b/modules/rss/module.info
@@ -1,3 +1,3 @@
-name = RSS
-description = Provide a RSS feeds
+name = "RSS"
+description = "Provide a RSS feeds"
 version = 1
diff --git a/modules/search/module.info b/modules/search/module.info
index b286ab6c..f417c4fa 100644
--- a/modules/search/module.info
+++ b/modules/search/module.info
@@ -1,3 +1,3 @@
-name = Search
-description = Allows users to search their Gallery
+name = "Search"
+description = "Allows users to search their Gallery"
 version = 1
diff --git a/modules/server_add/module.info b/modules/server_add/module.info
index 295d3beb..23acab94 100644
--- a/modules/server_add/module.info
+++ b/modules/server_add/module.info
@@ -1,3 +1,3 @@
-name = Server Add
-description = Allows authorized users to load images directly from your web server
+name = "Server Add"
+description = "Allows authorized users to load images directly from your web server"
 version = 3
diff --git a/modules/slideshow/module.info b/modules/slideshow/module.info
index 5eb69ce3..6841199a 100644
--- a/modules/slideshow/module.info
+++ b/modules/slideshow/module.info
@@ -1,3 +1,3 @@
-name = Slideshow
-description = Allows users to view a slideshow of photos
+name = "Slideshow"
+description = "Allows users to view a slideshow of photos"
 version = 1
diff --git a/modules/tag/module.info b/modules/tag/module.info
index 562d5c32..e505dd81 100644
--- a/modules/tag/module.info
+++ b/modules/tag/module.info
@@ -1,3 +1,3 @@
-name = Tags
-description = Allows users to tag photos and albums
+name = "Tags"
+description = "Allows users to tag photos and albums"
 version = 1
diff --git a/modules/user/module.info b/modules/user/module.info
index 2dba517d..8a9af407 100644
--- a/modules/user/module.info
+++ b/modules/user/module.info
@@ -1,3 +1,3 @@
-name = Users and Groups
-description = Provides user and group management
+name = "Users and Groups"
+description = "Provides user and group management"
 version = 1
diff --git a/modules/watermark/module.info b/modules/watermark/module.info
index 7f866695..abd4a3cf 100644
--- a/modules/watermark/module.info
+++ b/modules/watermark/module.info
@@ -1,3 +1,3 @@
-name = Watermarks
-description = Allows users to watermark their photos
+name = "Watermarks"
+description = "Allows users to watermark their photos"
 version = 1
diff --git a/themes/admin_default/theme.info b/themes/admin_default/theme.info
index d21b0ff5..b3d9741d 100644
--- a/themes/admin_default/theme.info
+++ b/themes/admin_default/theme.info
@@ -1,6 +1,6 @@
-name = Gallery Default
-description = A crisp Site Administration theme with soft colors and drop down menus.
+name = "Gallery Default"
+description = "A crisp Site Administration theme with soft colors and drop down menus."
 version = 1
-author = Gallery Team
+author = "Gallery Team"
 admin = 1
 site = 0
diff --git a/themes/default/theme.info b/themes/default/theme.info
index 71e8a740..5f19d0d7 100644
--- a/themes/default/theme.info
+++ b/themes/default/theme.info
@@ -1,6 +1,6 @@
-name = Gallery Default
-description = A crisp and distinctive theme that uses large fonts and icons for easy navigation and an enjoyable browsing experience.
+name = "Gallery Default"
+description = "A crisp and distinctive theme that uses large fonts and icons for easy navigation and an enjoyable browsing experience."
 version = 1
-author = Gallery Team
+author = "Gallery Team"
 site = 1
 admin = 0
-- 
cgit v1.2.3


From 51dca582cd2cda9416ec0172f8ed9a19ba828fec Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 19 Jul 2009 16:50:35 -0700
Subject: More thorough fix for #421.  Create User_Model::display_name() which
 uses the full name if there is one, or falls back to the name if that's all
 we have.

---
 modules/info/views/info_block.html.php | 4 ++--
 modules/user/models/user.php           | 9 +++++++++
 modules/user/views/login.html.php      | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'modules/info')

diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index 9f544376..f86ae39d 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -26,9 +26,9 @@
   <li>
     <strong class="caption"><?= t("Owner:") ?></strong>
     <? if ($item->owner->url): ?>
-    <a href="<?= $item->owner->url ?>"><?= p::clean($item->owner->full_name) ?></a>
+    <a href="<?= $item->owner->url ?>"><?= p::clean($item->owner->display_name()) ?></a>
     <? else: ?>
-    <?= p::clean($item->owner->name) ?>
+    <?= p::clean($item->owner->display_name()) ?>
     <? endif ?>
   </li>
   <? endif ?>
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 0234f186..def65a6f 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -72,4 +72,13 @@ class User_Model extends ORM {
     }
     return $this;
   }
+
+  /**
+   * Return the best version of the user's name.  Either their specified full name, or fall back
+   * to the user name.
+   * @return string
+   */
+  public function display_name() {
+    return empty($this->full_name) ? $this->name : $this->full_name;
+  }
 }
\ No newline at end of file
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php
index 7617d131..4c1a5b3c 100644
--- a/modules/user/views/login.html.php
+++ b/modules/user/views/login.html.php
@@ -12,7 +12,7 @@
     '<a href="' . url::site("form/edit/users/{$user->id}") .
       '" title="' . t("Edit Your Profile") .
       '" id="gUserProfileLink" class="gDialogLink">' .
-      p::clean(empty($user->full_name) ? $user->name : $user->full_name) . '</a>')) ?>
+      p::clean($user->display_name()) . '</a>')) ?>
   </li>
   <li>
     <a href="<?= url::site("logout?csrf=$csrf&continue=" . url::current(true)) ?>"
-- 
cgit v1.2.3


From ddddfc5e8e505f83276acaa89057d5b9a9f6426f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Thu, 27 Aug 2009 14:27:49 -0600
Subject: Make the info block display 'File name', instead of 'Folder name'
 when showing a photo. Fixes #631

---
 modules/info/views/info_block.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/info')

diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php
index f86ae39d..762e989b 100644
--- a/modules/info/views/info_block.html.php
+++ b/modules/info/views/info_block.html.php
@@ -12,7 +12,7 @@
   <? endif ?>
   <? if ($item->id != 1): ?>
   <li>
-    <strong class="caption"><?= t("Folder name:") ?></strong>
+    <strong class="caption"><?= $theme->page_type == 'album' ?  t("Folder name:"): t("File name:"); ?></strong>
     <?= p::clean($item->name) ?>
   </li>
   <? endif ?>
-- 
cgit v1.2.3