From a11bf295078656612603c1c561e9261555d0c40c Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 9 Jan 2010 23:57:16 -0800
Subject: Fix for ticket #972 and more.  In Kohana 2.4, ORM::delete_all ignores
 any where clauses and deletes all the entries in the table unless an array of
 id's are passed as the parameter.  This fix used the Database_builder to
 specify any where conditions. Thanks psvo for find the first one. :-)

---
 modules/comment/controllers/admin_comments.php      | 5 +++--
 modules/gallery/helpers/graphics.php                | 5 +++--
 modules/gallery/tests/Gallery_I18n_Test.php         | 5 +++--
 modules/notification/helpers/notification_event.php | 5 +++--
 modules/rest/helpers/rest_event.php                 | 5 +++--
 modules/search/helpers/search_event.php             | 5 +++--
 modules/server_add/controllers/server_add.php       | 5 ++++-
 7 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'modules')

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index 880c33a7..b7dc5fb3 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -121,9 +121,10 @@ class Admin_Comments_Controller extends Admin_Controller {
   public function delete_all_spam() {
     access::verify_csrf();
 
-    ORM::factory("comment")
+    db::build()
+      ->delete("comments")
       ->where("state", "=", "spam")
-      ->delete_all();
+      ->execute();
     url::redirect("admin/comments/queue/spam");
   }
 }
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 7577d7ac..5a290905 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -60,11 +60,12 @@ class graphics_Core {
    * @param string  $operation   the name of the operation(<defining class>::method)
    */
   static function remove_rule($module_name, $target, $operation) {
-    ORM::factory("graphics_rule")
+    db::build()
+      ->delete("graphics_rules")
       ->where("module_name", "=", $module_name)
       ->where("target", "=", $target)
       ->where("operation", "=", $operation)
-      ->delete_all();
+      ->execute();
 
     self::mark_dirty($target == "thumb", $target == "resize");
   }
diff --git a/modules/gallery/tests/Gallery_I18n_Test.php b/modules/gallery/tests/Gallery_I18n_Test.php
index 895e3051..5d2fd994 100644
--- a/modules/gallery/tests/Gallery_I18n_Test.php
+++ b/modules/gallery/tests/Gallery_I18n_Test.php
@@ -28,9 +28,10 @@ class Gallery_I18n_Test extends Unit_Test_Case {
         'locale_dir' => VARPATH . 'locale/');
     $this->i18n = Gallery_I18n::instance($config);
 
-    ORM::factory("incoming_translation")
+    db::build()
+      ->delete("incoming_translations")
       ->where("locale", "=", "te_ST")
-      ->delete_all();
+      ->execute();
 
     $messages_te_ST = array(
         array('Hello world', 'Hallo Welt'),
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index 2c7ede27..bc1303f5 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -89,9 +89,10 @@ class notification_event_Core {
 
   static function user_before_delete($user) {
     try {
-      ORM::factory("subscription")
+      db::build()
+        ->delete("subscriptions")
         ->where("user_id", "=", $user->id)
-        ->delete_all();
+        ->execute();
     } catch (Exception $e) {
       Kohana_Log::add("error", "@todo notification_event::user_before_delete() failed");
       Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
diff --git a/modules/rest/helpers/rest_event.php b/modules/rest/helpers/rest_event.php
index 00cea7eb..860c8e41 100644
--- a/modules/rest/helpers/rest_event.php
+++ b/modules/rest/helpers/rest_event.php
@@ -23,9 +23,10 @@ class rest_event {
    * the user_homes directory.
    */
   static function user_before_delete($user) {
-     ORM::factory("user_access_token")
+    db::build()
+      ->delete("user_access_tokens")
        ->where("id", "=", $user->id)
-       ->delete_all();
+       ->execute();
   }
 
   /**
diff --git a/modules/search/helpers/search_event.php b/modules/search/helpers/search_event.php
index 1add6e5f..97041f8c 100644
--- a/modules/search/helpers/search_event.php
+++ b/modules/search/helpers/search_event.php
@@ -27,9 +27,10 @@ class search_event_Core {
   }
 
   static function item_deleted($item) {
-    ORM::factory("search_record")
+    db::build()
+      ->delete("search_records")
       ->where("item_id", "=", $item->id)
-      ->delete_all();
+      ->execute();
   }
 
   static function item_related_update($item) {
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index f6e3a4dd..d7572b52 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -266,7 +266,10 @@ class Server_Add_Controller extends Admin_Controller {
       $task->done = true;
       $task->state = "success";
       $task->percent_complete = 100;
-      ORM::factory("server_add_file")->where("task_id", "=", $task->id)->delete_all();
+      db::build()
+        ->delete("server_add_files")
+        ->where("task_id", "=", $task->id)
+        ->execute();
       message::info(t2("Successfully added one photo / album",
                        "Successfully added %count photos / albums",
                        $task->get("completed_files")));
-- 
cgit v1.2.3


From 3ab6c4915aa0c9dbd2061ffcad0af00e2c50136e Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 11 Jan 2010 10:42:39 -0800
Subject: Fixes ticket #671. In the graphics_rules table height and width set
 the maximum height and width values and should be equal.  Initially, the
 height on the resize target rule was less than the height, which artificially
 constrained images in portrait mode.

**Note"" this fix requires an upgrade to version 22.  All the resizes will be flagged
dirty.
---
 installer/install.sql                         |  2 +-
 modules/gallery/helpers/gallery_installer.php | 19 ++++++++++++++++++-
 modules/gallery/module.info                   |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/installer/install.sql b/installer/install.sql
index 6e7c06a2..95a57d86 100644
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -89,7 +89,7 @@ CREATE TABLE {graphics_rules} (
 ) AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
 INSERT INTO {graphics_rules} VALUES (1,1,'a:3:{s:5:\"width\";i:200;s:6:\"height\";i:200;s:6:\"master\";i:2;}','gallery','gallery_graphics::resize',100,'thumb');
-INSERT INTO {graphics_rules} VALUES (2,1,'a:3:{s:5:\"width\";i:640;s:6:\"height\";i:480;s:6:\"master\";i:2;}','gallery','gallery_graphics::resize',100,'resize');
+INSERT INTO {graphics_rules} VALUES (2,1,'a:3:{s:5:\"width\";i:640;s:6:\"height\";i:640;s:6:\"master\";i:2;}','gallery','gallery_graphics::resize',100,'resize');
 DROP TABLE IF EXISTS {groups};
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 410b6413..02ce1b18 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -240,7 +240,7 @@ class gallery_installer {
       100);
     graphics::add_rule(
       "gallery", "resize", "gallery_graphics::resize",
-      array("width" => 640, "height" => 480, "master" => Image::AUTO),
+      array("width" => 640, "height" => 640, "master" => Image::AUTO),
       100);
 
     // Instantiate default themes (site and admin)
@@ -440,6 +440,23 @@ class gallery_installer {
       module::set_var("gallery", "simultaneous_upload_limit", 5);
       module::set_version("gallery", $version = 21);
     }
+
+    // Update the graphics rules table so that the maximum height for resizes is 640 not 480.
+    // Fixes ticket #671
+    if ( $version == 21) {
+      $resize_rule = ORM::factory("graphics_rule")
+        ->where("id", "=", "2")
+        ->find();
+      // make sure it hasn't been changed already
+      $args = unserialize($resize_rule->args);
+      if ($args["height"] == 480 && $args["width"] == 640) {
+        $args["height"] = 640;
+        $resize_rule->args = serialize($args);
+        $resize_rule->save();
+        graphics::mark_dirty(false, true);
+      }
+      module::set_version("gallery", $version = 22);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/gallery/module.info b/modules/gallery/module.info
index b3366f7d..107d9a12 100644
--- a/modules/gallery/module.info
+++ b/modules/gallery/module.info
@@ -1,4 +1,4 @@
 name = "Gallery 3"
 description = "Gallery core application"
-version = 21
+version = 22
 
-- 
cgit v1.2.3


From 284e14d50e33fb6a1ef0ce00444f216fcdbeb904 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 11 Jan 2010 10:48:27 -0800
Subject: Remove the automatically marking the resizes dirty line as this could
 cause alot of pain to some installations

---
 modules/gallery/helpers/gallery_installer.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_installer.php b/modules/gallery/helpers/gallery_installer.php
index 02ce1b18..1e0ad28c 100644
--- a/modules/gallery/helpers/gallery_installer.php
+++ b/modules/gallery/helpers/gallery_installer.php
@@ -453,7 +453,6 @@ class gallery_installer {
         $args["height"] = 640;
         $resize_rule->args = serialize($args);
         $resize_rule->save();
-        graphics::mark_dirty(false, true);
       }
       module::set_version("gallery", $version = 22);
     }
-- 
cgit v1.2.3


From 2b283f4d011a7a67f306e11e590b499242a0774b Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 11 Jan 2010 13:26:10 -0800
Subject: Remove the translation submit button from translation search form. 
 Fixes ticket #975

---
 modules/gallery/controllers/l10n_client.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 71df1cf1..d22b6299 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -102,10 +102,9 @@ class L10n_Client_Controller extends Controller {
   }
 
   private static function _l10n_client_search_form() {
-    $form = new Forge("l10n_client/search", "", "post", array("id" => "g-l10n-search-form"));
+    $form = new Forge("#", "", "post", array("id" => "g-l10n-search-form"));
     $group = $form->group("l10n_search");
     $group->input("l10n-search")->id("g-l10n-search");
-    $group->submit("l10n-search-filter-clear")->value(t("X"));
 
     return $form;
   }
-- 
cgit v1.2.3


From 3b26d87f3a8fdcf4dc0b86e2b2d72476356c411a Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 11 Jan 2010 14:22:16 -0800
Subject: Reformat the string list so that the search box does not get push off
 the end of the page.

---
 modules/gallery/css/l10n_client.css | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/css/l10n_client.css b/modules/gallery/css/l10n_client.css
index 542da8e6..3771c049 100644
--- a/modules/gallery/css/l10n_client.css
+++ b/modules/gallery/css/l10n_client.css
@@ -86,7 +86,7 @@
 }
 
 #l10n-client .string-list {
-  height:17em;
+  height: 16em;
   overflow:auto;
   list-style:none; list-style-image:none;
   margin:0em; padding:0em;}
@@ -129,10 +129,9 @@
   font-weight:bold;}
 
 #l10n-client #g-l10n-search-form {
-  background:#eee;
-  text-align:center;
-  height:2em; line-height:2em;
-  margin:0em; padding:.5em .5em;
+  background: #eee;
+  margin: 0em;
+  padding: .25em .25em;
 }
 
 #l10n-client #g-l10n-search-form .form-item,
@@ -148,8 +147,14 @@
   padding:0em;
 }
 
-#l10n-client #g-l10n-search-form input.form-text {
-  width:80%;
+#l10n-client #g-l10n-search-form fieldset {
+  margin-bottom: 0;
+  padding: .25em .25em;
+}
+
+
+#l10n-client #g-l10n-search-form input {
+  width: 96.75%;
 }
 
 #l10n-client #g-l10n-search-form #search-filter-clear {
@@ -164,7 +169,9 @@
 
 #l10n-client-string-editor .source {
   overflow:hidden;
-  width:50%; float:left;}
+  width:50%;
+  float:left;
+}
 
 #l10n-client-string-editor .source .source-text {
   line-height:1.5em;
@@ -178,10 +185,13 @@
 
 #l10n-client-string-editor .translation {
   overflow:hidden;
-  width:49%; float:right;}
+  width:49%;
+  float: right;
+}
 
 #g-l10n-client-save-form {
-  padding:0em;}
+  padding: 0em;
+}
 
 #l10n-client form ul,
 #l10n-client form li,
-- 
cgit v1.2.3


From 3dfac5884ff0661d680293f9888f9ab42e9ebd19 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 12 Jan 2010 08:31:28 -0800
Subject: Add a css id attribute to the i10n-edit-translation element.  Fixes
 ticket #969.

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

(limited to 'modules')

diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index 9d14bbb2..47a45e29 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -40,7 +40,7 @@
       <form method="post" action="<?= url::site("l10n_client/save") ?>" id="g-l10n-client-save-form">
         <?= access::csrf_form_field() ?>
         <?= form::hidden("l10n-message-key") ?>
-        <?= form::textarea("l10n-edit-translation", "", ' rows="5" class="translationField"') ?>
+        <?= form::textarea("l10n-edit-translation", "", ' id="l10n-edit-translation" rows="5" class="translationField"') ?>
         <div id="plural-zero" class="translationField hidden">
           <label for="l10n-edit-plural-translation-zero">[zero]</label>
           <?= form::textarea("l10n-edit-plural-translation-zero", "", ' rows="2"') ?>
-- 
cgit v1.2.3


From 9ff9d70fe23efdc76bb0a3aaaaa3c8e06166797e Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 12 Jan 2010 08:32:33 -0800
Subject: Some whitespace and syntax corrects

---
 modules/gallery/js/l10n_client.js | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index 9acb6ca8..58032a48 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -17,7 +17,6 @@ $(document).ready(function() {
   Gallery.attachBehaviors(this);
 });
 
-
 // Store all l10n_client related data + methods in its own object
 jQuery.extend(Gallery, {
   l10nClient: new (function() {
@@ -51,7 +50,8 @@ jQuery.extend(Gallery, {
           this.filter(false);
         break;
       }
-    }
+    };
+
     // Toggle the l10nclient
     this.toggle = function(state) {
       switch(state) {
@@ -82,15 +82,18 @@ jQuery.extend(Gallery, {
           $.cookie('Gallery_l10n_client', '0', {expires: 7, path: '/'});
         break;
       }
-    }
+    };
+
     // Get a string from the DOM tree
     this.getString = function(index, type) {
       return l10n_client_data[index][type];
-    }
+    };
+
     // Set a string in the DOM tree
     this.setString = function(index, data) {
       l10n_client_data[index]['translation'] = data;
-    }
+    };
+
     // Display the source message
     this.showSourceMessage = function(source, is_plural) {
       if (is_plural) {
@@ -101,10 +104,11 @@ jQuery.extend(Gallery, {
         var pretty_source = $('#source-text-tmp-space').text(source).html();
       }
       $('#l10n-client-string-editor .source-text').html(pretty_source);
-    }
+    };
     this.isPluralMessage = function(message) {
       return typeof(message) == 'object';
-    }
+    };
+
     this.updateTranslationForm = function(translation, is_plural) {
       $('.translationField').addClass('hidden');
       if (is_plural) {
@@ -122,10 +126,11 @@ jQuery.extend(Gallery, {
           $('#plural-' + form).removeClass('hidden');
         }
       } else {
-          $('#l10n-edit-translation').attr('value', translation);
+        $('#l10n-edit-translation').attr('value', translation);
         $('#l10n-edit-translation').removeClass('hidden');
       }
-    }
+    };
+
     // Filter the string list by a search string
     this.filter = function(search) {
       if(search == false || search == '') {
@@ -140,7 +145,7 @@ jQuery.extend(Gallery, {
           $('#l10n-client #g-l10n-search').val(search);
         }
       }
-    }
+    };
 
     this.copySourceText = function() {
       var index  = Gallery.l10nClient.selected;
@@ -166,7 +171,7 @@ jQuery.extend(Gallery, {
         }
 
       }
-    }
+    };
   })
 });
 
@@ -205,8 +210,8 @@ Gallery.behaviors.l10nClient = function(context) {
       Gallery.l10nClient.toggle(0);
     }
   });
-	
-	// Close the l10n client using an AJAX call and refreshing the page
+
+  // Close the l10n client using an AJAX call and refreshing the page
   $('#g-close-l10n').click(function(event) {
 		$.ajax({
       type: "GET",
@@ -222,8 +227,8 @@ Gallery.behaviors.l10nClient = function(context) {
   // Register keybindings using jQuery hotkeys
   // TODO: Either remove hotkeys code or add query.hotkeys.js.
   if($.hotkeys) {
-    $.hotkeys.add(Gallery.l10nClient.keys['toggle'], function(){Gallery.l10nClient.key('toggle')});
-    $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #g-l10n-search', type:'keyup'}, function(){Gallery.l10nClient.key('clear')});
+    $.hotkeys.add(Gallery.l10nClient.keys['toggle'], function(){Gallery.l10nClient.key('toggle');});
+    $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #g-l10n-search', type:'keyup'}, function(){Gallery.l10nClient.key('clear');});
   }
 
   // Custom listener for l10n_client livesearch
@@ -246,9 +251,9 @@ Gallery.behaviors.l10nClient = function(context) {
               var num_plural_forms = plural_forms.length;
 
               // Store translation in local js
+              var translation = {};
               if (is_plural) {
-                  var translation = {};
-                  for (var i = 0; i < num_plural_forms; i++) {
+                   for (var i = 0; i < num_plural_forms; i++) {
                       var form = plural_forms[i];
                       translation[form] = $('#g-l10n-client-save-form #l10n-edit-plural-translation-' + form).attr('value');
                   }
-- 
cgit v1.2.3


From 42d7c9590ee480e106ac343e6b3224d2b0fdaab0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 12 Jan 2010 08:58:49 -0800
Subject: Correct the "l10n_client_data[index] is undefined" error.

---
 modules/gallery/js/l10n_client.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index 58032a48..f0aff0b6 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -86,7 +86,10 @@ jQuery.extend(Gallery, {
 
     // Get a string from the DOM tree
     this.getString = function(index, type) {
-      return l10n_client_data[index][type];
+      if (index < l10n_client_data.length) {
+        return l10n_client_data[index][type];
+      }
+      return "";
     };
 
     // Set a string in the DOM tree
-- 
cgit v1.2.3


From e81acce985b35602bf66ddbf9fe7fa5a065116c9 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 12 Jan 2010 09:42:06 -0800
Subject: If the user hits enter in the search text field, then cancel the
 submission, because the search is done in the browser and the the enter will
 unexpectedly reload the root directory.

---
 modules/gallery/js/l10n_client.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'modules')

diff --git a/modules/gallery/js/l10n_client.js b/modules/gallery/js/l10n_client.js
index f0aff0b6..d0d6f619 100644
--- a/modules/gallery/js/l10n_client.js
+++ b/modules/gallery/js/l10n_client.js
@@ -234,6 +234,11 @@ Gallery.behaviors.l10nClient = function(context) {
     $.hotkeys.add(Gallery.l10nClient.keys['clear'], {target:'#l10n-client #g-l10n-search', type:'keyup'}, function(){Gallery.l10nClient.key('clear');});
   }
 
+  // never actually submit the form as the search is done in the browser
+  $('#g-l10n-search-form').submit(function() {
+    return false;
+  });
+
   // Custom listener for l10n_client livesearch
   $('#l10n-client #g-l10n-search').keyup(function(key) {
     Gallery.l10nClient.filter($('#l10n-client #g-l10n-search').val());
-- 
cgit v1.2.3


From 639f1e741a5c9c96db1ab894cea7aa90cad82dbc Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 12 Jan 2010 11:42:31 -0800
Subject: Put quotes around the item titles in all the messages and more
 importantly actually display the original's title properly.  Fixes ticket
 #966, but does now show us ticket #978

---
 modules/notification/helpers/notification.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'modules')

diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index e9fc3f33..a2271b59 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -101,10 +101,10 @@ class notification {
     $v = new View("item_updated.html");
     $v->item = $item;
     $v->subject = $item->is_album() ?
-      t("Album %title updated", array("title" => $item->original("title"))) :
+      t("Album \"%title\" updated", array("title" => $item->original()->title)) :
       ($item->is_photo() ?
-       t("Photo %title updated", array("title" => $item->original("title")))
-       : t("Movie %title updated", array("title" => $item->original("title"))));
+       t("Photo \"%title\" updated", array("title" => $item->original()->title))
+       : t("Movie \"%title\" updated", array("title" => $item->original()->title)));
 
     self::_notify($subscribers, $item, $v->render(), $v->subject);
   }
@@ -119,12 +119,12 @@ class notification {
     $v = new View("item_added.html");
     $v->item = $item;
     $v->subject = $item->is_album() ?
-      t("Album %title added to %parent_title",
+      t("Album \"%title\" added to \"%parent_title\"",
         array("title" => $item->title, "parent_title" => $parent->title)) :
       ($item->is_photo() ?
-       t("Photo %title added to %parent_title",
+       t("Photo \"%title\" added to \"%parent_title\"",
          array("title" => $item->title, "parent_title" => $parent->title)) :
-       t("Movie %title added to %parent_title",
+       t("Movie \"%title\" added to \"%parent_title\"",
            array("title" => $item->title, "parent_title" => $parent->title)));
 
     self::_notify($subscribers, $item, $v->render(), $v->subject);
@@ -140,12 +140,12 @@ class notification {
     $v = new View("item_deleted.html");
     $v->item = $item;
     $v->subject = $item->is_album() ?
-      t("Album %title removed from %parent_title",
+      t("Album \"%title\" removed from \"%parent_title\"",
         array("title" => $item->title, "parent_title" => $parent->title)) :
       ($item->is_photo() ?
-       t("Photo %title removed from %parent_title",
+       t("Photo \"%title\" removed from \"%parent_title\"",
          array("title" => $item->title, "parent_title" => $parent->title))
-       : t("Movie %title removed from %parent_title",
+       : t("Movie \"%title\" removed from \"%parent_title\"",
            array("title" => $item->title, "parent_title" => $parent->title)));
 
     self::_notify($subscribers, $item, $v->render(), $v->subject);
@@ -161,10 +161,10 @@ class notification {
     $v = new View("comment_published.html");
     $v->comment = $comment;
     $v->subject = $item->is_album() ?
-      t("A new comment was published for album %title", array("title" => $item->title)) :
+      t("A new comment was published for album \"%title\"", array("title" => $item->title)) :
       ($item->is_photo() ?
-       t("A new comment was published for photo %title", array("title" => $item->title))
-       : t("A new comment was published for movie %title", array("title" => $item->title)));
+       t("A new comment was published for photo \"%title\"", array("title" => $item->title))
+       : t("A new comment was published for movie \"%title\"", array("title" => $item->title)));
 
     self::_notify($subscribers, $item, $v->render(), $v->subject);
   }
-- 
cgit v1.2.3


From daeaca110d16128040c86727c65df225e957f7c6 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 13 Jan 2010 11:27:09 -0800
Subject: Fix for ticket #978.  Don't reset the original property as part of
 the save processing, because that will overwrite the original values with all
 the new values.  The problem with the original approach is that when changed
 event handlers used ->original(), it had already been reset as part of the
 save processing. Went back and forth on either leaving this alone and forcing
 callers to save the original prior to calling the save function, but there
 were a few event handlers that used ->original().  This seemed the easier
 change. So to reset the original you need to call reload() or clear(). There
 is now an optional parameter on the reload to only reload the original.

---
 modules/gallery/libraries/MY_ORM.php      | 20 ++++++++++++++++++--
 modules/gallery/tests/Item_Model_Test.php |  1 +
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 56c776aa..95fa9006 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -19,12 +19,11 @@
  */
 class ORM extends ORM_Core {
   // Track the original value of this ORM so that we can look it up in ORM::original()
-  protected $original = null;
+  protected $original;
 
   public function save() {
     model_cache::clear();
     $result = parent::save();
-    $this->original = clone $this;
     return $result;
   }
 
@@ -48,7 +47,24 @@ class ORM extends ORM_Core {
     return parent::__unset($column);
   }
 
+  public function reload($original_only=false) {
+    if (!$original_only) {
+      parent::reload();
+    }
+    $this->original = clone $this;
+    return $this;
+  }
+
+  public function clear() {
+    parent::clear();
+    $this->original = clone $this;
+    return $this;
+  }
+
   public function original() {
+    if (!isset($this->original)) {
+      $this->original = clone $this;
+    }
     return $this->original;
   }
 }
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index bf5fca1a..c0ac4436 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -166,6 +166,7 @@ class Item_Model_Test extends Unit_Test_Case {
     $item = self::_create_random_item();
     $item->title = "ORIGINAL_VALUE";
     $item->save();
+    $item->reload(false);
     $item->title = "NEW_VALUE";
 
     $this->assert_same("ORIGINAL_VALUE", $item->original()->title);
-- 
cgit v1.2.3


From e41ad23a8ea05d28a99d12c01d8f317455b1d361 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 13 Jan 2010 11:47:27 -0800
Subject: Did the old commit then save trick

---
 modules/gallery/libraries/MY_ORM.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 95fa9006..1bf5dd13 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -47,8 +47,8 @@ class ORM extends ORM_Core {
     return parent::__unset($column);
   }
 
-  public function reload($original_only=false) {
-    if (!$original_only) {
+  public function reload($reload_all=true) {
+    if ($reload_all) {
       parent::reload();
     }
     $this->original = clone $this;
-- 
cgit v1.2.3


From 260660b2f61e96372686eacce2ce7b66a40be4a2 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 13 Jan 2010 12:08:56 -0800
Subject: Somemore K24 migration holdovers.  need to specify the where
 statement with operands. '=' is no longer assumed. Fixes ticket #979

---
 modules/gallery/controllers/l10n_client.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index d22b6299..e20bab50 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -29,9 +29,9 @@ class L10n_Client_Controller extends Controller {
     $key = $input->post("l10n-message-key");
 
     $root_message = ORM::factory("incoming_translation")
-        ->where(array("key" => $key,
-                      "locale" => "root"))
-        ->find();
+      ->where("key", "=", $key)
+      ->where("locale", "=", "root")
+      ->find();
 
     if (!$root_message->loaded()) {
       throw new Exception("@todo bad request data / illegal state");
@@ -56,8 +56,8 @@ class L10n_Client_Controller extends Controller {
     }
 
     $entry = ORM::factory("outgoing_translation")
-      ->where(array("key" => $key,
-                    "locale" => $locale))
+      ->where("key", "=", $key)
+      ->where("locale", "=", $locale)
       ->find();
 
     if (!$entry->loaded()) {
@@ -70,8 +70,8 @@ class L10n_Client_Controller extends Controller {
     $entry->translation = serialize($translation);
 
     $entry_from_incoming = ORM::factory("incoming_translation")
-      ->where(array("key" => $key,
-                    "locale" => $locale))
+      ->where("key", "=", $key)
+      ->where("locale", "=", $locale)
       ->find();
 
     if (!$entry_from_incoming->loaded()) {
-- 
cgit v1.2.3


From 99073c3e201c0d2770909781ad0afefdd9d44931 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 15 Jan 2010 23:53:35 -0800
Subject: Revert "Did the old commit then save trick"

This reverts commit e41ad23a8ea05d28a99d12c01d8f317455b1d361.
---
 modules/gallery/libraries/MY_ORM.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 1bf5dd13..95fa9006 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -47,8 +47,8 @@ class ORM extends ORM_Core {
     return parent::__unset($column);
   }
 
-  public function reload($reload_all=true) {
-    if ($reload_all) {
+  public function reload($original_only=false) {
+    if (!$original_only) {
       parent::reload();
     }
     $this->original = clone $this;
-- 
cgit v1.2.3


From 00c73a4b072d2ad4e45323234b847da4f69d99a3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 15 Jan 2010 23:53:43 -0800
Subject: Revert "Fix for ticket #978.  Don't reset the original property as
 part of the save processing, because that will overwrite the original values
 with all the new values.  The problem with the original approach is that when
 changed event handlers used ->original(), it had already been reset as part
 of the save processing. Went back and forth on either leaving this alone and
 forcing callers to save the original prior to calling the save function, but
 there were a few event handlers that used ->original().  This seemed the
 easier change. So to reset the original you need to call reload() or clear().
 There is now an optional parameter on the reload to only reload the
 original."

This reverts commit daeaca110d16128040c86727c65df225e957f7c6.
---
 modules/gallery/libraries/MY_ORM.php      | 20 ++------------------
 modules/gallery/tests/Item_Model_Test.php |  1 -
 2 files changed, 2 insertions(+), 19 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/MY_ORM.php b/modules/gallery/libraries/MY_ORM.php
index 95fa9006..56c776aa 100644
--- a/modules/gallery/libraries/MY_ORM.php
+++ b/modules/gallery/libraries/MY_ORM.php
@@ -19,11 +19,12 @@
  */
 class ORM extends ORM_Core {
   // Track the original value of this ORM so that we can look it up in ORM::original()
-  protected $original;
+  protected $original = null;
 
   public function save() {
     model_cache::clear();
     $result = parent::save();
+    $this->original = clone $this;
     return $result;
   }
 
@@ -47,24 +48,7 @@ class ORM extends ORM_Core {
     return parent::__unset($column);
   }
 
-  public function reload($original_only=false) {
-    if (!$original_only) {
-      parent::reload();
-    }
-    $this->original = clone $this;
-    return $this;
-  }
-
-  public function clear() {
-    parent::clear();
-    $this->original = clone $this;
-    return $this;
-  }
-
   public function original() {
-    if (!isset($this->original)) {
-      $this->original = clone $this;
-    }
     return $this->original;
   }
 }
diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index c0ac4436..bf5fca1a 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -166,7 +166,6 @@ class Item_Model_Test extends Unit_Test_Case {
     $item = self::_create_random_item();
     $item->title = "ORIGINAL_VALUE";
     $item->save();
-    $item->reload(false);
     $item->title = "NEW_VALUE";
 
     $this->assert_same("ORIGINAL_VALUE", $item->original()->title);
-- 
cgit v1.2.3


From 9f03d36d6ee5358b3081f64fc7ef0b0ae42d97db Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 16 Jan 2010 00:10:55 -0800
Subject: Don't use MY_ORM::original() here since the values may not have
 changed since the last save.  Instead, use the original ORM passed in.

---
 modules/notification/helpers/notification.php       | 11 +++++++----
 modules/notification/helpers/notification_event.php |  3 ++-
 modules/notification/views/item_updated.html.php    |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'modules')

diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php
index a2271b59..dfeab9fc 100644
--- a/modules/notification/helpers/notification.php
+++ b/modules/notification/helpers/notification.php
@@ -92,19 +92,22 @@ class notification {
     return array_keys($subscribers);
   }
 
-  static function send_item_updated($item) {
+  static function send_item_updated($original, $item) {
     $subscribers = self::get_subscribers($item);
     if (!$subscribers) {
       return;
     }
 
     $v = new View("item_updated.html");
+    $v->original = $original;
     $v->item = $item;
     $v->subject = $item->is_album() ?
-      t("Album \"%title\" updated", array("title" => $item->original()->title)) :
+      t("Album \"%title\" updated", array("title" => $original->title)) :
       ($item->is_photo() ?
-       t("Photo \"%title\" updated", array("title" => $item->original()->title))
-       : t("Movie \"%title\" updated", array("title" => $item->original()->title)));
+       t("Photo \"%title\" updated", array("title" => $original->title))
+       : t("Movie \"%title\" updated", array("title" => $original->title)));
+
+    Kohana_Log::add("error",print_r($v->render(),1));
 
     self::_notify($subscribers, $item, $v->render(), $v->subject);
   }
diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index bc1303f5..76afac9c 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -22,8 +22,9 @@ class notification_event_Core {
   // don't want to screw up the processing that was generating the notification
   // so we don't pass the exception up the call stack
   static function item_updated($original, $new) {
+    Kohana_Log::add("error",print_r("item_updated({$original->title}, {$new->title})",1));
     try {
-      notification::send_item_updated($new);
+      notification::send_item_updated($original, $new);
     } catch (Exception $e) {
       Kohana_Log::add("error", "@todo notification_event::item_updated() failed");
       Kohana_Log::add("error", $e->getMessage() . "\n" . $e->getTraceAsString());
diff --git a/modules/notification/views/item_updated.html.php b/modules/notification/views/item_updated.html.php
index 47856cab..7020fd53 100644
--- a/modules/notification/views/item_updated.html.php
+++ b/modules/notification/views/item_updated.html.php
@@ -7,7 +7,7 @@
     <h2> <?= html::clean($subject) ?> </h2>
     <table>
       <tr>
-        <? if ($item->original("title") != $item->title): ?>
+        <? if ($original->title != $item->title): ?>
         <td><?= t("New title:") ?></td>
         <td><?= html::clean($item->title) ?></td>
         <? else: ?>
@@ -19,7 +19,7 @@
         <td><?= t("Url:") ?></td>
         <td><a href="<?= $item->abs_url() ?>"><?= $item->abs_url() ?></a></td>
       </tr>
-      <? if ($item->original("description") != $item->description): ?>
+      <? if ($original->description != $item->description): ?>
       <tr>
         <td><?= t("New description:") ?></td>
         <td><?= html::clean($item->description) ?></td>
-- 
cgit v1.2.3


From dcf4b5e71ae8a097f133a06485d60c5fb3400824 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 16 Jan 2010 00:13:28 -0800
Subject: Don't pass MY_ORM::original() to update event handlers, since after
 parent::save() it'll be reset.  Clone it first.

This is an alternate fix for #978.
---
 modules/comment/models/comment.php | 4 +++-
 modules/gallery/models/item.php    | 4 +++-
 modules/user/models/group.php      | 4 +++-
 modules/user/models/user.php       | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/comment/models/comment.php b/modules/comment/models/comment.php
index 59b85233..e0b82039 100644
--- a/modules/comment/models/comment.php
+++ b/modules/comment/models/comment.php
@@ -65,12 +65,14 @@ class Comment_Model extends ORM {
       }
     }
     $visible_change = $this->original()->state == "published" || $this->state == "published";
+
+    $original = clone $this->original();
     parent::save();
 
     if (isset($created)) {
       module::event("comment_created", $this);
     } else {
-      module::event("comment_updated", $this->original(), $this);
+      module::event("comment_updated", $original, $this);
     }
 
     // We only notify on the related items if we're making a visible change.
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 4a3d26e9..6851e1a3 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -416,9 +416,11 @@ class Item_Model extends ORM_MPTT {
         $send_event = 1;
       }
     }
+
+    $original = clone $this->original();
     parent::save();
     if (isset($send_event)) {
-      module::event("item_updated", $this->original(), $this);
+      module::event("item_updated", $original, $this);
     }
     return $this;
   }
diff --git a/modules/user/models/group.php b/modules/user/models/group.php
index 515788a3..10f6f4b3 100644
--- a/modules/user/models/group.php
+++ b/modules/user/models/group.php
@@ -41,11 +41,13 @@ class Group_Model extends ORM implements Group_Definition {
     if (!$this->loaded()) {
         $created = 1;
     }
+
+    $original = clone $this->original();
     parent::save();
     if (isset($created)) {
       module::event("group_created", $this);
     } else {
-      module::event("group_updated", $this->original(), $this);
+      module::event("group_updated", $original, $this);
     }
     return $this;
   }
diff --git a/modules/user/models/user.php b/modules/user/models/user.php
index 7d5bf413..edba2a2c 100644
--- a/modules/user/models/user.php
+++ b/modules/user/models/user.php
@@ -69,11 +69,13 @@ class User_Model extends ORM implements User_Definition {
     if (!$this->loaded()) {
         $created = 1;
     }
+
+    $original = clone $this->original();
     parent::save();
     if (isset($created)) {
       module::event("user_created", $this);
     } else {
-      module::event("user_updated", $this->original(), $this);
+      module::event("user_updated", $original, $this);
     }
     return $this;
   }
-- 
cgit v1.2.3


From 2c2c77ea391a59f89449d07aff604bf11042515c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 16 Jan 2010 00:19:35 -0800
Subject: Remove debug code.

---
 modules/notification/helpers/notification_event.php | 1 -
 1 file changed, 1 deletion(-)

(limited to 'modules')

diff --git a/modules/notification/helpers/notification_event.php b/modules/notification/helpers/notification_event.php
index 76afac9c..edbf6e39 100644
--- a/modules/notification/helpers/notification_event.php
+++ b/modules/notification/helpers/notification_event.php
@@ -22,7 +22,6 @@ class notification_event_Core {
   // don't want to screw up the processing that was generating the notification
   // so we don't pass the exception up the call stack
   static function item_updated($original, $new) {
-    Kohana_Log::add("error",print_r("item_updated({$original->title}, {$new->title})",1));
     try {
       notification::send_item_updated($original, $new);
     } catch (Exception $e) {
-- 
cgit v1.2.3


From 0dc184e99f0ca607774a68257432a9a981f4d5b7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 11:10:37 -0800
Subject: Overload url::current() and url::merge() to make the current url XSS
 safe.  Add tests to make sure that it doesn't relapse with future Kohana
 changes.  Fixes ticket #983.

Ref: http://gallery.menalto.com/node/93738
---
 modules/gallery/helpers/MY_url.php          | 14 ++++++++++
 modules/gallery/tests/Url_Security_Test.php | 43 +++++++++++++++++++++++++++++
 modules/rss/controllers/rss.php             |  8 ++----
 3 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 modules/gallery/tests/Url_Security_Test.php

(limited to 'modules')

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 74284951..8a7909b6 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -89,4 +89,18 @@ class url extends url_Core {
   static function abs_current($qs=false) {
     return self::abs_site(url::current($qs));
   }
+
+  /**
+   * Just like url::merge except that it escapes any XSS in the path.
+   */
+  static function merge($params) {
+    return htmlspecialchars(parent::merge($params));
+  }
+
+  /**
+   * Just like url::current except that it escapes any XSS in the path.
+   */
+  static function current($qs=false, $suffix=false) {
+    return htmlspecialchars(parent::current($qs, $suffix));
+  }
 }
diff --git a/modules/gallery/tests/Url_Security_Test.php b/modules/gallery/tests/Url_Security_Test.php
new file mode 100644
index 00000000..de25880f
--- /dev/null
+++ b/modules/gallery/tests/Url_Security_Test.php
@@ -0,0 +1,43 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 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 Url_Security_Test extends Unit_Test_Case {
+  public function setup() {
+    $this->save = array(Router::$current_uri, Router::$complete_uri, $_GET);
+  }
+
+  public function teardown() {
+    list(Router::$current_uri, Router::$complete_uri, $_GET) = $this->save;
+  }
+
+  public function xss_in_current_url_test() {
+    Router::$current_uri = "foo/<xss>/bar";
+    Router::$complete_uri = "foo/<xss>/bar?foo=bar";
+    $this->assert_same("foo/&lt;xss&gt;/bar", url::current());
+    $this->assert_same("foo/&lt;xss&gt;/bar?foo=bar", url::current(true));
+  }
+
+  public function xss_in_merged_url_test() {
+    Router::$current_uri = "foo/<xss>/bar";
+    Router::$complete_uri = "foo/<xss>/bar?foo=bar";
+    $_GET = array("foo" => "bar");
+    $this->assert_same("foo/&lt;xss&gt;/bar?foo=bar", url::merge(array()));
+    $this->assert_same("foo/&lt;xss&gt;/bar?foo=bar&amp;a=b", url::merge(array("a" => "b")));
+  }
+}
\ No newline at end of file
diff --git a/modules/rss/controllers/rss.php b/modules/rss/controllers/rss.php
index 41c781d9..3066ba16 100644
--- a/modules/rss/controllers/rss.php
+++ b/modules/rss/controllers/rss.php
@@ -52,14 +52,12 @@ class Rss_Controller extends Controller {
     $view->feed = $feed;
     $view->pub_date = date("D, d M Y H:i:s T");
 
-    $feed->uri = url::abs_site(str_replace("&", "&amp;", url::merge($_GET)));
+    $feed->uri = url::abs_site(url::merge($_GET));
     if ($page > 1) {
-      $feed->previous_page_uri =
-        url::abs_site(str_replace("&", "&amp;", url::merge(array("page" => $page - 1))));
+      $feed->previous_page_uri = url::abs_site(url::merge(array("page" => $page - 1)));
     }
     if ($page < $feed->max_pages) {
-      $feed->next_page_uri =
-        url::abs_site(str_replace("&", "&amp;", url::merge(array("page" => $page + 1))));
+      $feed->next_page_uri = url::abs_site(url::merge(array("page" => $page + 1)));
     }
 
     header("Content-Type: application/rss+xml");
-- 
cgit v1.2.3


From 4eafe97b4858cb8d1b3367574f7e7ef473127d7c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 11:57:23 -0800
Subject: Reload $item after removing view permissions.

---
 modules/gallery/tests/Access_Helper_Test.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules')

diff --git a/modules/gallery/tests/Access_Helper_Test.php b/modules/gallery/tests/Access_Helper_Test.php
index 084bfb47..b2244766 100644
--- a/modules/gallery/tests/Access_Helper_Test.php
+++ b/modules/gallery/tests/Access_Helper_Test.php
@@ -74,6 +74,7 @@ class Access_Helper_Test extends Unit_Test_Case {
 
     access::deny(identity::everybody(), "view", $item);
     access::deny(identity::registered_users(), "view", $item);
+    $item->reload();
 
     $user = identity::create_user("access_test", "Access Test", "");
     foreach ($user->groups() as $group) {
-- 
cgit v1.2.3


From 41a392611c0e602d2e14859e5c0d5bf9e61d0073 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 12:08:05 -0800
Subject: Change DENY and ALLOW to "0" and "1" to match the fact that ORM no
 longer typecasts values as of http://dev.kohanaphp.com/issues/2459

---
 modules/gallery/helpers/access.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 8ce7e436..e0a0e979 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -66,8 +66,8 @@
  *   the Access_Intent_Model
  */
 class access_Core {
-  const DENY      = false;
-  const ALLOW     = true;
+  const DENY      = "0";
+  const ALLOW     = "1";
   const INHERIT   = null; // access_intent
   const UNKNOWN   = null; // cache (access_cache, items)
 
-- 
cgit v1.2.3


From 284788d964688385f77b18bc063a841d0dbcdcd8 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 12:08:39 -0800
Subject: Switch from stdClass to arrays which works around issues caused in
 http://dev.kohanaphp.com/issues/2459 -- I don't exactly know why, but the
 solutions are equivalent so I'm not going to dig too far.

---
 modules/gallery/helpers/model_cache.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/model_cache.php b/modules/gallery/helpers/model_cache.php
index 302e42d9..88756407 100644
--- a/modules/gallery/helpers/model_cache.php
+++ b/modules/gallery/helpers/model_cache.php
@@ -18,27 +18,25 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class model_cache_Core {
-  private static $cache;
+  private static $cache = array();
 
   static function get($model_name, $id, $field_name="id") {
-    if (TEST_MODE || empty(self::$cache->$model_name->$field_name->$id)) {
+    if (TEST_MODE || empty(self::$cache[$model_name][$field_name][$id])) {
       $model = ORM::factory($model_name)->where($field_name, "=", $id)->find();
       if (!$model->loaded()) {
         throw new Exception("@todo MISSING_MODEL $model_name:$id");
       }
-      self::$cache->$model_name->$field_name->$id = $model;
+      self::$cache[$model_name][$field_name][$id] = $model;
     }
 
-    return self::$cache->$model_name->$field_name->$id;
+    return self::$cache[$model_name][$field_name][$id];
   }
 
   static function clear() {
-    self::$cache = new stdClass();
+    self::$cache = array();
   }
 
   static function set($model) {
-    self::$cache->{$model->object_name}
-      ->{$model->primary_key}
-      ->{$model->{$model->primary_key}} = $model;
+    self::$cache[$model->object_name][$model->primary_key][$model->{$model->primary_key}] = $model;
   }
 }
-- 
cgit v1.2.3


From 51427d540464ffa5b4663a9c3b794cefc637925a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 12:21:57 -0800
Subject: Verified

---
 modules/gallery/tests/xss_data.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index a264286c..1530c73e 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -137,7 +137,7 @@ modules/gallery/views/l10n_client.html.php                   26  DIRTY    $strin
 modules/gallery/views/l10n_client.html.php                   32  DIRTY    $l10n_search_form
 modules/gallery/views/l10n_client.html.php                   41  DIRTY    access::csrf_form_field()
 modules/gallery/views/l10n_client.html.php                   42  DIRTY    form::hidden("l10n-message-key")
-modules/gallery/views/l10n_client.html.php                   43  DIRTY    form::textarea("l10n-edit-translation","",' rows="5" class="translationField"')
+modules/gallery/views/l10n_client.html.php                   43  DIRTY    form::textarea("l10n-edit-translation","",' id="l10n-edit-translation" rows="5" class="translationField"')
 modules/gallery/views/l10n_client.html.php                   46  DIRTY    form::textarea("l10n-edit-plural-translation-zero","",' rows="2"')
 modules/gallery/views/l10n_client.html.php                   50  DIRTY    form::textarea("l10n-edit-plural-translation-one","",' rows="2"')
 modules/gallery/views/l10n_client.html.php                   54  DIRTY    form::textarea("l10n-edit-plural-translation-two","",' rows="2"')
-- 
cgit v1.2.3


From cac4692510d6b5da0d0a63f2ec54783df6ca86e4 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 12:35:26 -0800
Subject: Don't use rand() as the name.  Now that ORM::load_types() is gone, it
 won't get coerced to a string, and then we wind up comparing:

  12345 != 12345-12321

In the old approach, they'd both be strings so they'd be inequal.  But
in the new approach the first value is an integer (sinced it came from
rand()) so the second value is typecast to an integer which drops
everything after the - sign so they appear equal.
---
 modules/gallery/tests/Album_Helper_Test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/tests/Album_Helper_Test.php b/modules/gallery/tests/Album_Helper_Test.php
index 1284b8cc..ef0905da 100644
--- a/modules/gallery/tests/Album_Helper_Test.php
+++ b/modules/gallery/tests/Album_Helper_Test.php
@@ -38,7 +38,7 @@ class Album_Helper_Test extends Unit_Test_Case {
   }
 
   public function create_conflicting_album_test() {
-    $rand = rand();
+    $rand = "name_" . rand();
     $root = ORM::factory("item", 1);
     $album1 = album::create($root, $rand, $rand, $rand);
     $album2 = album::create($root, $rand, $rand, $rand);
-- 
cgit v1.2.3


From cf236a228a8ea3316506f6d855bcade92676674c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 12:37:20 -0800
Subject: Don't assert_same() now that typecasting is gone from ORM.

---
 modules/gallery/tests/Item_Model_Test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
index bf5fca1a..d03a03f4 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -52,7 +52,7 @@ class Item_Model_Test extends Unit_Test_Case {
   public function updating_view_count_only_doesnt_change_updated_date_test() {
     $item = self::_create_random_item();
     $item->reload();
-    $this->assert_same(0, $item->view_count);
+    $this->assert_equal(0, $item->view_count);
 
     // Force the updated date to something well known
     db::build()
-- 
cgit v1.2.3


From a9f07986f64faf5062c2d86aa34710892d8ac8b3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 12:39:42 -0800
Subject: The root parent id is 0, not null (this deviation exposed by the new
 lack of typecasting in ORM).

---
 modules/gallery/tests/Gallery_Installer_Test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/gallery/tests/Gallery_Installer_Test.php b/modules/gallery/tests/Gallery_Installer_Test.php
index 43399fb4..74a07b1a 100644
--- a/modules/gallery/tests/Gallery_Installer_Test.php
+++ b/modules/gallery/tests/Gallery_Installer_Test.php
@@ -41,7 +41,7 @@ class Gallery_Installer_Test extends Unit_Test_Case {
     $this->assert_equal("Gallery", $root->title);
     $this->assert_equal(1, $root->left_ptr);
     $this->assert_equal($max_right_ptr, $root->right_ptr);
-    $this->assert_equal(null, $root->parent_id);
+    $this->assert_equal(0, $root->parent_id);
     $this->assert_equal(1, $root->level);
   }
 }
-- 
cgit v1.2.3


From 06cabecd76781d7075cbacb5cf433042b4296dc5 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 12:49:58 -0800
Subject: Coerce some integers to strings now that ORM isn't typecasting
 anymore.

---
 modules/gallery/tests/Gallery_Rest_Helper_Test.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/tests/Gallery_Rest_Helper_Test.php b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
index cd0aabae..f8cf6190 100644
--- a/modules/gallery/tests/Gallery_Rest_Helper_Test.php
+++ b/modules/gallery/tests/Gallery_Rest_Helper_Test.php
@@ -94,8 +94,8 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                                    "path" => $photo->relative_url(),
                                    "thumb_url" => $photo->thumb_url(),
                                    "thumb_dimensions" => array(
-                                     "width" => $photo->thumb_width,
-                                     "height" => $photo->thumb_height),
+                                     "width" => (string)$photo->thumb_width,
+                                     "height" => (string)$photo->thumb_height),
                                    "has_thumb" => true,
                                    "title" => $photo->title))))),
       gallery_rest::get($request));
@@ -115,14 +115,14 @@ class Gallery_Rest_Helper_Test extends Unit_Test_Case {
                               "parent_path" => $child->relative_url(),
                               "title" => $photo->title,
                               "thumb_url" => $photo->thumb_url(),
-                              "thumb_size" => array("height" => $photo->thumb_height,
-                                                    "width" => $photo->thumb_width),
+                              "thumb_size" => array("height" => (string)$photo->thumb_height,
+                                                    "width" => (string)$photo->thumb_width),
                               "resize_url" => $photo->resize_url(),
                               "resize_size" => array("height" => $photo->resize_height,
                                                        "width" => $photo->resize_width),
                               "url" => $photo->file_url(),
-                              "size" => array("height" => $photo->height,
-                                              "width" => $photo->width),
+                              "size" => array("height" => (string)$photo->height,
+                                              "width" => (string)$photo->width),
                               "description" => $photo->description,
                               "slug" => $photo->slug))),
       gallery_rest::get($request));
-- 
cgit v1.2.3


From 9384f987bb96d0d39787ff9d3d16a70c01cd76e0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 18 Jan 2010 12:52:52 -0800
Subject: Coerce some integers to strings now that ORM isn't typecasting
 anymore.

---
 modules/tag/tests/Tag_Rest_Helper_Test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/tag/tests/Tag_Rest_Helper_Test.php b/modules/tag/tests/Tag_Rest_Helper_Test.php
index 4e8dd527..514538d4 100644
--- a/modules/tag/tests/Tag_Rest_Helper_Test.php
+++ b/modules/tag/tests/Tag_Rest_Helper_Test.php
@@ -85,8 +85,8 @@ class Tag_Rest_Helper_Test extends Unit_Test_Case {
 
     $this->assert_equal(
       json_encode(array("status" => "OK",
-                        "tags" => array(array("name" => "albums", "count" => 2),
-                                        array("name" => "photos", "count" => 2)))),
+                        "tags" => array(array("name" => "albums", "count" => "2"),
+                                        array("name" => "photos", "count" => "2")))),
       tag_rest::get($request));
   }
 
-- 
cgit v1.2.3